Fix CoreFx testing

Currently, build.cmd will pass through all arguments starting with
an argument it doesn't recognize. Since it doesn't process/recognize
'-priority', make sure this is the last argument passed.

1 files changed, 8 insertions, 3 deletions

diff --git a/netci.groovy b/netci.groovy
index accf49b71b..052eda2e0c 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1496,8 +1496,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                         buildCommands += "tests\\scripts\\build_illink.cmd clone ${arch}"
                     }
 
-                    buildOpts += " -priority=${priority}"
-
                     // If it is a release build for windows, ensure PGO is used, else fail the build
                     if ((lowerConfiguration == 'release') &&
                         (scenario in Constants.basicScenarios) &&
@@ -1508,6 +1506,14 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                         buildOpts += ' -enforcepgo'
                     }
 
+                    if (enableCorefxTesting) {
+                        buildOpts += ' skiptests';
+                    } else {
+                        // Note: currently, build.cmd will pass through all arguments starting with an argument it doesn't recognize.
+                        // Since it doesn't process/recognize '-priority', make sure this is the last argument passed.
+                        buildOpts += " -priority=${priority}"
+                    }
+
                     // Set __TestIntermediateDir for pri1 test builds. 
                     // if __TestIntermediateDir is already set, build-test.cmd will
                     // output test binaries to that directory. If it is not set, the
@@ -1523,7 +1529,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                             scenario == 'ilrt' ||
                             scenario == 'illink' ||
                             Constants.r2rJitStressScenarios.indexOf(scenario) != -1) {
-                        buildOpts += enableCorefxTesting ? ' skiptests' : ''
                         buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${arch} ${buildOpts}"
                     }
                     else if (isLongGc(scenario)) {