Do not validate fx_root in run-corefx-tests
authoradiaaida <adiaaida@gmail.com>
Wed, 4 Jan 2017 18:30:28 +0000 (10:30 -0800)
committeradiaaida <adiaaida@gmail.com>
Wed, 4 Jan 2017 19:26:54 +0000 (11:26 -0800)
Users are able to supply an fx_root that does not yet exist and
run-corefx-tests.py will create that directory. However,
run-corefx-tests.py checks to confirm that fx_root already exists when
we validate. This causes the script to exit with an error when fx_root
does not yet exist. This change modifies run-corefx-tests.py so that we
do not validate the fx_root path.

This change also fixes the path to WORKSPACE for ubuntu corefx testing
in netci.groovy.

Commit migrated from https://github.com/dotnet/coreclr/commit/02731360a9d24f3083d3ad05b271f9edea4b48d0

src/coreclr/netci.groovy
src/coreclr/tests/scripts/run-corefx-tests.py

index 90d10f6..72a8c1b 100755 (executable)
@@ -2065,7 +2065,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                         buildCommands += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario], scriptFileName)
 
                         // Build and text corefx
-                        def fxRoot = "\$WORKSPACE%/_/fx"
+                        def fxRoot = "\$WORKSPACE/_/fx"
                         buildCommands += "python \$WORKSPACE/tests/scripts/run-corefx-tests.py -arch ${arch} -build_type ${configuration} -fx_root ${fxRoot} -fx_branch ${branch} -env_script ${scriptFileName}"
 
                         // Archive and process test result
index b595b75..84ab3b7 100644 (file)
@@ -125,8 +125,6 @@ def validate_args(args):
         fx_root = os.path.join(clr_root, '_', 'fx')
     else:
         fx_root = os.path.normpath(fx_root)
-        validate_arg(fx_root, lambda item: os.path.isdir(
-            os.path.dirname(fx_root)))
 
     if env_script is not None:
         validate_arg(env_script, lambda item: os.path.isfile(env_script))