diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-02-04 11:08:05 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-04 11:08:05 -0800 |
commit | af49a24e2f69d59331b16080af04311e7458d5b5 (patch) | |
tree | 417573c2bec6138cf9336b5d1b6d61ea67143348 /netci.groovy | |
parent | ad71e93f91b6091454bb533c645c68dd9dc3276f (diff) | |
download | coreclr-af49a24e2f69d59331b16080af04311e7458d5b5.tar.gz coreclr-af49a24e2f69d59331b16080af04311e7458d5b5.tar.bz2 coreclr-af49a24e2f69d59331b16080af04311e7458d5b5.zip |
Revert "For corefx testing, use a matching corefx repo version git hash"
Diffstat (limited to 'netci.groovy')
-rwxr-xr-x | netci.groovy | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/netci.groovy b/netci.groovy index 8153cde247..35ab8a8132 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1816,12 +1816,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR } if (enableCorefxTesting) { - // 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" + buildOpts += ' skiptests'; } else { buildOpts += " -priority=${priority}" } @@ -1919,10 +1914,6 @@ 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" @@ -2085,10 +2076,6 @@ 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) |