From 9545e72ec7f2fb7e8c0555ae1666af9276b86e1a Mon Sep 17 00:00:00 2001
From: William Godbe <william.godbe@comcast.net>
Date: Thu, 3 Mar 2016 16:27:39 -0800
Subject: Fix file-name-too-long error for all builds, not just pri1

---
 netci.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netci.groovy b/netci.groovy
index 1febbd2053..b6788093ad 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -705,7 +705,7 @@ combinedScenarios.each { scenario ->
                                     
                                     if (scenario == 'default' || Constants.jitStressModeScenarios.containsKey(scenario)) {
                                         buildOpts = enableCorefxTesting ? 'skiptests' : ''
-                                        buildCommands += "build.cmd ${lowerConfiguration} ${architecture} ${buildOpts}"
+                                        buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture} ${buildOpts}"
                                     }
 
                                     // For Pri 1 tests, we must shorten the output test binary path names.
@@ -719,7 +719,7 @@ combinedScenarios.each { scenario ->
                                     }
                                     else if (scenario == 'ilrt') {
                                         // First do the build with skiptestbuild and then build the tests with ilasm roundtrip
-                                        buildCommands += "build.cmd ${lowerConfiguration} ${architecture} skiptestbuild"
+                                        buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture} skiptestbuild"
                                         buildCommands += "tests\\buildtest.cmd ${lowerConfiguration} ${architecture} ilasmroundtrip"
                                     }
                                     else {
@@ -801,7 +801,7 @@ combinedScenarios.each { scenario ->
                                     break
                                 case 'arm64':
                                     assert scenario == 'default'
-                                    buildCommands += "build.cmd ${lowerConfiguration} ${architecture} skiptestbuild /toolset_dir C:\\ats"
+                                    buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture} skiptestbuild /toolset_dir C:\\ats"
 
                                     if (lowerConfiguration == "release") {
                                        buildCommands += "C:\\arm64PostBuild.cmd %WORKSPACE% ${architecture} ${lowerConfiguration}"
-- 
cgit v1.2.3