Ongoing work for CosmosOS#140.

gitter-badger · Jun 21, 2015 · dcd7785 · dcd7785
1 parent 1828c66
commit dcd7785
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 32 deletions.
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Bochs.cs b/Tests/Cosmos.TestRunner.Core/Engine.Bochs.cs
@@ -32,6 +32,8 @@ private void RunIsoInBochs(string iso)
             xDebugConnector.Error = e =>
                                     {
                                         OutputHandler.LogMessage("DC Error: " + e.ToString());
+                                        OutputHandler.SetKernelTestResult(false, "DC Error");
+                                        mKernelResultSet = true;
                                         mBochsRunning = false;
                                     };
             xDebugConnector.CmdText += s => OutputHandler.LogMessage("Text from kernel: " + s);
@@ -88,26 +90,22 @@ private void ChannelPacketReceived(byte arg1, byte arg2, byte[] arg3)
                 // for now, skip
                 return;
             }
-            if (arg1 != TestController.TestChannel)
+            if (arg1 == TestController.TestChannel)
             {
-                throw new Exception("Unhandled channel " + arg1);
-            }
-
-            switch (arg2)
-            {
-                case (byte)TestChannelCommandEnum.TestCompleted:
-                    mBochsRunning = false;
-                    break;
-                case (byte)TestChannelCommandEnum.TestFailed:
-                    OutputHandler.SetKernelTestResult(false, "Test failed");
-                    mKernelResultSet = true;
-                    mBochsRunning = false;
-                    break;
-                case (byte)TestChannelCommandEnum.AssertionSucceeded:
-                    Interlocked.Increment(ref mSucceededAssertions);
-                    break;
-                default:
-                    throw new NotImplementedException("TestChannel command " + arg2 + " is not implemented!");
+                switch (arg2)
+                {
+                    case (byte)TestChannelCommandEnum.TestCompleted:
+                        mBochsRunning = false;
+                        break;
+                    case (byte)TestChannelCommandEnum.TestFailed:
+                        OutputHandler.SetKernelTestResult(false, "Test failed");
+                        mKernelResultSet = true;
+                        mBochsRunning = false;
+                        break;
+                    case (byte)TestChannelCommandEnum.AssertionSucceeded:
+                        Interlocked.Increment(ref mSucceededAssertions);
+                        break;
+                }
             }
         }
     }

diff --git a/Tests/Cosmos.TestRunner.Core/Engine.cs b/Tests/Cosmos.TestRunner.Core/Engine.cs
@@ -78,7 +78,7 @@ public void Execute()
         private IEnumerable<RunConfiguration> GetRunConfigurations()
         {
             yield return new RunConfiguration {IsELF = true};
-            yield return new RunConfiguration {IsELF = false};
+            //yield return new RunConfiguration {IsELF = false};
         }
     }
 }
diff --git a/Tests/Cosmos.TestRunner.Core/OutputHandlerXml.cs b/Tests/Cosmos.TestRunner.Core/OutputHandlerXml.cs
@@ -106,7 +106,7 @@ public override void TaskEnd(string taskName)
         {
             mTaskStopwatch.Stop();
             var xItem = mCurrentNode.Pop();
-            xItem.Attributes.Append(NewXmlAttribute("Duration", mKernelStopwatch.Elapsed.ToString("c")));
+            xItem.Attributes.Append(NewXmlAttribute("Duration", mTaskStopwatch.Elapsed.ToString("c")));
         }
 
         public override void SetKernelTestResult(bool succeeded, string message)

diff --git a/Tests/Cosmos.TestRunner.TestController/TestController.cs b/Tests/Cosmos.TestRunner.TestController/TestController.cs
@@ -15,11 +15,7 @@ internal static Debugger Debugger
         {
             get
             {
-                if (mDebugger == null)
-                {
-                    mDebugger = new Debugger("Tests", "TestController");
-                }
-                return mDebugger;
+                return new Debugger("Tests", "TestController");
             }
         }
 
@@ -36,7 +32,7 @@ public static void Failed()
 
         internal static void AssertionSucceeded()
         {
-            Debugger.SendChannelCommand(TestChannel, (byte)TestChannelCommandEnum.AssertionSucceeded, new byte[0]);
+            //Debugger.SendChannelCommand(TestChannel, (byte)TestChannelCommandEnum.AssertionSucceeded, new byte[0]);
         }
     }
 }
diff --git a/Tests/Cosmos.TestRunner/Program.cs b/Tests/Cosmos.TestRunner/Program.cs
@@ -14,13 +14,13 @@ static void Main(string[] args)
             var xEngine = new Engine();
 
             xEngine.AddKernel(typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.Kernel).Assembly.Location);
-
+            xEngine.AddKernel(typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.Kernel).Assembly.Location);
 
             // known bugs, therefor disabled for now:
             //xEngine.AddKernel(typeof(Cosmos.Compiler.Tests.Interfaces.Kernel.Kernel).Assembly.Location);
 
-            //xEngine.OutputHandler = new OutputHandlerXml(@"c:\data\CosmosTests.xml");
-            xEngine.OutputHandler = new OutputHandlerConsole();
+            xEngine.OutputHandler = new OutputHandlerXml(@"c:\data\CosmosTests.xml");
+            //xEngine.OutputHandler = new OutputHandlerConsole();
             xEngine.Execute();
         }
     }

diff --git a/source/Cosmos.Debug.Common/DebugConnector.cs b/source/Cosmos.Debug.Common/DebugConnector.cs
@@ -652,9 +652,12 @@ protected void PacketPong(byte[] aPacket)
 
         protected void PacketChannel(byte channel, byte command, byte[] aPacket)
         {
-            if (CmdChannel != null)
+            if (SigReceived)
             {
-                CmdChannel(channel, command, aPacket);
+                if (CmdChannel != null)
+                {
+                    CmdChannel(channel, command, aPacket);
+                }
             }
             WaitForMessage();
         }