2 Commits

Author	SHA1	Message	Date
Jonas Devlieghere	b40284dfb0	Disable TestEnvironment on Windows ... The input source file seems to be triggering an error in the Visual Studio headers. > xstddef:338:2: error: ''auto' return without trailing return type; > deduced return types are a C++14 extension I tried converting the test to use the %build stuff Zachary added, but that seems to be missing some Darwin support. Disabling the test on Windows in the meantime. llvm-svn: 360624	2019-05-13 22:02:09 +00:00
Jonas Devlieghere	ae54fc9f04	Merge target and launch info environments ... Before this change we were overriding the launch info environment with the target environment. This meant that the environment variables passed to `process launch --environment <>` were lost. Instead of replacing the environment, we should merge them. Differential revision: https://reviews.llvm.org/D61864 llvm-svn: 360612	2019-05-13 19:17:48 +00:00