diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-05-31 17:35:36 -0700 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-05-31 17:35:36 -0700 |
| commit | 1231f3fcd78f8716f41338832f9ea24f4a201bae (patch) | |
| tree | a7c26fef0c089fe0dc14c148489842720a5fa81e | |
| parent | d30d6f8206d278df9f8f6b86c021ad1ebc566a1e (diff) | |
| download | coreclr-1231f3fcd78f8716f41338832f9ea24f4a201bae.tar.gz coreclr-1231f3fcd78f8716f41338832f9ea24f4a201bae.tar.bz2 coreclr-1231f3fcd78f8716f41338832f9ea24f4a201bae.zip | |
Refactoring Arguments passed to runtest.cmd
| -rwxr-xr-x | netci.groovy | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/netci.groovy b/netci.groovy index 332bf93dbf..d2c92460fa 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1444,6 +1444,7 @@ combinedScenarios.each { scenario -> def runjitmioptsStr = '' def runjitforcerelocsStr = '' def gcstressStr = '' + def runtestArguments = '' if (scenario == 'r2r' || scenario == 'pri1r2r' || @@ -1490,6 +1491,7 @@ combinedScenarios.each { scenario -> { gcstressStr = 'gcstresslevel 0xF' } + runtestArguments = "${lowerConfiguration} ${arch} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr}" if (Constants.jitStressModeScenarios.containsKey(scenario)) { if (enableCorefxTesting) { // Sync to corefx repo @@ -1510,34 +1512,34 @@ combinedScenarios.each { scenario -> // Run tests with the - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} TestEnv ${stepScriptLocation}" + buildCommands += "tests\\runtest.cmd ${runtestArguments} TestEnv ${stepScriptLocation}" } } else if (architecture == 'x64') { if (isLongGc(scenario)) { - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch} longgctests sequential" + buildCommands += "tests\\runtest.cmd ${runtestArguments} longgctests sequential" } else { - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch}" + buildCommands += "tests\\runtest.cmd ${runtestArguments}" } } else if (architecture == 'x86ryujit') { def testEnvLocation = "%WORKSPACE%\\tests\\x86\\ryujit_x86_testenv.cmd" if (isLongGc(scenario)) { - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch} longgctests sequential TestEnv ${testEnvLocation}" + buildCommands += "tests\\runtest.cmd ${runtestArguments} longgctests sequential TestEnv ${testEnvLocation}" } else { - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch} TestEnv ${testEnvLocation}" + buildCommands += "tests\\runtest.cmd ${runtestArguments} TestEnv ${testEnvLocation}" } } else if (architecture == 'x86lb') { if (isLongGc(scenario)) { - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch} longgctests sequential" + buildCommands += "tests\\runtest.cmd ${runtestArguments} longgctests sequential" } else { - buildCommands += "tests\\runtest.cmd ${lowerConfiguration} ${arch} Exclude0 x86_legacy_backend_issues.targets" + buildCommands += "tests\\runtest.cmd ${runtestArguments} Exclude0 x86_legacy_backend_issues.targets" } } } |