@@ -44,7 +44,8 @@ class Constants {
44
44
' jitstressregs3' : [' COMPlus_JitStressRegs' : ' 3' ], ' jitstressregs4' : [' COMPlus_JitStressRegs' : ' 4' ],
45
45
' jitstressregs8' : [' COMPlus_JitStressRegs' : ' 8' ], ' jitstressregs0x10' : [' COMPlus_JitStressRegs' : ' 0x10' ],
46
46
' jitstressregs0x80' : [' COMPlus_JitStressRegs' : ' 0x80' ],
47
- ' fxjs1' : [' COMPlus_JitStress' : ' 1' ],
47
+ ' fx' : [' ' : ' ' ], // corefx baseline
48
+ ' fxjs1' : [' COMPlus_JitStress' : ' 1' ],
48
49
' fxjs2' : [' COMPlus_JitStress' : ' 2' ]]
49
50
// This is the basic set of scenarios
50
51
def static basicScenarios = [' default' , ' pri1' , ' ilrt' ]
@@ -208,6 +209,7 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
208
209
case ' forcerelocs' :
209
210
case ' jitstress1' :
210
211
case ' jitstress2' :
212
+ case ' fx' :
211
213
case ' fxjs1' :
212
214
case ' fxjs2' :
213
215
assert (os == ' Windows_NT' ) || (os in Constants . crossList)
@@ -319,6 +321,7 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
319
321
Utilities . addGithubPRTrigger(job, " ${ os} ${ architecture} ${ configuration} Build and Test (Jit - JitStressRegs=0x80)" ,
320
322
" (?i).*test\\ W+${ os} \\ W+${ scenario} .*" )
321
323
break
324
+ case ' fx' :
322
325
case ' fxjs1' :
323
326
case ' fxjs2' :
324
327
// No Linux support is needed now
@@ -410,6 +413,11 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
410
413
Utilities . addGithubPRTrigger(job, " ${ os} ${ architecture} ${ configuration} Build and Test (Jit - JitStressRegs=0x80)" ,
411
414
" (?i).*test\\ W+${ os} \\ W+${ scenario} .*" )
412
415
break
416
+ case ' fx' :
417
+ assert (os == ' Windows_NT' ) || (os in Constants . crossList)
418
+ Utilities . addGithubPRTrigger(job, " ${ os} ${ architecture} ${ configuration} Build and Test (Jit - CoreFx Baseline)" ,
419
+ " (?i).*test\\ W+${ os} \\ W+${ scenario} .*" )
420
+ break
413
421
case ' fxjs1' :
414
422
assert (os == ' Windows_NT' ) || (os in Constants . crossList)
415
423
Utilities . addGithubPRTrigger(job, " ${ os} ${ architecture} ${ configuration} Build and Test (Jit - CoreFx JitStress=1)" ,
@@ -635,7 +643,9 @@ combinedScenarios.each { scenario ->
635
643
def setEnvVar = ' '
636
644
def envVars = Constants . jitStressModeScenarios[scenario]
637
645
envVars. each{ VarName , Value ->
638
- setEnvVar + = " && set ${ VarName} =${ Value} "
646
+ if (VarName != ' ' ) {
647
+ setEnvVar + = " && set ${ VarName} =${ Value} "
648
+ }
639
649
}
640
650
641
651
// Run corefx testing
0 commit comments