Implement command line for SuppressAllWarnings and WarningsAsError.

Make WixRunner.Execute default to setting WarningsAsError to make sure tests are not accidentally causing warnings.

1 files changed, 25 insertions, 5 deletions

diff --git a/src/WixToolset.Core.TestPackage/WixRunner.cs b/src/WixToolset.Core.TestPackage/WixRunner.cs
index a3883cd5..ed7c49b8 100644
--- a/src/WixToolset.Core.TestPackage/WixRunner.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunner.cs
@@ -21,23 +21,36 @@ namespace WixToolset.Core.TestPackage
         /// </summary>
         /// <param name="args"></param>
         /// <param name="messages"></param>
+        /// <param name="warningsAsErrors"></param>
         /// <returns></returns>
-        public static int Execute(string[] args, out List<Message> messages)
+        public static int Execute(string[] args, out List<Message> messages, bool warningsAsErrors = true)
         {
             var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-            var task = Execute(args, serviceProvider, out messages);
+            var task = Execute(args, serviceProvider, out messages, warningsAsErrors: warningsAsErrors);
             return task.Result;
         }
 
         /// <summary>
         /// Emulates calling wix.exe with standard backends.
+        /// This overload always treats warnings as errors.
         /// </summary>
         /// <param name="args"></param>
         /// <returns></returns>
         public static WixRunnerResult Execute(params string[] args)
         {
+            return Execute(true, args);
+        }
+
+        /// <summary>
+        /// Emulates calling wix.exe with standard backends.
+        /// </summary>
+        /// <param name="warningsAsErrors"></param>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        public static WixRunnerResult Execute(bool warningsAsErrors, params string[] args)
+        {
             var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-            var exitCode = Execute(args, serviceProvider, out var messages);
+            var exitCode = Execute(args, serviceProvider, out var messages, warningsAsErrors: warningsAsErrors);
             return new WixRunnerResult { ExitCode = exitCode.Result, Messages = messages.ToArray() };
         }
 
@@ -47,8 +60,9 @@ namespace WixToolset.Core.TestPackage
         /// <param name="args"></param>
         /// <param name="coreProvider"></param>
         /// <param name="messages"></param>
+        /// <param name="warningsAsErrors"></param>
         /// <returns></returns>
-        public static Task<int> Execute(string[] args, IWixToolsetCoreServiceProvider coreProvider, out List<Message> messages)
+        public static Task<int> Execute(string[] args, IWixToolsetCoreServiceProvider coreProvider, out List<Message> messages, bool warningsAsErrors = true)
         {
             coreProvider.AddWindowsInstallerBackend()
                         .AddBundleBackend();
@@ -60,8 +74,14 @@ namespace WixToolset.Core.TestPackage
             var messaging = coreProvider.GetService<IMessaging>();
             messaging.SetListener(listener);
 
+            var arguments = new List<string>(args);
+            if (warningsAsErrors)
+            {
+                arguments.Add("-wx");
+            }
+
             var commandLine = coreProvider.GetService<ICommandLine>();
-            var command = commandLine.CreateCommand(args);
+            var command = commandLine.CreateCommand(arguments.ToArray());
             return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1);
         }
     }