From 5cb1c72ae3bc11b6943f2977eb3d2d645d923315 Mon Sep 17 00:00:00 2001
From: Santeri Hannula <santeri@urbit.org>
Date: Fri, 8 Nov 2024 18:04:14 +0200
Subject: [PATCH] build: refactor tests

---
 build.zig     | 355 ++++++++++++++++----------------------------------
 build.zig.zon |   4 -
 2 files changed, 114 insertions(+), 245 deletions(-)

diff --git a/build.zig b/build.zig
index f0637149aa..85a3e38b44 100644
--- a/build.zig
+++ b/build.zig
@@ -299,11 +299,6 @@ fn buildBinary(
         .optimize = optimize,
     });
 
-    const zlib = b.dependency("zlib", .{
-        .target = target,
-        .optimize = optimize,
-    });
-
     //
     // Build Artifact
     //
@@ -373,253 +368,131 @@ fn buildBinary(
     //
 
     if (cfg.include_test_steps) {
-        // pkg_ur
-        addTest(
-            b,
-            target,
-            optimize,
-            "ur-test",
-            "pkg/ur/tests.c",
-            &.{pkg_ur.artifact("ur")},
-            urbit_flags.items,
-        );
-
-        // pkg_ent
-        addTest(
-            b,
-            target,
-            optimize,
-            "ent-test",
-            "pkg/ent/tests.c",
-            &.{pkg_ent.artifact("ent")},
-            urbit_flags.items,
-        );
-
-        // pkg_noun
-        addTest(
-            b,
-            target,
-            optimize,
-            "hashtable-test",
-            "pkg/noun/hashtable_tests.c",
-            &.{
-                pkg_noun.artifact("noun"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
+        const noun_test_deps = &.{
+            pkg_noun.artifact("noun"),
+            pkg_c3.artifact("c3"),
+            gmp.artifact("gmp"),
+        };
+        const vere_test_deps = &.{
+            pkg_vere.artifact("vere"),
+            pkg_noun.artifact("noun"),
+            pkg_ur.artifact("ur"),
+            pkg_ent.artifact("ent"),
+            pkg_c3.artifact("c3"),
+            gmp.artifact("gmp"),
+            libuv.artifact("libuv"),
+            lmdb.artifact("lmdb"),
+            natpmp.artifact("natpmp"),
+        };
+        const tests = [_]struct {
+            name: []const u8,
+            file: []const u8,
+            deps: []const *std.Build.Step.Compile,
+        }{
+            // pkg_ur
+            .{
+                .name = "ur-test",
+                .file = "pkg/ur/tests.c",
+                .deps = &.{pkg_ur.artifact("ur")},
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "jets-test",
-            "pkg/noun/jets_tests.c",
-            &.{
-                pkg_noun.artifact("noun"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
+            // pkg_ent
+            .{
+                .name = "ent-test",
+                .file = "pkg/ent/tests.c",
+                .deps = &.{pkg_ent.artifact("ent")},
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "nock-test",
-            "pkg/noun/nock_tests.c",
-            &.{
-                pkg_noun.artifact("noun"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
+            // pkg_noun
+            .{
+                .name = "hashtable-test",
+                .file = "pkg/noun/hashtable_tests.c",
+                .deps = noun_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "retrieve-test",
-            "pkg/noun/retrieve_tests.c",
-            &.{
-                pkg_noun.artifact("noun"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
+            .{
+                .name = "jets-test",
+                .file = "pkg/noun/jets_tests.c",
+                .deps = noun_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "serial-test",
-            "pkg/noun/serial_tests.c",
-            &.{
-                pkg_noun.artifact("noun"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
+            .{
+                .name = "nock-test",
+                .file = "pkg/noun/nock_tests.c",
+                .deps = noun_test_deps,
             },
-            urbit_flags.items,
-        );
-
-        // vere
-        addTest(
-            b,
-            target,
-            optimize,
-            "ames-test",
-            "pkg/vere/ames_tests.c",
-            &.{
-                pkg_vere.artifact("vere"),
-                pkg_noun.artifact("noun"),
-                pkg_ur.artifact("ur"),
-                pkg_ent.artifact("ent"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
-                libuv.artifact("libuv"),
-                lmdb.artifact("lmdb"),
-                natpmp.artifact("natpmp"),
-                zlib.artifact("z"),
+            .{
+                .name = "retrieve-test",
+                .file = "pkg/noun/retrieve_tests.c",
+                .deps = noun_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "boot-test",
-            "pkg/vere/boot_tests.c",
-            &.{
-                pkg_vere.artifact("vere"),
-                pkg_noun.artifact("noun"),
-                pkg_ur.artifact("ur"),
-                pkg_ent.artifact("ent"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
-                libuv.artifact("libuv"),
-                lmdb.artifact("lmdb"),
-                natpmp.artifact("natpmp"),
+            .{
+                .name = "serial-test",
+                .file = "pkg/noun/serial_tests.c",
+                .deps = noun_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "newt-test",
-            "pkg/vere/newt_tests.c",
-            &.{
-                pkg_vere.artifact("vere"),
-                pkg_noun.artifact("noun"),
-                pkg_ur.artifact("ur"),
-                pkg_ent.artifact("ent"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
-                libuv.artifact("libuv"),
-                lmdb.artifact("lmdb"),
-                natpmp.artifact("natpmp"),
+            // pkg_vere
+            .{
+                .name = "ames-test",
+                .file = "pkg/vere/ames_tests.c",
+                .deps = vere_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "vere-noun-test",
-            "pkg/vere/noun_tests.c",
-            &.{
-                pkg_vere.artifact("vere"),
-                pkg_noun.artifact("noun"),
-                pkg_ur.artifact("ur"),
-                pkg_ent.artifact("ent"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
-                libuv.artifact("libuv"),
-                lmdb.artifact("lmdb"),
-                natpmp.artifact("natpmp"),
+            .{
+                .name = "boot-test",
+                .file = "pkg/vere/boot_tests.c",
+                .deps = vere_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "unix-test",
-            "pkg/vere/unix_tests.c",
-            &.{
-                pkg_vere.artifact("vere"),
-                pkg_noun.artifact("noun"),
-                pkg_ur.artifact("ur"),
-                pkg_ent.artifact("ent"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
-                libuv.artifact("libuv"),
-                lmdb.artifact("lmdb"),
-                natpmp.artifact("natpmp"),
+            .{
+                .name = "newt-test",
+                .file = "pkg/vere/newt_tests.c",
+                .deps = vere_test_deps,
             },
-            urbit_flags.items,
-        );
-        addTest(
-            b,
-            target,
-            optimize,
-            "benchmarks",
-            "pkg/vere/benchmarks.c",
-            &.{
-                pkg_vere.artifact("vere"),
-                pkg_noun.artifact("noun"),
-                pkg_ur.artifact("ur"),
-                pkg_ent.artifact("ent"),
-                pkg_c3.artifact("c3"),
-                gmp.artifact("gmp"),
-                libuv.artifact("libuv"),
-                lmdb.artifact("lmdb"),
-                natpmp.artifact("natpmp"),
+            .{
+                .name = "vere-noun-test",
+                .file = "pkg/vere/noun_tests.c",
+                .deps = vere_test_deps,
             },
-            urbit_flags.items,
-        );
-    }
-}
-
-fn addTest(
-    b: *std.Build,
-    target: std.Build.ResolvedTarget,
-    optimize: std.builtin.OptimizeMode,
-    name: []const u8,
-    file: []const u8,
-    deps: []const *std.Build.Step.Compile,
-    cflags: []const []const u8,
-) void {
-    const test_step = b.step(name, b.fmt("Build & run: {s}", .{file}));
-
-    const test_exe = b.addExecutable(.{
-        .name = name,
-        .target = target,
-        .optimize = optimize,
-    });
-
-    if (target.result.isDarwin() and !target.query.isNative()) {
-        const macos_sdk = b.lazyDependency("macos_sdk", .{
-            .target = target,
-            .optimize = optimize,
-        });
-        if (macos_sdk != null) {
-            test_exe.addSystemIncludePath(macos_sdk.?.path("usr/include"));
-            test_exe.addLibraryPath(macos_sdk.?.path("usr/lib"));
-            test_exe.addFrameworkPath(macos_sdk.?.path("System/Library/Frameworks"));
+            .{
+                .name = "unix-test",
+                .file = "pkg/vere/unix_tests.c",
+                .deps = vere_test_deps,
+            },
+            .{
+                .name = "benchmarks",
+                .file = "pkg/vere/benchmarks.c",
+                .deps = vere_test_deps,
+            },
+        };
+
+        for (tests) |tst| {
+            const test_step =
+                b.step(tst.name, b.fmt("Build & run: {s}", .{tst.file}));
+            const test_exe = b.addExecutable(.{
+                .name = tst.name,
+                .target = target,
+                .optimize = optimize,
+            });
+
+            if (t.isDarwin() and !target.query.isNative()) {
+                const macos_sdk = b.lazyDependency("macos_sdk", .{
+                    .target = target,
+                    .optimize = optimize,
+                });
+                if (macos_sdk != null) {
+                    test_exe.addSystemIncludePath(macos_sdk.?.path("usr/include"));
+                    test_exe.addLibraryPath(macos_sdk.?.path("usr/lib"));
+                    test_exe.addFrameworkPath(macos_sdk.?.path("System/Library/Frameworks"));
+                }
+            }
+
+            test_exe.stack_size = 0;
+            test_exe.linkLibC();
+            for (tst.deps) |dep| {
+                test_exe.linkLibrary(dep);
+            }
+            test_exe.addCSourceFiles(.{
+                .files = &.{tst.file},
+                .flags = urbit_flags.items,
+            });
+            const run_unit_tests = b.addRunArtifact(test_exe);
+            run_unit_tests.skip_foreign_checks = true;
+            test_step.dependOn(&run_unit_tests.step);
         }
     }
-
-    test_exe.stack_size = 0;
-
-    test_exe.linkLibC();
-    for (deps) |dep| {
-        test_exe.linkLibrary(dep);
-    }
-
-    test_exe.addCSourceFiles(.{ .files = &.{file}, .flags = cflags });
-
-    const run_unit_tests = b.addRunArtifact(test_exe);
-    run_unit_tests.skip_foreign_checks = true;
-    test_step.dependOn(&run_unit_tests.step);
 }
diff --git a/build.zig.zon b/build.zig.zon
index b3e3900e00..7ca9fa35cd 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -52,10 +52,6 @@
         .whereami = .{
             .path = "./ext/whereami",
         },
-        .zlib = .{
-            .url = "https://github.com/allyourcodebase/zlib/archive/0918e87b7629b9c6a50a08edd0ce30d849758faf.tar.gz",
-            .hash = "122034ab2a12adf8016ffa76e48b4be3245ffd305193edba4d83058adbcfa749c107",
-        },
     },
     .paths = .{
         "",