diff options
| author | Aditya Mandaleeka <adityam@microsoft.com> | 2015-09-15 16:08:57 -0700 |
|---|---|---|
| committer | Aditya Mandaleeka <adityam@microsoft.com> | 2015-09-15 16:08:57 -0700 |
| commit | 1f9ab47d24a10c546a96b5e04dc3c4838dc65134 (patch) | |
| tree | 0ccaedd12bbe18922124e4b67811bcb6d98a3ebe /tests/src/CLRTest.Execute.Bash.targets | |
| parent | 5aedb627a91f72f2606a12d904177ef9a481c77e (diff) | |
| download | coreclr-1f9ab47d24a10c546a96b5e04dc3c4838dc65134.tar.gz coreclr-1f9ab47d24a10c546a96b5e04dc3c4838dc65134.tar.bz2 coreclr-1f9ab47d24a10c546a96b5e04dc3c4838dc65134.zip | |
Enable coreclr tests to run on Unix with corerun.
Diffstat (limited to 'tests/src/CLRTest.Execute.Bash.targets')
| -rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index c6e0f7a3c6..0df5e4febb 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -66,11 +66,9 @@ echo Actual: $CLRTestExitCode if [ ! $CLRTestExitCode == $CLRTestExpectedExitCode ] then echo END EXECUTION - FAILED - echo FAILED exit 1 else echo END EXECUTION - PASSED - echo PASSED exit 0 fi ]]></BashCLRTestExitCodeCheck> @@ -103,7 +101,7 @@ fi <_CLRTestRunFile Condition="'$(_CLRTestNeedsProjectToRun)' != 'True'">"$(AssemblyName).exe"</_CLRTestRunFile> <!-- TODO: make this better? --> - <_CLRTestRunFile Condition=" '$(CLRTestIsHosted)'=='true' And !$(_CLRTestNeedsProjectToRun) ">"$Core_Root\mono" $(_CLRTestRunFile)</_CLRTestRunFile> + <_CLRTestRunFile Condition=" '$(CLRTestIsHosted)'=='true' And !$(_CLRTestNeedsProjectToRun) ">"$Core_Root/corerun" $(_CLRTestRunFile)</_CLRTestRunFile> <BashCLRTestLaunchCmds Condition=" '$(BashCLRTestLaunchCmds)'=='' "><![CDATA[ echo $(_CLRTestRunFile) $CLRTestExecutionArguments $Host_Args @@ -180,8 +178,14 @@ $(BashCLRTestLaunchCmds) $(_CLRTestPostCommands) $(BashCLRTestExitCodeCheck) ]]></_CLRTestExecutionScriptText> + </PropertyGroup> - <!-- Write the file --> + + <!-- Write the file. + Note: under the hood, this will rely on Environment.NewLine for line + endings. This means that if the scripts are being generated on Windows, + the line endings will need to be changed from CR-LF to Unix (LF) line + endings before running the scripts on Unix platforms. --> <WriteLinesToFile File="$(OutputPath)\$(AssemblyName).sh" Lines="$(_CLRTestExecutionScriptText)" |