Enable enabling runtime tests

3 files changed, 7 insertions, 3 deletions

diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index 9342f297..b2746002 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -29,6 +29,7 @@
     <PropertyGroup>
       <AppVeyorBuildNumber>$(InformationalVersion)</AppVeyorBuildNumber>
       <AppVeyorBuildNumber Condition=" '$(APPVEYOR_PULL_REQUEST_NUMBER)'!='' ">PR#$(APPVEYOR_PULL_REQUEST_NUMBER)-$(AppVeyorBuildNumber)</AppVeyorBuildNumber>
+      <AppVeyorBuildNumber Condition=" '$(RuntimeTestsEnabled)'!='' ">TEST-$(AppVeyorBuildNumber)</AppVeyorBuildNumber>
     </PropertyGroup>
 
     <Message Importance="high" Text="  $(AppVeyorBuildNumber)" />
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index 8359d12a..f8880094 100644
--- a/src/test/burn/test_burn.cmd
+++ b/src/test/burn/test_burn.cmd
@@ -4,6 +4,7 @@
 @set _C=Debug
 :parse_args
 @if /i "%1"=="release" set _C=Release
+@if /i "%1"=="test" set RuntimeTestsEnabled=true
 @if not "%1"=="" shift & goto parse_args
 
 @echo Burn integration tests %_C%
@@ -11,7 +12,7 @@
 msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b
 msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b
 
-if /i "%RuntimeTestsEnabled%"=="true" dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E
+if /i "%RuntimeTestsEnabled%"=="true" dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E
 
 @popd
 @endlocal
diff --git a/src/test/test.cmd b/src/test/test.cmd
index 169b229c..44965457 100644
--- a/src/test/test.cmd
+++ b/src/test/test.cmd
@@ -4,11 +4,13 @@
 @set _C=Debug
 :parse_args
 @if /i "%1"=="release" set _C=Release
+@if /i "%1"=="test" set RuntimeTestsEnabled=true
 @if not "%1"=="" shift & goto parse_args
 
-@echo Build integration tests %_C%
+@if "%RuntimeTestsEnabled%"=="" echo Build integration tests %_C%
+@if not "%RuntimeTestsEnabled%"=="" set _T=test&echo Run integration tests %_C%
 
-@call burn\test_burn.cmd %_C%
+@call burn\test_burn.cmd %_C% %_T%
 
 @popd
 @endlocal