Fixed tests.

Kutyus · Aug 1, 2017 · 3a4260b · 3a4260b
1 parent 9757786
commit 3a4260b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
@@ -37,7 +37,7 @@ public static void Apply(Engine engine)
             //engine.StartBochsDebugGui = true;
 
             // Select kernels to be tested by adding them to the engine
-            foreach (var xType in TestKernelSets.GetStableKernelTypes())
+            foreach (var xType in TestKernelSets.GetKernelTypesToRun())
             {
                 engine.AddKernel(xType.GetTypeInfo().Assembly.Location);
             }

diff --git a/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs b/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs
@@ -5,24 +5,32 @@ namespace Cosmos.TestRunner.Core
 {
     public static class TestKernelSets
     {
+        // Kernel types to run: the ones that will run in test runners that use the default engine configuration.
+        public static IEnumerable<Type> GetKernelTypesToRun()
+        {
+            yield return typeof(KernelGen3.Boot);
+            //return GetStableKernelTypes();
+        }
+
+        // Stable kernel types: the ones that are stable and will run in AppVeyor
         public static IEnumerable<Type> GetStableKernelTypes()
         {
             //yield return typeof(BoxingTests.Kernel);
-            //yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel);
-            ////yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel);
-            //yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel);
-            //yield return typeof(Cosmos.Compiler.Tests.LinqTests.Kernel);
-            //yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel);
-            //yield return typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel);
-            //yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel);
-            //yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel);
-            //yield return typeof(Cosmos.Kernel.Tests.IO.Kernel);
-            //yield return typeof(SimpleStructsAndArraysTest.Kernel);
-            //yield return typeof(VGACompilerCrash.Kernel);
+            yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel);
+            //yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel);
+            yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel);
+            yield return typeof(Cosmos.Compiler.Tests.LinqTests.Kernel);
+            yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel);
+            yield return typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel);
+            yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel);
+            yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel);
+            yield return typeof(Cosmos.Kernel.Tests.IO.Kernel);
+            yield return typeof(SimpleStructsAndArraysTest.Kernel);
+            yield return typeof(VGACompilerCrash.Kernel);
 
             //yield return typeof(FrotzKernel.Kernel);
 
-            yield return typeof(KernelGen3.Boot);
+            //yield return typeof(KernelGen3.Boot);
 
             /* Please see the notes on the kernel itself before enabling it */
             //yield return typeof(GraphicTest.Kernel);