This fixes the change that shortens path names of output Pri 1 tests in CI

diff --git a/netci.groovy b/netci.groovy
index 7672bca..d5ac842 100644 (file)
--- a/netci.groovy
+++ b/netci.groovy
@@ -38,11 +38,11 @@ class Constants {
     // need to be set to actually enable that stress mode.  The key of the map is the stress mode and
     // the values are the environment variables
     def static jitStressModeScenarios = ['minopts' : ['COMPlus_JitMinOpts' : '1'], 'forcerelocs' : ['COMPlus_ForceRelocs' : '1'],
-                  'jitstress1' : ['COMPlus_JitStress' : '1'], 'jitstress2' : ['COMPlus_JitStress' : '2'],
-                          'jitstressregs1' : ['COMPlus_JitStressRegs' : '1'], 'jitstressregs2' : ['COMPlus_JitStressRegs' : '2'],
-                          'jitstressregs3' : ['COMPlus_JitStressRegs' : '3'], 'jitstressregs4' : ['COMPlus_JitStressRegs' : '4'],
-                          'jitstressregs8' : ['COMPlus_JitStressRegs' : '8'], 'jitstressregs0x10' : ['COMPlus_JitStressRegs' : '0x10'],
-                          'jitstressregs0x80' : ['COMPlus_JitStressRegs' : '0x80']]
+               'jitstress1' : ['COMPlus_JitStress' : '1'], 'jitstress2' : ['COMPlus_JitStress' : '2'],
+               'jitstressregs1' : ['COMPlus_JitStressRegs' : '1'], 'jitstressregs2' : ['COMPlus_JitStressRegs' : '2'],
+               'jitstressregs3' : ['COMPlus_JitStressRegs' : '3'], 'jitstressregs4' : ['COMPlus_JitStressRegs' : '4'],
+               'jitstressregs8' : ['COMPlus_JitStressRegs' : '8'], 'jitstressregs0x10' : ['COMPlus_JitStressRegs' : '0x10'],
+               'jitstressregs0x80' : ['COMPlus_JitStressRegs' : '0x80']]
     // This is the basic set of scenarios
     def static basicScenarios = ['default', 'pri1', 'ilrt']
     // This is the set of configurations
@@ -191,13 +191,13 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
             case 'jitstressregs2':
             case 'jitstressregs3':
             case 'jitstressregs4':
-                       case 'jitstressregs8':
-                       case 'jitstressregs0x10':
-                       case 'jitstressregs0x80':
+            case 'jitstressregs8':
+            case 'jitstressregs0x10':
+            case 'jitstressregs0x80':
             case 'minopts':
-                       case 'forcerelocs':
+            case 'forcerelocs':
             case 'jitstress1':
-            case 'jitstress2':                 
+            case 'jitstress2':          
                 assert (os == 'Windows_NT') || (os in Constants.crossList)
                 Utilities.addPeriodicTrigger(job, '@daily')
                 break
@@ -261,8 +261,8 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStress=2)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                                      
-                                               case 'forcerelocs':
+                            break                           
+                        case 'forcerelocs':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - ForceRelocs)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
@@ -270,37 +270,37 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=1)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                                      
-                                               case 'jitstressregs2':
-                                                       assert (os == 'Windows_NT') || (os in Constants.crossList)
+                            break                           
+                        case 'jitstressregs2':
+                            assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=2)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                                                                                      
-                                               case 'jitstressregs3':
-                                                       assert (os == 'Windows_NT') || (os in Constants.crossList)
+                            break                                                   
+                        case 'jitstressregs3':
+                            assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=3)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                                                                                      
-                                               case 'jitstressregs4':          
-                                                       assert (os == 'Windows_NT') || (os in Constants.crossList)
+                            break                                                   
+                        case 'jitstressregs4':      
+                            assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=4)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                                                                                      
-                                               case 'jitstressregs8':
-                                                       assert (os == 'Windows_NT') || (os in Constants.crossList)
+                            break                                                   
+                        case 'jitstressregs8':
+                            assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=8)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
                             break
-                                               case 'jitstressregs0x10':
-                                                       assert (os == 'Windows_NT') || (os in Constants.crossList)
+                        case 'jitstressregs0x10':
+                            assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=0x10)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
                             break
-                                               case 'jitstressregs0x80':
+                        case 'jitstressregs0x80':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=0x80)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                                      
+                            break                           
                         default:
                             println("Unknown scenario: ${scenario}");
                             assert false
@@ -338,11 +338,11 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - MinOpts)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
                             break
-                                               case 'forcerelocs':                                                     
+                        case 'forcerelocs':                         
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - ForceRelocs)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                                                       break                                                   
+                            break                           
                         case 'jitstress1':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStress=1)",
@@ -357,38 +357,38 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=1)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               case 'jitstressregs2':
+                            break                       
+                        case 'jitstressregs2':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=2)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               case 'jitstressregs3':
+                            break                       
+                        case 'jitstressregs3':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=3)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               case 'jitstressregs4':          
+                            break                       
+                        case 'jitstressregs4':      
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=4)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               case 'jitstressregs8':
+                            break                       
+                        case 'jitstressregs8':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=8)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               case 'jitstressregs0x10':
+                            break                       
+                        case 'jitstressregs0x10':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=0x10)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               case 'jitstressregs0x80':
+                            break                       
+                        case 'jitstressregs0x80':
                             assert (os == 'Windows_NT') || (os in Constants.crossList)
                             Utilities.addGithubPRTrigger(job, "${os} ${architecture} ${configuration} Build and Test (Jit - JitStressRegs=0x80)",
                                "(?i).*test\\W+${os}\\W+${scenario}.*")
-                            break                                              
-                                               default:
+                            break                       
+                        default:
                             println("Unknown scenario: ${scenario}");
                             assert false
                             break
@@ -559,19 +559,19 @@ combinedScenarios.each { scenario ->
                             switch (architecture) {
                                 case 'x64':
                                 case 'x86':
+                                    
+                                    if (scenario == 'default' || Constants.jitStressModeScenarios.containsKey(scenario)) {
+                                        buildCommands += "build.cmd ${lowerConfiguration} ${architecture}"
+                                    }
 
-                                    // This will shorten the output file path lengths
+                                    // For Pri 1 tests, we must shorten the output test binary path names.
                                     // if __TestIntermediateDir is already set, buildtest.cmd will
                                     // output test binaries to that directory. If it is not set, the 
                                     // binaries are sent to a default directory whose name is about
                                     // 35 characters long.
-                                    buildCommands += "set __TestIntermediateDir=int"
-                                    
-                                    if (scenario == 'default' || Constants.jitStressModeScenarios.containsKey(scenario)) {
-                                        buildCommands += "build.cmd ${lowerConfiguration} ${architecture}"
-                                    }
+
                                     else if (scenario == 'pri1') {
-                                        buildCommands += "build.cmd ${lowerConfiguration} ${architecture} Priority 1"
+                                        buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture} Priority 1"
                                     }
                                     else if (scenario == 'ilrt') {
                                         // First do the build with skiptestbuild and then build the tests with ilasm roundtrip