Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps/lest/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
pname = "lest";
version = "1.36.0";
version = "1.37.0";

meta = {
description = "A tiny C++11 test framework – lest errors escape testing.";
Expand All @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchGit {
url = "https://github.com/martinmoene/lest.git";
ref = "refs/tags/v${version}";
rev = "57197f32f2c7d3f3d3664a9010d3ff181a40f6ca";
rev = "fe1996f438ab8d1611c0324a156f9130ed971e9f";
};

cmakeBuildType = "Debug";
Expand Down
2 changes: 1 addition & 1 deletion test/kernel/integration/exception/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def is_good(line):
if (counter == expected):
vm.exit(0, "All tests passed")

vm.on_output("\\x15\\x07\\t\*\*\*\* PANIC \*\*\*\*", is_good)
vm.on_output("\\x15\\x07\\t\\*\\*\\*\\* PANIC \\*\\*\\*\\*", is_good)
vm.on_output("Divide-by-zero Error", is_good)

vm.on_output("__cpu_exception", is_good)
Expand Down
2 changes: 2 additions & 0 deletions test/kernel/integration/paging/service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,15 @@ int main()
auto pml3 = __pml4->page_dir(__pml4->entry(magic_loc));
auto pml2 = pml3->page_dir(pml3->entry(magic_loc));
auto pml1 = pml2->page_dir(pml2->entry(magic_loc));
(void) pml1;

// Write-protect
if (magic->reboots == 0) {

pml3 = __pml4->page_dir(__pml4->entry(mapped.lin));
pml2 = pml3->page_dir(pml3->entry(mapped.lin));
pml1 = pml2->page_dir(pml2->entry(mapped.lin));
(void) pml1;

protected_page[magic->i] = 'a';
mem::protect_range((uint64_t)protected_page, mem::Access::read);
Expand Down
2 changes: 1 addition & 1 deletion test/kernel/integration/smp/service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void Service::start()
printf("CPU %i active \n", i);
SMP::global_unlock();

SMP::add_task([i]{
SMP::add_task([]{
// NOTE: We can't call printf here as it's not SMP safe

// Test regular malloc
Expand Down