summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStephen Toub <stoub@microsoft.com>2015-04-29 10:21:34 -0400
committerStephen Toub <stoub@microsoft.com>2015-04-29 10:21:34 -0400
commita5adab2af7da4ca16995e8d8a48e81a56004913d (patch)
tree0624443a70b27c11d0ee10e5bb0ca2ba47269f55 /tests
parentf5f3cbeafd9b0fa6d675523ea800825af78e6f0c (diff)
parent2bac47575e7f78b2e6b3f9d0656572843f459c15 (diff)
downloadcoreclr-a5adab2af7da4ca16995e8d8a48e81a56004913d.tar.gz
coreclr-a5adab2af7da4ca16995e8d8a48e81a56004913d.tar.bz2
coreclr-a5adab2af7da4ca16995e8d8a48e81a56004913d.zip
Merge pull request #831 from stephentoub/build_mscorlib_2015
Enable building linuxmscorlib / osxmscorlib with VS2015
Diffstat (limited to 'tests')
-rw-r--r--tests/runtest.cmd6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index a162d791c7..3624169038 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -35,8 +35,12 @@ goto :eof
if /i "%__VSVersion%" =="vs2015" goto MSBuild14
set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
-:MSBuild14
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
+goto :CheckMSBuild14
+:MSBuild14
+set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
+set UseRoslynCompiler=true
+:CheckMSBuild14
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/corefx/wiki/Developer%%20Guide for build instructions. && exit /b 1