test ci

Author: GuillaumeLagrange

src/environment/linked_libraries/elf_view.zig

@@ -197,28 +197,28 @@ fn testFixture() ?TestFixture {
 // -- findPhdr --
 
 test "findPhdr returns PT_DYNAMIC" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const phdr = fixture.view.findPhdr(elf.PT_DYNAMIC);
     try std.testing.expect(phdr != null);
     try std.testing.expectEqual(elf.PT_DYNAMIC, phdr.?.p_type);
 }
 
 test "findPhdr returns PT_NOTE" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const phdr = fixture.view.findPhdr(elf.PT_NOTE);
     try std.testing.expect(phdr != null);
     try std.testing.expectEqual(elf.PT_NOTE, phdr.?.p_type);
 }
 
 test "findPhdr returns null for absent type" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     try std.testing.expectEqual(null, fixture.view.findPhdr(elf.PT_SHLIB));
 }
 
 // -- dynamicEntries --
 
 test "dynamicEntries returns non-empty" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries();
     try std.testing.expect(entries != null);
     try std.testing.expect(entries.?.len > 0);
@@ -227,21 +227,21 @@ test "dynamicEntries returns non-empty" {
 // -- dynVal --
 
 test "dynVal finds DT_STRTAB" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries() orelse return error.NoDynamic;
     try std.testing.expect(dynVal(entries, elf.DT_STRTAB) != null);
 }
 
 test "dynVal returns null for absent tag" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries() orelse return error.NoDynamic;
     try std.testing.expectEqual(null, dynVal(entries, 0x7ffffffd));
 }
 
 // -- soname --
 
 test "soname is libtest_fixture.so" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries() orelse return error.NoDynamic;
     const table = Self.strtab(entries) orelse return error.NoStrtab;
     const name = Self.soname(entries, table);
@@ -252,7 +252,7 @@ test "soname is libtest_fixture.so" {
 // -- buildId --
 
 test "buildId returns hardcoded value" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const id = fixture.view.buildId() orelse return error.NoBuildId;
 
     // The test fixture is built with a fixed build ID: 0xdeadbeef (4 bytes)
@@ -263,7 +263,7 @@ test "buildId returns hardcoded value" {
 // -- verdefIterator --
 
 test "verdefIterator first entry is libtest_fixture.so (BASE)" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries() orelse return error.NoDynamic;
     const table = Self.strtab(entries) orelse return error.NoStrtab;
     var iter = fixture.view.verdefIterator(entries, table) orelse return error.NoVerdef;
@@ -274,7 +274,7 @@ test "verdefIterator first entry is libtest_fixture.so (BASE)" {
 }
 
 test "verdefIterator yields exactly 3 entries" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries() orelse return error.NoDynamic;
     const table = Self.strtab(entries) orelse return error.NoStrtab;
     var iter = fixture.view.verdefIterator(entries, table) orelse return error.NoVerdef;
@@ -285,7 +285,7 @@ test "verdefIterator yields exactly 3 entries" {
 }
 
 test "verdefIterator yields TESTLIB_1.0 and TESTLIB_2.0" {
-    const fixture = testFixture() orelse return error.TestFixtureNotLoaded;
+    const fixture = testFixture() orelse return error.SkipZigTest;
     const entries = fixture.view.dynamicEntries() orelse return error.NoDynamic;
     const table = Self.strtab(entries) orelse return error.NoStrtab;
     var iter = fixture.view.verdefIterator(entries, table) orelse return error.NoVerdef;

src/tests/runner.zig

@@ -11,9 +11,12 @@ pub fn main() !void {
         const result = t.func();
         if (result) |_| {
             try std.fmt.format(out, "[SUCCESS] {s}\n", .{name});
-        } else |err| {
-            has_failures = true;
-            try std.fmt.format(out, "[FAIL] {s}: {}\n", .{ t.name, err });
+        } else |err| switch (err) {
+            error.SkipZigTest => try std.fmt.format(out, "[SKIP] {s}\n", .{name}),
+            else => {
+                has_failures = true;
+                try std.fmt.format(out, "[FAIL] {s}: {}\n", .{ t.name, err });
+            },
         }
 
         if (std.testing.allocator_instance.deinit() == .leak) {