Fix demo tests not working for console CoolWorld

Signed-off-by: AnErrupTion <[email protected]>
mosa · May 18, 2024 · 6013a04 · 6013a04
1 parent 2722797
commit 6013a04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -300,7 +300,7 @@ jobs:
       - name: Demo Test - BareMetal TestWorld
         run: bin\Mosa.Tool.Launcher.Console.exe bin\Mosa.BareMetal.TestWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters
       - name: Demo Test - BareMetal Console CoolWorld
-        run: bin\Mosa.Tool.Launcher.Console.dll bin\Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -bootoptions consolemode
+        run: bin\Mosa.Tool.Launcher.Console.dll bin\Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -bootoptions coolworldui=consolemode,bootoptions=serialdebug
       - name: Demo Test - BareMetal Graphical CoolWorld
         run: bin\Mosa.Tool.Launcher.Console.dll bin\Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -vmware-svga -include bin\Include
 
@@ -336,7 +336,7 @@ jobs:
       - name: Demo Test - BareMetal TestWorld
         run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.TestWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters
       - name: Demo Test - BareMetal Console CoolWorld
-        run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -bootoptions consolemode
+        run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -bootoptions coolworldui=consolemode,bootoptions=serialdebug
       - name: Demo Test - BareMetal Graphical CoolWorld
         run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -vmware-svga -include bin/Include
 
@@ -370,7 +370,7 @@ jobs:
       - name: Demo Test - BareMetal TestWorld
         run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.TestWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters
       - name: Demo Test - BareMetal Console CoolWorld
-        run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -bootoptions consolemode
+        run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -bootoptions coolworldui=consolemode,bootoptions=serialdebug
       - name: Demo Test - BareMetal Graphical CoolWorld
         run: dotnet bin/Mosa.Tool.Launcher.Console.dll bin/Mosa.BareMetal.CoolWorld.x86.dll -o${{ matrix.optimization }} -check -test -output-counters -vmware-svga -include bin/Include
 

diff --git a/Source/Mosa.BareMetal.CoolWorld/Console/ConsoleMode.cs b/Source/Mosa.BareMetal.CoolWorld/Console/ConsoleMode.cs
@@ -58,10 +58,4 @@ public static void Bullet(ConsoleColor color)
 		System.Console.Write("*");
 		System.Console.ForegroundColor = restore;
 	}
-
-	[Plug("Mosa.Runtime.StartUp::BootOptions")]
-	public static void SetBootOptions()
-	{
-		BootSettings.EnableDebugOutput = true;
-	}
 }
diff --git a/Source/Mosa.BareMetal.CoolWorld/Program.cs b/Source/Mosa.BareMetal.CoolWorld/Program.cs
@@ -3,17 +3,24 @@
 using Mosa.BareMetal.CoolWorld.Console;
 using Mosa.BareMetal.CoolWorld.Graphical;
 using Mosa.Kernel.BareMetal;
+using Mosa.Runtime.Plug;
 
 namespace Mosa.BareMetal.CoolWorld;
 
 public static class Program
 {
+	[Plug("Mosa.Runtime.StartUp::BootOptions")]
+	public static void SetBootOptions()
+	{
+		BootSettings.EnableDebugOutput = true;
+	}
+
 	public static void EntryPoint()
 	{
 		Debug.WriteLine("Program::EntryPoint()");
 		Debug.WriteLine("##PASS##");
 
-		if (BootOptions.Contains("consolemode"))
+		if (BootOptions.Contains("coolworldui") && BootOptions.GetValue("coolworldui") == "consolemode")
 			ConsoleMode.Initialize();
 		else
 			Desktop.Start();