summaryrefslogtreecommitdiff
path: root/netci.groovy
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2018-01-19 23:59:09 (GMT)
committerBruce Forstall <brucefo@microsoft.com>2018-01-19 23:59:09 (GMT)
commit13b6b8f628a6be3c5890d739549c31f67db4580d (patch)
treeae74bbc3e717dd368a93ace714ce3ef691b8f1bf /netci.groovy
parent96124407444fd130e337f055d9d365e4b761c94e (diff)
downloadcoreclr-13b6b8f628a6be3c5890d739549c31f67db4580d.zip
coreclr-13b6b8f628a6be3c5890d739549c31f67db4580d.tar.gz
coreclr-13b6b8f628a6be3c5890d739549c31f67db4580d.tar.bz2
Add CI support for updated run-corefx-tests.py
Change CI to build a "GenerateLayoutOnly" drop for corefx testing, specifically to cause the corefx package to be restored, so we can determine its version.
Diffstat (limited to 'netci.groovy')
-rwxr-xr-xnetci.groovy15
1 files changed, 14 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy
index ad6f8bb..112495e 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1650,7 +1650,12 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
}
if (enableCorefxTesting) {
- buildOpts += ' skiptests';
+ // We shouldn't need to build the tests. However, run-corefx-tests.py currently depends on having the restored corefx
+ // package available, to determine the correct corefx version git commit hash, and we need to build the tests before
+ // running "tests\\runtest.cmd GenerateLayoutOnly". So build the pri-0 tests to make this happen.
+ //
+ // buildOpts += ' skiptests';
+ buildOpts += " -priority=0"
} else {
buildOpts += " -priority=${priority}"
}
@@ -1748,6 +1753,10 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
runtestArguments = "${lowerConfiguration} ${arch} ${testOpts}"
if (enableCorefxTesting) {
+ // Generate the test layout because it restores the corefx package which allows run-corefx-tests.py
+ // to determine the correct matching corefx version git commit hash.
+ buildCommands += "tests\\runtest.cmd ${runtestArguments} GenerateLayoutOnly"
+
def workspaceRelativeFxRoot = "_/fx"
def absoluteFxRoot = "%WORKSPACE%\\_\\fx"
@@ -1916,6 +1925,10 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
// Build coreclr
buildCommands += "./build.sh verbose ${lowerConfiguration} ${architecture}"
+ // Generate the test layout, which restores the corefx package, and allows run-corefx-tests.py to determine the
+ // matching corefx version git commit hash.
+ buildCommands += "./build-test.sh ${architecture} ${lowerConfiguration} generatelayoutonly"
+
def scriptFileName = "\$WORKSPACE/set_stress_test_env.sh"
def envScriptCmds = envScriptCreate(os, scriptFileName)