From 223606fcd02e6d15e065d1e108e17c8848d35f9f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 15 Jun 2022 17:09:55 -0500 Subject: Update some skipped tests to be dynamically skipped. --- src/test/burn/WixTestTools/TestTool.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/test/burn/WixTestTools/TestTool.cs') diff --git a/src/test/burn/WixTestTools/TestTool.cs b/src/test/burn/WixTestTools/TestTool.cs index 9c3a3ea6..eb77c75b 100644 --- a/src/test/burn/WixTestTools/TestTool.cs +++ b/src/test/burn/WixTestTools/TestTool.cs @@ -29,6 +29,11 @@ namespace WixTestTools this.PrintOutputToConsole = true; } + /// + /// The alternate expected exit code of the tool + /// + public int? AlternateExitCode { get; set; } + /// /// The arguments to pass to the tool /// @@ -139,12 +144,13 @@ namespace WixTestTools List errors = new List(); // Verify that the expected return code matched the actual return code - if (null != this.ExpectedExitCode && this.ExpectedExitCode != result.ExitCode) + if (null != this.ExpectedExitCode && this.ExpectedExitCode != result.ExitCode && + (null == this.AlternateExitCode || this.AlternateExitCode != result.ExitCode)) { errors.Add(String.Format("Expected exit code {0} did not match actual exit code {1}", this.ExpectedExitCode, result.ExitCode)); } - var standardErrorString = string.Join(Environment.NewLine, result.StandardError); + var standardErrorString = String.Join(Environment.NewLine, result.StandardError); // Verify that the expected error string are in stderr if (null != this.ExpectedErrorStrings) @@ -158,7 +164,7 @@ namespace WixTestTools } } - var standardOutputString = string.Join(Environment.NewLine, result.StandardOutput); + var standardOutputString = String.Join(Environment.NewLine, result.StandardOutput); // Verify that the expected output string are in stdout if (null != this.ExpectedOutputStrings) -- cgit v1.2.3-55-g6feb