diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-01-08 02:09:51 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-01-08 03:39:34 +0400 |
| commit | 84b473c0862140a0a08c8b67243cd25289d7beb0 (patch) | |
| tree | 446060896e40b0a6814a45b63fb22dde65fc0c44 /mcs/class/Microsoft.Build.Utilities | |
| parent | 15fedf3b085f5f7c11c1484506e95f08cc312382 (diff) | |
[xbuild] Fix the xbuild 12 tests
Diffstat (limited to 'mcs/class/Microsoft.Build.Utilities')
| -rw-r--r-- | mcs/class/Microsoft.Build.Utilities/Makefile | 4 | ||||
| -rw-r--r-- | mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mcs/class/Microsoft.Build.Utilities/Makefile b/mcs/class/Microsoft.Build.Utilities/Makefile index 8e8cdaddd6d..79888a2a3b4 100644 --- a/mcs/class/Microsoft.Build.Utilities/Makefile +++ b/mcs/class/Microsoft.Build.Utilities/Makefile @@ -15,7 +15,5 @@ LIB_MCS_FLAGS = \ TEST_MCS_FLAGS = /r:$(XBUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll -export TESTING_MONO=a -include $(XBUILD_DIR)/xbuild_targets.make - +include $(XBUILD_DIR)/xbuild_test.make include ../../build/library.make diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs index 35226c1a8b1..9a2ed2c6f96 100644 --- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs +++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs @@ -161,6 +161,9 @@ namespace Microsoft.Build.Utilities if (toolsVersion != "12.0") return null; + if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) + return Path.Combine (lib_mono_dir, "xbuild_12"); + if (runningOnDotNet) { //see http://msdn.microsoft.com/en-us/library/vstudio/bb397428(v=vs.120).aspx var programFiles = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86); |