diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
| commit | edccb203c421d2bd820062024088c6698424d9ee (patch) | |
| tree | 6b47c3eb5ca53bd9f79f3d032dc1a596d411bf38 /src/test/burn/WixTestTools/BundleInstaller.cs | |
| parent | a3d3963f806117ce123d95e8b77e73e1c1545b25 (diff) | |
| download | wix-edccb203c421d2bd820062024088c6698424d9ee.tar.gz wix-edccb203c421d2bd820062024088c6698424d9ee.tar.bz2 wix-edccb203c421d2bd820062024088c6698424d9ee.zip | |
Support dual-purpose packages in Burn.bob/ConfigurableScopeBundles
Fixes https://github.com/wixtoolset/issues/issues/8958
Diffstat (limited to 'src/test/burn/WixTestTools/BundleInstaller.cs')
| -rw-r--r-- | src/test/burn/WixTestTools/BundleInstaller.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/burn/WixTestTools/BundleInstaller.cs b/src/test/burn/WixTestTools/BundleInstaller.cs index 0f2cfa8f..93602661 100644 --- a/src/test/burn/WixTestTools/BundleInstaller.cs +++ b/src/test/burn/WixTestTools/BundleInstaller.cs | |||
| @@ -189,7 +189,8 @@ namespace WixTestTools | |||
| 189 | /// <returns>Path to the generated log file.</returns> | 189 | /// <returns>Path to the generated log file.</returns> |
| 190 | private string RunBundleWithArguments(int expectedExitCode, MSIExec.MSIExecMode mode, string[] arguments, bool assertOnError = true, string bundlePath = null, string layoutDirectory = null) | 190 | private string RunBundleWithArguments(int expectedExitCode, MSIExec.MSIExecMode mode, string[] arguments, bool assertOnError = true, string bundlePath = null, string layoutDirectory = null) |
| 191 | { | 191 | { |
| 192 | TestTool bundle = new TestTool(bundlePath ?? this.Bundle); | 192 | var exePath = bundlePath ?? this.Bundle; |
| 193 | var bundle = new TestTool(exePath); | ||
| 193 | var sb = new StringBuilder(); | 194 | var sb = new StringBuilder(); |
| 194 | 195 | ||
| 195 | // Be sure to run silent. | 196 | // Be sure to run silent. |
| @@ -230,6 +231,8 @@ namespace WixTestTools | |||
| 230 | // Set the arguments. | 231 | // Set the arguments. |
| 231 | bundle.Arguments = sb.ToString(); | 232 | bundle.Arguments = sb.ToString(); |
| 232 | 233 | ||
| 234 | this.TestContext.TestOutputHelper.WriteLine($"Launching '{exePath}' with arguments '{bundle.Arguments}'..."); | ||
| 235 | |||
| 233 | // Run the tool and assert the expected code. | 236 | // Run the tool and assert the expected code. |
| 234 | bundle.ExpectedExitCode = expectedExitCode; | 237 | bundle.ExpectedExitCode = expectedExitCode; |
| 235 | bundle.AlternateExitCode = this.AlternateExitCode; | 238 | bundle.AlternateExitCode = this.AlternateExitCode; |
