pzittlau/flicker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix flaky tests

Browse Source
This commit is contained in:
Pascal Zittlau
2025-12-17 10:14:05 +01:00
parent 3d7532c906
commit de10ce58e2
3 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/TODO.md
View File

@@ -22,7 +22,7 @@ IvyBridge(2012) and AMD Zen 2 Family 17H(2019) and Linux 5.9(2020).
- [ ] JIT support: intercept `mmap`, `mprotect` and `mremap` that change pages to be executable - [ ] JIT support: intercept `mmap`, `mprotect` and `mremap` that change pages to be executable
- [ ] `SIGILL` patching fallback - [ ] `SIGILL` patching fallback
- [x] `vdso` handling - [x] `vdso` handling
- [ ] check why the libc tests are flaky - [x] check why the libc tests are flaky
## Minor things ## Minor things

2
src/Patcher.zig
View File

@@ -854,7 +854,7 @@ fn ensureRangeWritable(
const gop = try allocated_pages.getOrPut(gpa, page_addr); const gop = try allocated_pages.getOrPut(gpa, page_addr);
if (gop.found_existing) { if (gop.found_existing) {
const ptr: [*]align(page_size) u8 = @ptrFromInt(page_addr); const ptr: [*]align(page_size) u8 = @ptrFromInt(page_addr);
try posix.mprotect(ptr[0..page_addr], protection); try posix.mprotect(ptr[0..page_size], protection);
} else { } else {
const addr = posix.mmap( const addr = posix.mmap(
@ptrFromInt(page_addr), @ptrFromInt(page_addr),

57
src/main.zig
View File

@@ -332,10 +332,9 @@ test "nolibc_nopie_exit" {
test "nolibc_pie_exit" { test "nolibc_pie_exit" {
try testHelper(&.{ flicker_path, getTestExePath("nolibc_pie_exit") }, ""); try testHelper(&.{ flicker_path, getTestExePath("nolibc_pie_exit") }, "");
} }
// BUG: This one is flaky test "libc_pie_exit" {
// test "libc_pie_exit" { try testHelper(&.{ flicker_path, getTestExePath("libc_pie_exit") }, "");
// try testHelper(&.{ flicker_path, getTestExePath("libc_pie_exit") }, ""); }
// }
test "nolibc_nopie_helloWorld" { test "nolibc_nopie_helloWorld" {
try testHelper(&.{ flicker_path, getTestExePath("nolibc_nopie_helloWorld") }, "Hello World!\n"); try testHelper(&.{ flicker_path, getTestExePath("nolibc_nopie_helloWorld") }, "Hello World!\n");
@@ -343,10 +342,9 @@ test "nolibc_nopie_helloWorld" {
test "nolibc_pie_helloWorld" { test "nolibc_pie_helloWorld" {
try testHelper(&.{ flicker_path, getTestExePath("nolibc_pie_helloWorld") }, "Hello World!\n"); try testHelper(&.{ flicker_path, getTestExePath("nolibc_pie_helloWorld") }, "Hello World!\n");
} }
// BUG: This one is flaky test "libc_pie_helloWorld" {
// test "libc_pie_helloWorld" { try testHelper(&.{ flicker_path, getTestExePath("libc_pie_helloWorld") }, "Hello World!\n");
// try testHelper(&.{ flicker_path, getTestExePath("libc_pie_helloWorld") }, "Hello World!\n"); }
// }
test "nolibc_nopie_printArgs" { test "nolibc_nopie_printArgs" {
try testPrintArgs("nolibc_nopie_printArgs"); try testPrintArgs("nolibc_nopie_printArgs");
@@ -354,10 +352,9 @@ test "nolibc_nopie_printArgs" {
test "nolibc_pie_printArgs" { test "nolibc_pie_printArgs" {
try testPrintArgs("nolibc_pie_printArgs"); try testPrintArgs("nolibc_pie_printArgs");
} }
// BUG: This one is flaky test "libc_pie_printArgs" {
// test "libc_pie_printArgs" { try testPrintArgs("libc_pie_printArgs");
// try testPrintArgs("libc_pie_printArgs"); }
// }
test "nolibc_nopie_readlink" { test "nolibc_nopie_readlink" {
try testReadlink("nolibc_nopie_readlink"); try testReadlink("nolibc_nopie_readlink");
@@ -365,7 +362,7 @@ test "nolibc_nopie_readlink" {
test "nolibc_pie_readlink" { test "nolibc_pie_readlink" {
try testReadlink("nolibc_pie_readlink"); try testReadlink("nolibc_pie_readlink");
} }
// BUG: This one just outputs the path to the flicker executable and is likely also flaky // BUG: This one just outputs the path to the flicker executable
// test "libc_pie_readlink" { // test "libc_pie_readlink" {
// try testReadlink("libc_pie_readlink"); // try testReadlink("libc_pie_readlink");
// } // }
@@ -396,10 +393,6 @@ test "nolibc_pie_clone_no_new_stack" {
); );
} }
test "echo" {
try testHelper(&.{ "echo", "Hello", "There" }, "Hello There\n");
}
test "nolibc_nopie_fork" { test "nolibc_nopie_fork" {
try testHelper( try testHelper(
&.{ flicker_path, getTestExePath("nolibc_nopie_fork") }, &.{ flicker_path, getTestExePath("nolibc_nopie_fork") },
@@ -412,13 +405,12 @@ test "nolibc_pie_fork" {
"Child: I'm alive!\nParent: Child died.\n", "Child: I'm alive!\nParent: Child died.\n",
); );
} }
// BUG: This one is flaky test "libc_pie_fork" {
// test "libc_pie_fork" { try testHelper(
// try testHelper( &.{ flicker_path, getTestExePath("libc_pie_fork") },
// &.{ flicker_path, getTestExePath("libc_pie_fork") }, "Child: I'm alive!\nParent: Child died.\n",
// "Child: I'm alive!\nParent: Child died.\n", );
// ); }
// }
test "nolibc_nopie_signal_handler" { test "nolibc_nopie_signal_handler" {
try testHelper( try testHelper(
@@ -445,13 +437,16 @@ test "nolibc_pie_vdso_clock" {
"Time gotten\n", "Time gotten\n",
); );
} }
// BUG: This one is flaky test "libc_pie_vdso_clock" {
// test "libc_pie_vdso_clock" { try testHelper(
// try testHelper( &.{ flicker_path, getTestExePath("libc_pie_vdso_clock") },
// &.{ flicker_path, getTestExePath("libc_pie_vdso_clock") }, "Time gotten\n",
// "Time gotten\n", );
// ); }
// }
test "echo" {
try testHelper(&.{ "echo", "Hello", "There" }, "Hello There\n");
}
fn testPrintArgs(comptime name: []const u8) !void { fn testPrintArgs(comptime name: []const u8) !void {
const exe_path = getTestExePath(name); const exe_path = getTestExePath(name);