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

Add log tests

Browse source
This commit is contained in:
Sam Tebbs 2019-10-08 11:20:37 +01:00 committed by Sam Tebbs
parent 526d1cee93
commit 36aeced2c3
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/kernel/kmain.zig
View file

@ -36,7 +36,11 @@ export fn kmain(mb_info: *multiboot.multiboot_info_t, mb_magic: u32) void {
var buffer = mem_profile.vaddr_end[0..mem_profile.fixed_alloc_size];
var fixed_allocator = std.heap.FixedBufferAllocator.init(buffer);
serial.init(serial.DEFAULT_BAUDRATE, serial.Port.COM1) catch unreachable;
serial.init(serial.DEFAULT_BAUDRATE, serial.Port.COM1) catch |e| {
panic_root(@errorReturnTrace(), "Failed to initialise serial: {}", e);
};
if (build_options.rt_test)
log.runtimeTests();
log.logInfo("Init arch " ++ @tagName(builtin.arch) ++ "\n");
arch.init(&mem_profile, &fixed_allocator.allocator, build_options);

16
src/kernel/log.zig
View file

@ -31,3 +31,19 @@ pub fn logWarning(comptime format: []const u8, args: ...) void {
pub fn logError(comptime format: []const u8, args: ...) void {
log(Level.ERROR, format, args);
}
pub fn runtimeTests() void {
inline for (@typeInfo(Level).Enum.fields) |field| {
const level = @field(Level, field.name);
log(level, "Test " ++ field.name ++ " level\n");
log(level, "Test " ++ field.name ++ " level with args {}, {}\n", "a", u32(1));
const logFn = switch (level) {
.INFO => logInfo,
.DEBUG => logDebug,
.WARNING => logWarning,
.ERROR => logError,
};
logFn("Test " ++ field.name ++ " function\n");
logFn("Test " ++ field.name ++ " function with args {}, {}\n", "a", u32(1));
}
}

6
test/rt-test.py
View file

@ -31,7 +31,11 @@ def test_pass(case, exp, expected_idx, found):
def get_pre_archinit_cases():
return [
TestCase("Serial tests", [r"c", r"123"], ""),
TestCase("Arch init starts", [r"Init arch \w+"]),
TestCase("Log info tests", [r"Test INFO level", r"Test INFO level with args a, 1", r"Test INFO function", r"Test INFO function with args a, 1"], "\[INFO\] "),
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("Arch init starts", [r"Init arch \w+"])
]
def get_post_archinit_cases():