From 9e9a8346e8f760be5b52a97b882ec9945abd7b5f Mon Sep 17 00:00:00 2001
From: Russ Keldorph <Russ.Keldorph@microsoft.com>
Date: Fri, 6 Jan 2017 10:59:40 -0800
Subject: [PATCH] Fix archival and test result steps for corefx tests

These archival and testResult groovy calls were using absolute paths, which is
apparently incorrect.  Change then to use relative paths and make things
consistent between Windodws and Ubuntu runs.
---
 netci.groovy | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/netci.groovy b/netci.groovy
index 72a8c1b..aefc0a1 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1896,19 +1896,15 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                             buildCommands += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario], stepScriptLocation)
 
                             if (enableCorefxTesting) {
-                                def fxRoot = "%WORKSPACE%\\_\\fx"
-                                buildCommands += "python %WORKSPACE%\\tests\\scripts\\run-corefx-tests.py -arch ${arch} -build_type ${configuration} -fx_root ${fxRoot} -fx_branch ${branch} -env_script ${stepScriptLocation}"
+                                def workspaceRelativeFxRoot = "_/fx"
+                                def absoluteFxRoot = "%WORKSPACE%\\_\\fx"
+                                buildCommands += "python %WORKSPACE%\\tests\\scripts\\run-corefx-tests.py -arch ${arch} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${branch} -env_script ${stepScriptLocation}"
 
-                                // Archive only result xml files since corefx/bin/tests is very large around 10 GB.
-                                // For windows, pull full test results and test drops for x86/x64
-                                Utilities.addArchival(newJob, "${fxRoot}/bin/tests/**/testResults.xml")
-
-                                // Set timeout
                                 setTestJobTimeOut(newJob, scenario)
 
-                                if (architecture == 'x64' || !isPR) {
-                                    Utilities.addXUnitDotNETResults(newJob, "${fxRoot}/bin/tests/**/testResults.xml")
-                                }
+                                // Archive and process (only) the test results
+                                Utilities.addArchival(newJob, "${workspaceRelativeFxRoot}/bin/tests/**/testResults.xml")
+                                Utilities.addXUnitDotNETResults(newJob, "${workspaceRelativeFxRoot}/bin/tests/**/testResults.xml")
                             }
                             else {
                                 buildCommands += "%WORKSPACE%\\tests\\runtest.cmd ${runtestArguments} TestEnv ${stepScriptLocation}"
@@ -2065,13 +2061,15 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                         buildCommands += genStressModeScriptStep(os, scenario, Constants.jitStressModeScenarios[scenario], scriptFileName)
 
                         // Build and text corefx
-                        def fxRoot = "\$WORKSPACE/_/fx"
-                        buildCommands += "python \$WORKSPACE/tests/scripts/run-corefx-tests.py -arch ${arch} -build_type ${configuration} -fx_root ${fxRoot} -fx_branch ${branch} -env_script ${scriptFileName}"
+                        def workspaceRelativeFxRoot = "_/fx"
+                        def absoluteFxRoot = "\$WORKSPACE/${workspaceRelativeFxRoot}"
+                        buildCommands += "python \$WORKSPACE/tests/scripts/run-corefx-tests.py -arch ${arch} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${branch} -env_script ${scriptFileName}"
 
-                        // Archive and process test result
-                        Utilities.addArchival(newJob, "${fxRoot}/bin/tests/**/testResults.xml")
                         setTestJobTimeOut(newJob, scenario)
-                        Utilities.addXUnitDotNETResults(newJob, "${fxRoot}/bin/tests/**/testResults.xml")
+
+                        // Archive and process (only) the test results
+                        Utilities.addArchival(newJob, "${workspaceRelativeFxRoot}/bin/tests/**/testResults.xml")
+                        Utilities.addXUnitDotNETResults(newJob, "${workspaceRelativeFxRoot}/bin/tests/**/testResults.xml")
                     }
                     break
                 case 'arm64':
-- 
2.7.4