From 6f2002b89641511b318fdf7e8304d08b09612615 Mon Sep 17 00:00:00 2001
From: Bryan <brthor@microsoft.com>
Date: Tue, 5 Jan 2016 15:54:50 -0800
Subject: [PATCH] Enable visual xunit results. Fixup xml test results name

---
 netci.groovy              | 1 +
 scripts/test/runtests.ps1 | 4 ++--
 scripts/test/runtests.sh  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/netci.groovy b/netci.groovy
index d58fe924f..a617fa11d 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -66,6 +66,7 @@ def static getBuildJobName(def configuration, def os) {
 
 
             Utilities.standardJobSetup(newJob, project, isPR)
+            Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml')
             if (isPR) {
                 Utilities.addGithubPRTrigger(newJob, "${os} ${configuration} Build")
             }
diff --git a/scripts/test/runtests.ps1 b/scripts/test/runtests.ps1
index f04b9b658..5cbb3e1c6 100644
--- a/scripts/test/runtests.ps1
+++ b/scripts/test/runtests.ps1
@@ -44,7 +44,7 @@ pushd "$TestBinRoot"
 
 # Run each test project
 $TestProjects | ForEach-Object {
-    & "corerun.exe"  "xunit.console.netcore.exe" "$_.dll" -xml "$_.xml" -notrait category=failing
+    & "corerun.exe"  "xunit.console.netcore.exe" "$_.dll" -xml "$_-testResults.xml" -notrait category=failing
     $exitCode = $LastExitCode
     if ($exitCode -ne 0) {
         $failingTests += "$_"
@@ -58,7 +58,7 @@ popd
 if ($failCount -ne 0) {
     Write-Host -ForegroundColor Red "The following tests failed."
     $failingTests | ForEach-Object {
-        Write-Host -ForegroundColor Red "$_.dll failed. Logs in '$TestBinRoot\$_.xml'"
+        Write-Host -ForegroundColor Red "$_.dll failed. Logs in '$TestBinRoot\$_-testResults.xml'"
     }
 }
 else {
diff --git a/scripts/test/runtests.sh b/scripts/test/runtests.sh
index 666f0d541..7a8dab4d0 100755
--- a/scripts/test/runtests.sh
+++ b/scripts/test/runtests.sh
@@ -42,7 +42,7 @@ failCount=0
 
 for project in ${TestProjects[@]}
 do
-    ./corerun  "xunit.console.netcore.exe" "$project.dll" -xml "project.xml" -notrait category=failing
+    ./corerun  "xunit.console.netcore.exe" "$project.dll" -xml "${project}-testResults.xml" -notrait category=failing
     exitCode=$?
     failCount+=$exitCode
     if [ $exitCode -ne 0 ]; then
@@ -52,7 +52,7 @@ done
 
 for test in ${failedTests[@]}
 do
-    error "$test.dll failed. Logs in '$TestBinRoot/$test.xml'"
+    error "$test.dll failed. Logs in '$TestBinRoot/${test}-testResults.xml'"
 done
 
 popd