diff options
author | Koundinya Veluri <kouvel@microsoft.com> | 2015-09-18 11:08:28 -0700 |
---|---|---|
committer | Koundinya Veluri <kouvel@microsoft.com> | 2015-09-29 14:18:53 -0700 |
commit | f7f1b9ab91bb183dd180115ee287af74faa7acf9 (patch) | |
tree | e35114f4548fc90c8c9c61bc6f48fa19b700c4a4 /tests/src/CLRTest.Execute.Bash.targets | |
parent | 795786f0ac0e5ea82f288dfeb5b673845e1ef075 (diff) | |
download | coreclr-f7f1b9ab91bb183dd180115ee287af74faa7acf9.tar.gz coreclr-f7f1b9ab91bb183dd180115ee287af74faa7acf9.tar.bz2 coreclr-f7f1b9ab91bb183dd180115ee287af74faa7acf9.zip |
Improve CoreCLR test runner outside Windows
CoreCLR tests will need to be built on Windows and copied over to a non-Windows machine. Then, coreclr/tests/runtest.sh along
with some switches can be used to run the tests.
Changes:
- Run tests in parallel by default (use --sequential to force sequential mode)
- Update Windows test build to produce the Windows core overlay that includes test dependencies that are not built
- Add a number of switches (see coreclr/tests/runtest.sh for details) to provide locations of:
- The Windows test build
- The CoreCLR native test build
- Either:
- This:
- The core layout (including all of the below)
- Or:
- The CoreCLR build
- mscorlib.dll
- The CoreFX build
- The CoreFX native build
- Using information from above, build or use the core layout, and copy native test binaries to the respective test directories
- Add --testDir to specify an inclusive list of test directories to run
- Add text files to exclude tests:
- coreclr/tests/testsUnsupportedOutsideWindows.txt - Tests that are not supported outside Windows
- coreclr/tests/testsFailingOutsideWindows.txt - Tests that are known to fail outside Windows and are temporarily disabled while they are investigated
- Add --runFailingTestsOnly to run only the tests listed in coreclr/tests/testsFailingOutsideWindows.txt to verify known failures
- Produce xUnit-style output for the CI, output goes into <Windows test build folder>/coreclrtests.xml
Diffstat (limited to 'tests/src/CLRTest.Execute.Bash.targets')
-rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index 72d3619e69..7e91d5618e 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -101,7 +101,7 @@ fi <_CLRTestRunFile Condition="'$(_CLRTestNeedsProjectToRun)' != 'True'">"$(AssemblyName).exe"</_CLRTestRunFile> <!-- TODO: make this better? --> - <_CLRTestRunFile Condition=" '$(CLRTestIsHosted)'=='true' And !$(_CLRTestNeedsProjectToRun) ">"$Core_Root/corerun" $(_CLRTestRunFile)</_CLRTestRunFile> + <_CLRTestRunFile Condition=" '$(CLRTestIsHosted)'=='true' And !$(_CLRTestNeedsProjectToRun) ">"$CORE_ROOT/corerun" $(_CLRTestRunFile)</_CLRTestRunFile> <BashCLRTestLaunchCmds Condition=" '$(BashCLRTestLaunchCmds)'=='' "><![CDATA[ echo $(_CLRTestRunFile) $CLRTestExecutionArguments $Host_Args @@ -129,22 +129,6 @@ CLRTestExitCode=$? <Output TaskParameter="ParamList" PropertyName="_CLRTestParamList"/> </GenerateParamList> - <!-- If a test has precommands or postcommands but no bash-specific ones, - we will skip running that test. In order to enable the test on Unix, - the corresponding bash versions (_BashCLRTest[Pre|Post]Commands) of - the commands should be specified. --> - <PropertyGroup> - <ShouldSkipTest>false</ShouldSkipTest> - <ShouldSkipTest Condition="('$(_CLRTestPreCommands)' != '' AND '$(_BashCLRTestPreCommands)' == '') - OR ('$(_CLRTestPostCommands)' != '' AND '$(_BashCLRTestPostCommands)' == '')" - >true</ShouldSkipTest> - - <SkipTest> -echo "Skipping this test due to presence of pre- or post-commands that are not bash-specific." -exit 2 # Exit code indicating skip - </SkipTest> - </PropertyGroup> - <PropertyGroup> <!-- This generates the script portion to parse all of the command line arguments. @@ -183,14 +167,8 @@ done $(BashCLRTestArgPrep) ]]></BashCLRTestArgPrep> - <_CLRTestExecutionScriptText Condition="$(ShouldSkipTest)"> - <![CDATA[ -$(SkipTest) - ]]> - </_CLRTestExecutionScriptText> - <!-- NOTE! semicolons must be escaped with %3B boooo --> - <_CLRTestExecutionScriptText Condition="!$(ShouldSkipTest)"> + <_CLRTestExecutionScriptText> <![CDATA[ # The __TestEnv variable may be used to specify something to run before the test. $__TestEnv |