From 67e4f554b8fb6abb657f48427d4759de2b05a890 Mon Sep 17 00:00:00 2001 From: Shawn Jones Date: Sun, 1 Sep 2024 19:29:10 +0800 Subject: [PATCH] add main test --- .gitignore | 1 + build.zig | 78 +++++----------------------------------- build.zig.zon | 9 ++--- src/main.zig | 24 ------------- src/main_test.zig | 3 ++ src/migton.zig | 5 +++ src/root.zig | 10 ------ src/test/migton_test.zig | 6 ++++ 8 files changed, 27 insertions(+), 109 deletions(-) create mode 100644 .gitignore delete mode 100644 src/main.zig create mode 100644 src/main_test.zig create mode 100644 src/migton.zig delete mode 100644 src/root.zig create mode 100644 src/test/migton_test.zig diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3cef7be --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +zig-cache/ diff --git a/build.zig b/build.zig index 09b28c9..810e0f1 100644 --- a/build.zig +++ b/build.zig @@ -4,77 +4,17 @@ pub fn build(b: *std.Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - const lib = b.addStaticLibrary(.{ - .name = "migton", - // In this case the main source file is merely a path, however, in more - // complicated build scripts, this could be a generated file. - .root_source_file = b.path("src/root.zig"), + _ = b.addModule("migton", .{ .root_source_file = b.path("src/migton.zig") }); + + // main test + const main_test = b.addTest(.{ + .root_source_file = b.path("src/main_test.zig"), .target = target, .optimize = optimize, }); + // run main test + const run_main_tests = b.addRunArtifact(main_test); - // This declares intent for the library to be installed into the standard - // location when the user invokes the "install" step (the default step when - // running `zig build`). - b.installArtifact(lib); - - const exe = b.addExecutable(.{ - .name = "migton", - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, - }); - - // This declares intent for the executable to be installed into the - // standard location when the user invokes the "install" step (the default - // step when running `zig build`). - b.installArtifact(exe); - - // This *creates* a Run step in the build graph, to be executed when another - // step is evaluated that depends on it. The next line below will establish - // such a dependency. - const run_cmd = b.addRunArtifact(exe); - - // By making the run step depend on the install step, it will be run from the - // installation directory rather than directly from within the cache directory. - // This is not necessary, however, if the application depends on other installed - // files, this ensures they will be present and in the expected location. - run_cmd.step.dependOn(b.getInstallStep()); - - // This allows the user to pass arguments to the application in the build - // command itself, like this: `zig build run -- arg1 arg2 etc` - if (b.args) |args| { - run_cmd.addArgs(args); - } - - // This creates a build step. It will be visible in the `zig build --help` menu, - // and can be selected like this: `zig build run` - // This will evaluate the `run` step rather than the default, which is "install". - const run_step = b.step("run", "Run the app"); - run_step.dependOn(&run_cmd.step); - - // Creates a step for unit testing. This only builds the test executable - // but does not run it. - const lib_unit_tests = b.addTest(.{ - .root_source_file = b.path("src/root.zig"), - .target = target, - .optimize = optimize, - }); - - const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests); - - const exe_unit_tests = b.addTest(.{ - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, - }); - - const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); - - // Similar to creating the run step earlier, this exposes a `test` step to - // the `zig build --help` menu, providing a way for the user to request - // running the unit tests. - const test_step = b.step("test", "Run unit tests"); - test_step.dependOn(&run_lib_unit_tests.step); - test_step.dependOn(&run_exe_unit_tests.step); + const test_step = b.step("test", "Run library Test."); + test_step.dependOn(&run_main_tests.step); } diff --git a/build.zig.zon b/build.zig.zon index e2640ca..eef0542 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,11 +1,8 @@ .{ .name = "migton", - .version = "0.0.0", + .version = "0.1.0", - .dependencies = .{ - }, + .dependencies = .{}, - .paths = .{ - "", - }, + .paths = .{ "src", "build.zig", "build.zig.zone" }, } diff --git a/src/main.zig b/src/main.zig deleted file mode 100644 index c8a3f67..0000000 --- a/src/main.zig +++ /dev/null @@ -1,24 +0,0 @@ -const std = @import("std"); - -pub fn main() !void { - // Prints to stderr (it's a shortcut based on `std.io.getStdErr()`) - std.debug.print("All your {s} are belong to us.\n", .{"codebase"}); - - // stdout is for the actual output of your application, for example if you - // are implementing gzip, then only the compressed bytes should be sent to - // stdout, not any debugging messages. - const stdout_file = std.io.getStdOut().writer(); - var bw = std.io.bufferedWriter(stdout_file); - const stdout = bw.writer(); - - try stdout.print("Run `zig build test` to run the tests.\n", .{}); - - try bw.flush(); // don't forget to flush! -} - -test "simple test" { - var list = std.ArrayList(i32).init(std.testing.allocator); - defer list.deinit(); // try commenting this out and see if zig detects the memory leak! - try list.append(42); - try std.testing.expectEqual(@as(i32, 42), list.pop()); -} diff --git a/src/main_test.zig b/src/main_test.zig new file mode 100644 index 0000000..83addfa --- /dev/null +++ b/src/main_test.zig @@ -0,0 +1,3 @@ +test { + _ = @import("test/migton_test.zig"); +} diff --git a/src/migton.zig b/src/migton.zig new file mode 100644 index 0000000..d54f507 --- /dev/null +++ b/src/migton.zig @@ -0,0 +1,5 @@ +const std = @import("std"); + +pub fn migton_test() void { + std.debug.print("Hello, Migton Test!\n", .{}); +} diff --git a/src/root.zig b/src/root.zig deleted file mode 100644 index ecfeade..0000000 --- a/src/root.zig +++ /dev/null @@ -1,10 +0,0 @@ -const std = @import("std"); -const testing = std.testing; - -export fn add(a: i32, b: i32) i32 { - return a + b; -} - -test "basic add functionality" { - try testing.expect(add(3, 7) == 10); -} diff --git a/src/test/migton_test.zig b/src/test/migton_test.zig new file mode 100644 index 0000000..38cd7b9 --- /dev/null +++ b/src/test/migton_test.zig @@ -0,0 +1,6 @@ +const std = @import("std"); +const migton = @import("../migton.zig"); + +test "test export" { + migton.migton_test(); +}