Imbus/pluto
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Load grub modules on mem init

Browse source
This commit is contained in:
Sam Tebbs 2019-11-02 02:00:49 +00:00 • committed by Sam Tebbs
parent 762ddc3a63
commit 01490f051c
7 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/mock/kernel/arch_mock.zig
View file

@ -4,6 +4,7 @@ const mem = @import("mem_mock.zig");
const MemProfile = mem.MemProfile;
const gdt = @import("gdt_mock.zig");
const idt = @import("idt_mock.zig");
const multiboot = @import("../../../src/kernel/multiboot.zig");
const mock_framework = @import("mock_framework.zig");
pub const initTest = mock_framework.initTest;
@ -86,7 +87,7 @@ pub fn haltNoInterrupts() noreturn {
while (true) {}
}
pub fn init(mem_profile: *const MemProfile, allocator: *Allocator, comptime options: type) void {
pub fn init(mb_info: *multiboot.multiboot_info_t, mem_profile: *const MemProfile, allocator: *Allocator) void {
// I'll get back to this as this doesn't effect the GDT testing.
// When I come on to the mem.zig testing, I'll fix :)
//return mock_framework.performAction("init", void, mem_profile, allocator);

1
test/rt-test.py
View file

@ -35,6 +35,7 @@ def get_pre_archinit_cases():
TestCase("Log debug tests", [r"Test DEBUG level", r"Test DEBUG level with args a, 1", r"Test DEBUG function", r"Test DEBUG function with args a, 1"], "\[DEBUG\] "),
TestCase("Log warning tests", [r"Test WARNING level", r"Test WARNING level with args a, 1", r"Test WARNING function", r"Test WARNING function with args a, 1"], "\[WARNING\] "),
TestCase("Log error tests", [r"Test ERROR level", r"Test ERROR level with args a, 1", r"Test ERROR function", r"Test ERROR function with args a, 1"], "\[ERROR\] "),
TestCase("Mem init", [r"Init mem", r"Done"]),
TestCase("Arch init starts", [r"Init arch \w+"])
]