diff options
Diffstat (limited to '')
| -rw-r--r-- | src/test/burn/WixTestTools/TestTool.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/test/burn/WixTestTools/TestTool.cs b/src/test/burn/WixTestTools/TestTool.cs index b6d18ac9..6c9ad1d7 100644 --- a/src/test/burn/WixTestTools/TestTool.cs +++ b/src/test/burn/WixTestTools/TestTool.cs | |||
| @@ -26,7 +26,7 @@ namespace WixTestTools | |||
| 26 | public TestTool(string toolFile) | 26 | public TestTool(string toolFile) |
| 27 | : base(toolFile) | 27 | : base(toolFile) |
| 28 | { | 28 | { |
| 29 | this.PrintOutputToConsole = true; | 29 | this.PrintOutputToConsoleOnError = true; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | /// <summary> | 32 | /// <summary> |
| @@ -75,6 +75,11 @@ namespace WixTestTools | |||
| 75 | public bool PrintOutputToConsole { get; set; } | 75 | public bool PrintOutputToConsole { get; set; } |
| 76 | 76 | ||
| 77 | /// <summary> | 77 | /// <summary> |
| 78 | /// Print output from the tool execution to the console | ||
| 79 | /// </summary> | ||
| 80 | public bool PrintOutputToConsoleOnError { get; set; } | ||
| 81 | |||
| 82 | /// <summary> | ||
| 78 | /// The working directory of the tool | 83 | /// The working directory of the tool |
| 79 | /// </summary> | 84 | /// </summary> |
| 80 | public string WorkingDirectory { get; set; } | 85 | public string WorkingDirectory { get; set; } |
| @@ -123,7 +128,12 @@ namespace WixTestTools | |||
| 123 | 128 | ||
| 124 | if (assertOnError && 0 < this.Errors.Count) | 129 | if (assertOnError && 0 < this.Errors.Count) |
| 125 | { | 130 | { |
| 126 | if (this.PrintOutputToConsole) | 131 | if (this.PrintOutputToConsoleOnError) |
| 132 | { | ||
| 133 | Console.WriteLine(FormatResult(result)); | ||
| 134 | } | ||
| 135 | |||
| 136 | if (this.PrintOutputToConsole || this.PrintOutputToConsoleOnError) | ||
| 127 | { | 137 | { |
| 128 | this.PrintErrors(); | 138 | this.PrintErrors(); |
| 129 | } | 139 | } |
