Run SimpleWriteLine test as well. Continuing working CosmosOS#140

nwiede · Jun 21, 2015 · 5115e29 · 5115e29
1 parent 89d62cc
commit 5115e29
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Bochs.cs b/Tests/Cosmos.TestRunner.Core/Engine.Bochs.cs
@@ -65,6 +65,7 @@ private void RunIsoInBochs(string iso)
             {
                 xBochs.Stop();
                 xDebugConnector.Dispose();
+                Thread.Sleep(50);
             }
         }
 

diff --git a/Tests/Cosmos.TestRunner.Core/Engine.cs b/Tests/Cosmos.TestRunner.Core/Engine.cs
@@ -31,19 +31,19 @@ public void Execute()
                 throw new InvalidOperationException("No OutputHandler set!");
             }
 
-            mBaseWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(Engine).Assembly.Location), "WorkingDirectory");
-            if (Directory.Exists(mBaseWorkingDirectory))
-            {
-                Directory.Delete(mBaseWorkingDirectory, true);
-            }
-            Directory.CreateDirectory(mBaseWorkingDirectory);
-
             OutputHandler.ExecutionStart();
             try
             {
                 // todo: test with multiple configurations (for example, ELF and BIN format, with or without stack corruption detection, etc)
                 foreach (var xAssemblyFile in mKernelsToRun)
                 {
+                    mBaseWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(Engine).Assembly.Location), "WorkingDirectory");
+                    if (Directory.Exists(mBaseWorkingDirectory))
+                    {
+                        Directory.Delete(mBaseWorkingDirectory, true);
+                    }
+                    Directory.CreateDirectory(mBaseWorkingDirectory);
+
                     ExecuteKernel(xAssemblyFile);
                 }
             }

diff --git a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj
@@ -55,6 +55,10 @@
       <Project>{BDC011BE-6041-4A58-A6E7-0F592E78CB27}</Project>
       <Name>Cosmos.Compiler.Tests.Interfaces.Kernel</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Cosmos.Compiler.Tests.SimpleWriteLine.Kernel\Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.csproj">
+      <Project>{57045fe8-b0fe-4fc1-810f-7c3914aef1de}</Project>
+      <Name>Cosmos.Compiler.Tests.SimpleWriteLine.Kernel</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj">
       <Project>{758FAF24-9974-4DB8-82EF-1B64DAF2F0BC}</Project>
       <Name>Cosmos.TestRunner.Core</Name>

diff --git a/Tests/Cosmos.TestRunner/Program.cs b/Tests/Cosmos.TestRunner/Program.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cosmos.Compiler.Tests.Interfaces.Kernel;
 using Cosmos.TestRunner.Core;
 
 namespace Cosmos.TestRunner.Console
@@ -13,7 +12,11 @@ class Program
         static void Main(string[] args)
         {
             var xEngine = new Engine();
-            xEngine.AddKernel(typeof(Kernel).Assembly.Location);
+
+            xEngine.AddKernel(typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.Kernel).Assembly.Location);
+            xEngine.AddKernel(typeof(Cosmos.Compiler.Tests.Interfaces.Kernel.Kernel).Assembly.Location);
+
+
             xEngine.OutputHandler = new OutputHandlerConsole();
             xEngine.Execute();
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ private void RunIsoInBochs(string iso) @@
                 {
                     xBochs.Stop();
                     xDebugConnector.Dispose();
+                    Thread.Sleep(50);
                 }
             }
@@ Expand Down @@