Merge pull request #135 from Unity-Technologies/new-options

New command line test abilities

Author: mrvoorhe

unity/CITools/BuildDriver/Program.cs

@@ -12,7 +12,7 @@ public static async Task<int> Main(string[] args)
         string configuration = "Release";
         bool silent = false;
         bool skipBuild = false;
-        bool test = false;
+        TestTargets testTargets = TestTargets.None;
         bool zip = RunningOnYamato();
         Task<NPath>? zipTask = null;
         foreach (string arg in args)
@@ -32,10 +32,21 @@ public static async Task<int> Main(string[] args)
             else if (arg.Equals("--test"))
             {
                 skipBuild = true; // Assume we've already built
-                test = true;
+                testTargets = TestTargets.All;
+            }
+            else if (arg.StartsWith("--test="))
+            {
+                if (!TryParseTestTargets(arg, out var testTarget))
+                    return 1;
+                skipBuild = true; // Assume we've already built
+                testTargets = Enum.Parse<TestTargets>(testTarget, ignoreCase: true);
             }
         }
 
+        // This gives a way to test and build in the same command
+        if (args.Any(a => a == "--build"))
+            skipBuild = false;
+
         if (RunningOnYamato())
         {
             zipTask = SevenZip.DownloadAndUnzip7Zip();
@@ -70,10 +81,14 @@ public static async Task<int> Main(string[] args)
                 SevenZip.Zip(zipExe, artifacts, gConfig);
         }
 
-        if (test)
+        if (testTargets != TestTargets.None)
         {
-            EmbeddingHost.Test(gConfig);
-            CoreCLR.Test(gConfig);
+            if (testTargets.HasFlag(TestTargets.Embedding))
+                EmbeddingHost.Test(gConfig);
+
+            if (testTargets.HasFlag(TestTargets.CoreClr))
+                CoreCLR.Test(gConfig);
+
             Console.WriteLine("******************************");
             Console.WriteLine("Unity: Tested CoreCLR successfully");
             Console.WriteLine("******************************");
@@ -110,6 +125,16 @@ static NPath ConsolidateArtifacts(GlobalConfig gConfig)
         return destDir;
     }
 
+    static bool TryParseTestTargets(string arg, out string value)
+    {
+        var values = Enum.GetValues(typeof(TestTargets));
+        var valid = new List<string>();
+        foreach(var v in values)
+            valid.Add(v.ToString().ToLower());
+
+        return TryParseArgument(valid.ToArray(), arg, out value);
+    }
+
     static bool TryParseArgument(string[] validArgs, string arg, out string value)
     {
         string[] args = arg.Split('=');

unity/CITools/BuildDriver/TestTargets.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace BuildDriver;
+
+[Flags]
+public enum TestTargets
+{
+    None = 1 << 0,
+    Embedding = 1 << 1,
+    CoreClr = 1 << 2,
+    All = ~0
+}