:: commit f48783eef79b7b8b237df0f6af51c9d857d1da97

mintsuki <mintsuki@protonmail.com> — 2021-11-19 14:17

parents: da6dc040c9

test: Minor multiboot fixes

diff --git a/test/Makefile b/test/Makefile
index 11501b60..c21479f8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -65,4 +65,6 @@ multiboot.elf: multiboot_trampoline.o
 	nasm -felf32 $< -o $@
 
 clean:
-	rm -rf test.elf stivale.o stivale2.o e9print.o memory.o multiboot2.o multiboot2.elf multiboot2_trampoline.o multiboot_trampoline.o multiboot.elf
+	rm -rf test.elf stivale.o stivale2.o e9print.o memory.o
+	rm -rf multiboot2.o multiboot2.elf multiboot2_trampoline.o
+	rm -rf multiboot.o multiboot_trampoline.o multiboot.elf
diff --git a/test/limine.cfg b/test/limine.cfg
index d21849c6..6aa90749 100644
--- a/test/limine.cfg
+++ b/test/limine.cfg
@@ -1,4 +1,4 @@
-DEFAULT_ENTRY=3
+DEFAULT_ENTRY=1
 TIMEOUT=3
 GRAPHICS=yes
 VERBOSE=yes
@@ -38,21 +38,6 @@ KERNEL_CMDLINE=Woah! Another another example!
 MODULE_PATH=boot:///boot/bg.bmp
 MODULE_STRING=This is the background image!
 
-:Multiboot1 Test
-
-COMMENT=Test of the multiboot1 boot protocol.
-
-PROTOCOL=multiboot1
-RESOLUTION=800x600
-KERNEL_PATH=boot:///boot/multiboot.elf
-KERNEL_CMDLINE=Woah! Another another another example!
-
-MODULE_PATH=boot:///boot/bg.bmp
-MODULE_STRING=This is the background image! Yay!
-
-# Test that this should be NULL:
-MODULE_PATH=boot:///boot/bg.bmp
-
 :EFI Chainloading
 
 COMMENT=Test EFI image chainloading.
@@ -78,6 +63,21 @@ MODULE_STRING=yooooo
 MODULE_PATH=boot:///boot/bg.bmp
 MODULE_STRING=yooooo
 
+::Multiboot1 Test
+
+COMMENT=Test of the multiboot1 boot protocol.
+
+PROTOCOL=multiboot1
+RESOLUTION=800x600
+KERNEL_PATH=boot:///boot/multiboot.elf
+KERNEL_CMDLINE=Woah! Another another another example!
+
+MODULE_PATH=boot:///boot/bg.bmp
+MODULE_STRING=This is the background image! Yay!
+
+# Test that this should be NULL:
+MODULE_PATH=boot:///boot/bg.bmp
+
 :Test hdd://
 
 PROTOCOL=stivale2
tab: 248 wrap: offon