Add cross-platform spec test to MNTR

src/core/Akka.MultiNodeTestRunner.Shared/Sinks/TeamCityMessageSinkActor.cs

@@ -67,16 +67,20 @@ protected override void HandleNodeMessageFragment(LogMessageFragmentForNode logM
 
         protected override void HandleNodeSpecPass(NodeCompletedSpecWithSuccess nodeSuccess)
         {
+            Console.ForegroundColor = ConsoleColor.Green;
             _teamCityTestWriter?.WriteStdOutput(
                 $"[NODE{nodeSuccess.NodeIndex}:{nodeSuccess.NodeRole}][{DateTime.UtcNow.ToShortTimeString()}]: SPEC PASSED: {nodeSuccess.Message}");
-
+            Console.ResetColor();
+
             base.HandleNodeSpecPass(nodeSuccess);
         }
 
         protected override void HandleNodeSpecFail(NodeCompletedSpecWithFail nodeFail)
         {
+            Console.ForegroundColor = ConsoleColor.Red;
             _teamCityTestWriter?.WriteFailed(
                 $"[NODE{nodeFail.NodeIndex}:{nodeFail.NodeRole}][{DateTime.UtcNow.ToShortTimeString()}]: SPEC FAILED: {nodeFail.Message}", "");
+            Console.ResetColor();
 
             base.HandleNodeSpecFail(nodeFail);
         }

src/core/Akka.MultiNodeTestRunner/Program.cs

@@ -37,8 +37,14 @@ namespace Akka.MultiNodeTestRunner
     /// </summary>
     class Program
     {
-        protected static ActorSystem TestRunSystem;
+        private static HashSet<string> _validNetCorePlatform = new HashSet<string>
+        {
+            "net",
+            "netcore",
+            "multi"
+        };
 
+        protected static ActorSystem TestRunSystem;
         protected static IActorRef SinkCoordinator;
 
         /// <summary>
@@ -47,6 +53,7 @@ class Program
         protected static string OutputDirectory;
 
         protected static bool TeamCityFormattingOn;
+        protected static bool MultiPlatform;
 
         /// <summary>
         /// MultiNodeTestRunner takes the following <see cref="args"/>:
@@ -128,9 +135,9 @@ static void Main(string[] args)
             var platform = CommandLine.GetPropertyOrDefault("multinode.platform", "net");
 
 #if CORECLR
-            if (platform != "net" && platform != "netcore")
+            if (!_validNetCorePlatform.Contains(platform))
             {
-                throw new Exception($"Target platform not supported: {platform}. Supported platforms are net and netcore");
+                throw new Exception($"Target platform not supported: {platform}. Supported platforms are net, netcore and multi");
             }
 #else
             if (platform != "net")
@@ -146,7 +153,6 @@ static void Main(string[] args)
 
             EnableAllSinks(assemblyPath, platform);
             PublishRunnerMessage($"Running MultiNodeTests for {assemblyPath}");
-
 #if CORECLR
             // In NetCore, if the assembly file hasn't been touched, 
             // XunitFrontController would fail loading external assemblies and its dependencies.
@@ -157,11 +163,19 @@ static void Main(string[] args)
             {
                 try
                 {
-                    assembly = Assembly.Load(new AssemblyName(asm.FullName));
+                    Assembly.Load(new AssemblyName(asm.FullName));
                 }
                 catch (Exception)
                 {
-                    assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.Combine(basePath, asm.Name + ".dll"));
+                    var path = Path.Combine(basePath, asm.Name + ".dll");
+                    try
+                    {
+                        AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.Out.WriteLine($"Failed to load dll: {path}");
+                    }
                 }
             }
 #endif
@@ -197,6 +211,12 @@ static void Main(string[] args)
                             PublishRunnerMessage($"Starting test {test.Value.First().MethodName}");
 
                             StartNewSpec(test.Value);
+#if CORECLR
+                            var ntrBasePath = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "..", "Akka.NodeTestRunner", "bin", "Release"));
+                            var ntrNetPath = Path.Combine(AppContext.BaseDirectory, "runner", "net", "Akka.NodeTestRunner.exe");
+                            var ntrNetCorePath = Path.Combine(AppContext.BaseDirectory, "runner", "netcore", "Akka.NodeTestRunner.dll");
+                            var alternateIndex = 0;
+#endif
                             foreach (var nodeTest in test.Value)
                             {
                                 //Loop through each test, work out number of nodes to run on and kick off process
@@ -210,18 +230,60 @@ static void Main(string[] args)
                                     .Append($@"-Dmultinode.index={nodeTest.Node - 1} ")
                                     .Append($@"-Dmultinode.role=""{nodeTest.Role}"" ")
                                     .Append($@"-Dmultinode.listen-address={listenAddress} ")
-                                    .Append($@"-Dmultinode.listen-port={listenPort}");
+                                    .Append($@"-Dmultinode.listen-port={listenPort} ");
 
+#if CORECLR
+                                string fileName = null;
+                                switch (platform)
+                                {
+                                    case "net":
+                                        fileName = ntrNetPath;
+                                        sbArguments.Insert(0, $@" -Dmultinode.test-assembly=""{assemblyPath}"" ");
+                                        break;
+                                    case "netcore":
+                                        fileName = "dotnet";
+                                        sbArguments.Insert(0, $@" -Dmultinode.test-assembly=""{assemblyPath}"" ");
+                                        sbArguments.Insert(0, ntrNetCorePath);
+                                        break;
+                                    case "multi":
+                                        if (alternateIndex % 2 == 0)
+                                        {
+                                            fileName = ntrNetPath;
+                                            sbArguments.Insert(0, $@" -Dmultinode.test-assembly=""{ChangeDllPathPlatform(assemblyPath, "net452")}"" ");
+                                        }
+                                        else
+                                        {
+                                            fileName = "dotnet";
+                                            sbArguments.Insert(0, $@" -Dmultinode.test-assembly=""{ChangeDllPathPlatform(assemblyPath, "netcoreapp1.1")}"" ");
+                                            sbArguments.Insert(0, ntrNetCorePath);
+                                        }
+                                        ++alternateIndex;
+                                        break;
+                                }
                                 var process = new Process
                                 {
                                     StartInfo = new ProcessStartInfo
                                     {
+                                        FileName = fileName,
                                         UseShellExecute = false,
                                         RedirectStandardOutput = true,
+                                        Arguments = sbArguments.ToString(),
+                                        WorkingDirectory = Path.GetDirectoryName(assemblyPath)
+                                    }
+                                };
+#else
+                                sbArguments.Insert(0, $@"-Dmultinode.test-assembly=""{assemblyPath}"" ");
+                                var process = new Process
+                                {
+                                    StartInfo = new ProcessStartInfo
+                                    {
                                         FileName = "Akka.NodeTestRunner.exe",
+                                        UseShellExecute = false,
+                                        RedirectStandardOutput = true,
                                         Arguments = sbArguments.ToString()
                                     }
                                 };
+#endif
 
                                 processes.Add(process);
                                 var nodeIndex = nodeTest.Node;
@@ -300,7 +362,7 @@ static void Main(string[] args)
                     }
                 }
             }
-            
+
             CloseAllSinks();
 
             //Block until all Sinks have been terminated.
@@ -313,6 +375,11 @@ static void Main(string[] args)
             Environment.Exit(ExitCodeContainer.ExitCode);
         }
 
+        static string ChangeDllPathPlatform(string path, string targetPlatform)
+        {
+            return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(path), "..", targetPlatform, Path.GetFileName(path)));
+        }
+
         static void EnableAllSinks(string assemblyName, string platform)
         {
             var now = DateTime.UtcNow;

src/core/Akka.NodeTestRunner/Program.cs

@@ -59,11 +59,19 @@ static int Main(string[] args)
             {
                 try
                 {
-                    assembly = Assembly.Load(new AssemblyName(asm.FullName));
+                    Assembly.Load(new AssemblyName(asm.FullName));
                 }
                 catch (Exception)
                 {
-                    assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.Combine(basePath, asm.Name + ".dll"));
+                    var path = Path.Combine(basePath, asm.Name + ".dll");
+                    try
+                    {
+                        AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.Out.WriteLine($"Failed to load dll: {path}");
+                    }
                 }
             }
 #endif