diff options
| author | Kyungwoo Lee <kyulee@microsoft.com> | 2016-04-06 16:52:57 -0700 |
|---|---|---|
| committer | Kyungwoo Lee <kyulee@microsoft.com> | 2016-04-06 16:52:57 -0700 |
| commit | 7f95d79740d5f5b13d6a0df1b94654e622053a5f (patch) | |
| tree | c6923c3f68e5a7103318c1efc49a650563b4c6ca /tests | |
| parent | e609a4f2272412f0ad3ce1f8e22c2b4d0740388f (diff) | |
| parent | 9677110a1c8361d0203a6021dc5f7dbbb511bd7d (diff) | |
| download | coreclr-7f95d79740d5f5b13d6a0df1b94654e622053a5f.tar.gz coreclr-7f95d79740d5f5b13d6a0df1b94654e622053a5f.tar.bz2 coreclr-7f95d79740d5f5b13d6a0df1b94654e622053a5f.zip | |
Merge pull request #4111 from kyulee1/customlauncher
Restore CustomLauncher to Test Population
Diffstat (limited to 'tests')
| -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> |