diff options
| author | adiaaida <adiaaida@gmail.com> | 2017-01-04 10:30:28 -0800 |
|---|---|---|
| committer | adiaaida <adiaaida@gmail.com> | 2017-01-04 11:26:54 -0800 |
| commit | 02731360a9d24f3083d3ad05b271f9edea4b48d0 (patch) | |
| tree | 5ec25d4c13edf135475b6a891e502128c55f43c7 | |
| parent | 4b93ba94828c879356ef9dd3246397cee3431e2e (diff) | |
| download | coreclr-02731360a9d24f3083d3ad05b271f9edea4b48d0.tar.gz coreclr-02731360a9d24f3083d3ad05b271f9edea4b48d0.tar.bz2 coreclr-02731360a9d24f3083d3ad05b271f9edea4b48d0.zip | |
Do not validate fx_root in run-corefx-tests
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.
| -rwxr-xr-x | netci.groovy | 2 | ||||
| -rw-r--r-- | tests/scripts/run-corefx-tests.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/netci.groovy b/netci.groovy index 90d10f6583..72a8c1bc4d 100755 --- a/netci.groovy +++ b/netci.groovy @@ -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 diff --git a/tests/scripts/run-corefx-tests.py b/tests/scripts/run-corefx-tests.py index b595b750a8..84ab3b7d9f 100644 --- a/tests/scripts/run-corefx-tests.py +++ b/tests/scripts/run-corefx-tests.py @@ -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)) |