Upload test results and fail the build if any are missing.

Always zip up the logs from %TEMP%.

2 files changed, 6 insertions, 8 deletions

diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index 7caf1cc8..af930247 100644
--- a/src/test/burn/test_burn.cmd
+++ b/src/test/burn/test_burn.cmd
@@ -3,6 +3,7 @@
 
 @set _RESULT=0
 @set _C=Debug
+@set _L=%~dp0..\..\..\build\logs
 :parse_args
 @if /i "%1"=="release" set _C=Release
 @if /i "%1"=="test" set RuntimeTestsEnabled=true
@@ -10,20 +11,16 @@
 
 @echo Burn integration tests %_C%
 
-msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:..\..\..\build\logs\test_burn_build.binlog || exit /b
-msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj -bl:..\..\..\build\logs\test_burn_data_build.binlog || exit /b
+msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
+msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj -bl:%_L%\test_burn_data_build.binlog || exit /b
 
 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
 
 reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
 reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
 
-dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E
-set _RESULT=%ERRORLEVEL%
-
-7z a "..\..\..\build\logs\test_burn_%GITHUB_RUN_ID%.zip" "%TEMP%\*.log" "%TEMP%\..\*.log"
+dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.BurnE2E.trx" || exit /b
 
 :LExit
 @popd
-exit /b %_RESULT%
 @endlocal
diff --git a/src/test/test.cmd b/src/test/test.cmd
index 9238cbfc..3158b2c2 100644
--- a/src/test/test.cmd
+++ b/src/test/test.cmd
@@ -2,6 +2,7 @@
 @pushd %~dp0
 
 @set _C=Debug
+@set _L=%~dp0..\..\build\logs
 :parse_args
 @if /i "%1"=="release" set _C=Release
 @if /i "%1"=="test" set RuntimeTestsEnabled=true
@@ -12,7 +13,7 @@
 
 @call burn\test_burn.cmd %_C% %_T% || exit /b
 
-dotnet test wix -c %_C% --nologo || exit /b
+dotnet test wix -c %_C% --nologo -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.WixE2ETests.trx" || exit /b
 
 @popd
 @endlocal