diff options
| author | Simon Nattress <nattress@gmail.com> | 2017-01-19 02:46:25 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-01-19 02:46:25 +0300 |
| commit | 097568046b152e5954c8a1b8454191c7f69d97a5 (patch) | |
| tree | 07da4232ed4efa2e846ea22c86fb8ff603477dcd | |
| parent | 1cc17e1365a1ec0c658fe6290b8f2cc1c9853644 (diff) | |
Allow tests to run in internal branches (#2539)
`dir.props` loads the parent folder `dirs.props`. This is used when
CoreRT is built as a part of another source tree. When building CoreRT
with its own build system, any MSBuild invocation needs to set
`RepoLocalBuild` to `true` to avoid dragging in an unexpected set of
MSBuild configuration. Update the the standard and CoreCLR test
harnesses to pass in `RepoLocalBuild=true` to MSBuild as a command-line
property.
| -rw-r--r-- | tests/CoreCLR/build-and-run-test.cmd | 4 | ||||
| -rw-r--r-- | tests/runtest.cmd | 6 | ||||
| -rwxr-xr-x | tests/runtest.sh | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/CoreCLR/build-and-run-test.cmd b/tests/CoreCLR/build-and-run-test.cmd index 511094311..8fd7ed145 100644 --- a/tests/CoreCLR/build-and-run-test.cmd +++ b/tests/CoreCLR/build-and-run-test.cmd @@ -37,8 +37,8 @@ if "%CoreRT_BuildArch%" == "x64" ( call "%VS140COMNTOOLS%\..\..\VC\bin\amd64\vcvars64.bat" ) -echo msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" %TestFolder%\Test.csproj -msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" %TestFolder%\Test.csproj +echo msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" %TestFolder%\Test.csproj +msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" %TestFolder%\Test.csproj if errorlevel 1 ( set TestExitCode=!ERRORLEVEL! goto :Cleanup diff --git a/tests/runtest.cmd b/tests/runtest.cmd index ed8dc33e2..1a43f5230 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -181,9 +181,9 @@ goto :eof ) ) - echo msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" !extraArgs! !__SourceFile!.csproj + echo msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" !extraArgs! !__SourceFile!.csproj echo. - msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" !extraArgs! !__SourceFile!.csproj + msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" !extraArgs! !__SourceFile!.csproj endlocal set __SavedErrorLevel=%ErrorLevel% @@ -271,7 +271,7 @@ goto :eof echo CORE_ROOT IS NOW %CORE_ROOT% pushd %CoreRT_TestRoot%\CoreCLR\runtest - msbuild src\TestWrappersConfig\XUnitTooling.depproj + msbuild "/p:RepoLocalBuild=true" src\TestWrappersConfig\XUnitTooling.depproj if errorlevel 1 ( exit /b 1 ) diff --git a/tests/runtest.sh b/tests/runtest.sh index 0cc8eb8a3..c786b5c0c 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -34,8 +34,8 @@ run_test_dir() rm -rf ${__dir_path}/bin ${__dir_path}/obj local __msbuild_dir=${CoreRT_TestRoot}/../Tools - echo ${__msbuild_dir}/msbuild.sh /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} ${__extra_args} ${__dir_path}/${__filename}.csproj - ${__msbuild_dir}/msbuild.sh /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} ${__extra_args} ${__dir_path}/${__filename}.csproj + echo ${__msbuild_dir}/msbuild.sh /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:RepoLocalBuild=true ${__extra_args} ${__dir_path}/${__filename}.csproj + ${__msbuild_dir}/msbuild.sh /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:RepoLocalBuild=true ${__extra_args} ${__dir_path}/${__filename}.csproj runtest ${__dir_path} ${__filename} local __exitcode=$? |