diff options
| author | Kyungwoo Lee <kyulee@microsoft.com> | 2016-04-06 09:43:40 -0700 |
|---|---|---|
| committer | Kyungwoo Lee <kyulee@microsoft.com> | 2016-04-06 13:46:08 -0700 |
| commit | 9677110a1c8361d0203a6021dc5f7dbbb511bd7d (patch) | |
| tree | d2779c8a53861765ba0b6c83b9e922433afa9411 /tests/src/CLRTest.Execute.Batch.targets | |
| parent | 7346ff049153a0a62f8603415c52b1fa2668374e (diff) | |
| download | coreclr-9677110a1c8361d0203a6021dc5f7dbbb511bd7d.tar.gz coreclr-9677110a1c8361d0203a6021dc5f7dbbb511bd7d.tar.bz2 coreclr-9677110a1c8361d0203a6021dc5f7dbbb511bd7d.zip | |
Restore CustomLauncher to Test Population
Fixes https://github.com/dotnet/coreclr/issues/4076.
Custom launcher is needed for CoreRT tests.
Diffstat (limited to 'tests/src/CLRTest.Execute.Batch.targets')
| -rw-r--r-- | tests/src/CLRTest.Execute.Batch.targets | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets index 03fb5b73e1..12820ac718 100644 --- a/tests/src/CLRTest.Execute.Batch.targets +++ b/tests/src/CLRTest.Execute.Batch.targets @@ -229,9 +229,17 @@ IF NOT "%CLRTestExitCode%"=="%CLRTestExpectedExitCode%" ( <PropertyGroup> <_CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"%CORE_ROOT%\corerun.exe"</_CLRTestRunFile> + <BatchCLRTestLaunchCmds><![CDATA[ +IF NOT "%CLRCustomTestLauncher%"=="" ( + set LAUNCHER=call %CLRCustomTestLauncher% %~dp0 +) ELSE ( + set LAUNCHER=%_DebuggerFullPath% $(_CLRTestRunFile) +) + ]]></BatchCLRTestLaunchCmds> <BatchCLRTestLaunchCmds Condition=" '$(IlasmRoundTrip)'=='true' "><![CDATA[ -ECHO $(_CLRTestRunFile) $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% -$(_CLRTestRunFile) $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% +$(BatchCLRTestLaunchCmds) +ECHO %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% +%LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args% IF NOT "!ERRORLEVEL!"=="%CLRTestExpectedExitCode%" ( ECHO END EXECUTION OF IL{D}ASM BINARY - FAILED !ERRORLEVEL! vs %CLRTestExpectedExitCode% @@ -241,8 +249,8 @@ IF NOT "!ERRORLEVEL!"=="%CLRTestExpectedExitCode%" ( ]]></BatchCLRTestLaunchCmds> <BatchCLRTestLaunchCmds><![CDATA[ $(BatchCLRTestLaunchCmds) -ECHO %_DebuggerFullPath% $(_CLRTestRunFile) $(InputAssemblyName) %CLRTestExecutionArguments% %Host_Args% -%_DebuggerFullPath% $(_CLRTestRunFile) $(InputAssemblyName) %CLRTestExecutionArguments% %Host_Args% +ECHO %LAUNCHER% $(InputAssemblyName) %CLRTestExecutionArguments% %Host_Args% +%LAUNCHER% $(InputAssemblyName) %CLRTestExecutionArguments% %Host_Args% set CLRTestExitCode=!ERRORLEVEL! ]]></BatchCLRTestLaunchCmds> </PropertyGroup> |