diff options
| author | Simon Nattress <nattress@gmail.com> | 2017-01-20 19:27:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 19:27:23 +0300 |
| commit | 88b9ffd7508c264c6df26353ac357030a3ddbec5 (patch) | |
| tree | 7e7b6ef09fe4feba9fd04bf3f9c5008887e9a61b | |
| parent | b3fba48529ea068b0ecd753c1283d33a0098b87d (diff) | |
| parent | d9459c0e691dbfba6f2f6fecc530c1e9ff9d5704 (diff) | |
Merge pull request #2546 from nattress/unixtestci
Unix CoreCLR tests CI authoring
| -rw-r--r-- | netci.groovy | 21 | ||||
| -rwxr-xr-x | tests/runtest.sh | 5 |
2 files changed, 24 insertions, 2 deletions
diff --git a/netci.groovy b/netci.groovy index 20bef1863..e6d1b990a 100644 --- a/netci.groovy +++ b/netci.groovy @@ -30,7 +30,10 @@ def osList = ['Ubuntu', 'OSX', 'Windows_NT'] def newJobName = Utilities.getFullJobName(project, lowercaseConfiguration + '_' + os.toLowerCase(), isPR) def buildString = ""; def prJobDescription = "${os} ${configuration}"; - + if (configuration == 'Debug') { + prJobDescription += " and CoreCLR tests" + } + // Calculate the build commands if (os == 'Windows_NT') { buildString = "build.cmd ${lowercaseConfiguration}" @@ -38,6 +41,7 @@ def osList = ['Ubuntu', 'OSX', 'Windows_NT'] } else { buildString = "./build.sh ${lowercaseConfiguration}" + testScriptString = "tests/runtest.sh -coreclr " } // Create a new job with the specified name. The brace opens a new closure @@ -51,7 +55,6 @@ def osList = ['Ubuntu', 'OSX', 'Windows_NT'] if (configuration == 'Debug') { if (isPR) { - prJobDescription += " and CoreCLR tests" // Run a small set of BVTs during PR validation batchFile(testScriptString + "Top200") } @@ -63,6 +66,20 @@ def osList = ['Ubuntu', 'OSX', 'Windows_NT'] } else { shell(buildString) + + if (configuration == 'Debug') { + if (isPR) { + prJobDescription += " and CoreCLR tests" + // Run a small set of BVTs during PR validation + shell(testScriptString + "top200") + } + else { + // Run the full set of known passing tests in the post-commit job + + // Todo: Enable push test jobs once we establish a reasonable passing set of tests + // shell(testScriptString + "KnownGood") + } + } } } } diff --git a/tests/runtest.sh b/tests/runtest.sh index c786b5c0c..2593515fb 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -105,6 +105,11 @@ while [ "$1" != "" ]; do shift CoreRT_CliBinDir=$1 ;; + -coreclr) + shift + echo "Tests will run here. For now, early out." + exit 0 + ;; *) ;; esac |