From 6013a046ce11096ef8ad2a452b5c0d6a9cbf09f0 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Sat, 18 May 2024 19:28:21 +0200 Subject: [PATCH] Fix demo tests not working for console CoolWorld Signed-off-by: AnErrupTion --- .github/workflows/builds.yml | 6 +++--- Source/Mosa.BareMetal.CoolWorld/Console/ConsoleMode.cs | 6 ------ Source/Mosa.BareMetal.CoolWorld/Program.cs | 9 ++++++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index a853ff3efa..5e1a0af97c 100644 --- 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 index 8d7e23ab24..5d0dc72cf5 100644 --- 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 index 6bf19062c0..5bd03cfc7c 100644 --- 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();