@joebigelow / wix-1 / commits / 8d6c4bf8

Enable enabling runtime tests

Rob Mensching committed May 16, 2021 at 16:19 UTC 8d6c4bf85755112eea638b1618b985d7acdad59d
3 files changed +7 -3
src/internal/SetBuildNumber/SetBuildNumber.proj
+1
@@ -29,6 +29,7 @@
29 <PropertyGroup>
30 <AppVeyorBuildNumber>$(InformationalVersion)</AppVeyorBuildNumber>
31 <AppVeyorBuildNumber Condition=" '$(APPVEYOR_PULL_REQUEST_NUMBER)'!='' ">PR#$(APPVEYOR_PULL_REQUEST_NUMBER)-$(AppVeyorBuildNumber)</AppVeyorBuildNumber>
32 + <AppVeyorBuildNumber Condition=" '$(RuntimeTestsEnabled)'!='' ">TEST-$(AppVeyorBuildNumber)</AppVeyorBuildNumber>
33 </PropertyGroup>
34
35 <Message Importance="high" Text=" $(AppVeyorBuildNumber)" />
src/test/burn/test_burn.cmd
+2 -1
@@ -4,6 +4,7 @@
4 @set _C=Debug
5 :parse_args
6 @if /i "%1"=="release" set _C=Release
7 +@if /i "%1"=="test" set RuntimeTestsEnabled=true
8 @if not "%1"=="" shift & goto parse_args
9
10 @echo Burn integration tests %_C%
@@ -11,7 +12,7 @@
12 msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b
13 msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b
14
14 -if /i "%RuntimeTestsEnabled%"=="true" dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E
15 +if /i "%RuntimeTestsEnabled%"=="true" dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E
16
17 @popd
18 @endlocal
src/test/test.cmd
+4 -2
@@ -4,11 +4,13 @@
4 @set _C=Debug
5 :parse_args
6 @if /i "%1"=="release" set _C=Release
7 +@if /i "%1"=="test" set RuntimeTestsEnabled=true
8 @if not "%1"=="" shift & goto parse_args
9
9 -@echo Build integration tests %_C%
10 +@if "%RuntimeTestsEnabled%"=="" echo Build integration tests %_C%
11 +@if not "%RuntimeTestsEnabled%"=="" set _T=test&echo Run integration tests %_C%
12
11 -@call burn\test_burn.cmd %_C%
13 +@call burn\test_burn.cmd %_C% %_T%
14
15 @popd
16 @endlocal