Cleanup
This commit is contained in:
		
							parent
							
								
									8d0420e478
								
							
						
					
					
						commit
						000d233f50
					
				
					 3 changed files with 1 additions and 100 deletions
				
			
		
							
								
								
									
										58
									
								
								build.zig
									
										
									
									
									
								
							
							
						
						
									
										58
									
								
								build.zig
									
										
									
									
									
								
							| 
						 | 
					@ -1,34 +1,9 @@
 | 
				
			||||||
const std = @import("std");
 | 
					const std = @import("std");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Although this function looks imperative, note that its job is to
 | 
					 | 
				
			||||||
// declaratively construct a build graph that will be executed by an external
 | 
					 | 
				
			||||||
// runner.
 | 
					 | 
				
			||||||
pub fn build(b: *std.Build) void {
 | 
					pub fn build(b: *std.Build) void {
 | 
				
			||||||
    // Standard target options allows the person running `zig build` to choose
 | 
					 | 
				
			||||||
    // what target to build for. Here we do not override the defaults, which
 | 
					 | 
				
			||||||
    // means any target is allowed, and the default is native. Other options
 | 
					 | 
				
			||||||
    // for restricting supported target set are available.
 | 
					 | 
				
			||||||
    const target = b.standardTargetOptions(.{});
 | 
					    const target = b.standardTargetOptions(.{});
 | 
				
			||||||
 | 
					 | 
				
			||||||
    // Standard optimization options allow the person running `zig build` to select
 | 
					 | 
				
			||||||
    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
 | 
					 | 
				
			||||||
    // set a preferred release mode, allowing the user to decide how to optimize.
 | 
					 | 
				
			||||||
    const optimize = b.standardOptimizeOption(.{});
 | 
					    const optimize = b.standardOptimizeOption(.{});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const lib = b.addStaticLibrary(.{
 | 
					 | 
				
			||||||
        .name = "newtest",
 | 
					 | 
				
			||||||
        // 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"),
 | 
					 | 
				
			||||||
        .target = target,
 | 
					 | 
				
			||||||
        .optimize = optimize,
 | 
					 | 
				
			||||||
    });
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // 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(.{
 | 
					    const exe = b.addExecutable(.{
 | 
				
			||||||
        .name = "newtest",
 | 
					        .name = "newtest",
 | 
				
			||||||
        .root_source_file = b.path("src/main.zig"),
 | 
					        .root_source_file = b.path("src/main.zig"),
 | 
				
			||||||
| 
						 | 
					@ -36,56 +11,25 @@ pub fn build(b: *std.Build) void {
 | 
				
			||||||
        .optimize = optimize,
 | 
					        .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);
 | 
					    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);
 | 
					    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());
 | 
					    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| {
 | 
					    if (b.args) |args| {
 | 
				
			||||||
        run_cmd.addArgs(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");
 | 
					    const run_step = b.step("run", "Run the app");
 | 
				
			||||||
    run_step.dependOn(&run_cmd.step);
 | 
					    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(.{
 | 
					    const exe_unit_tests = b.addTest(.{
 | 
				
			||||||
        .root_source_file = b.path("src/main.zig"),
 | 
					        .root_source_file = b.path("src/main.zig"),
 | 
				
			||||||
        .target = target,
 | 
					        .target = target,
 | 
				
			||||||
        .optimize = optimize,
 | 
					        .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");
 | 
					    const test_step = b.step("test", "Run unit tests");
 | 
				
			||||||
    test_step.dependOn(&run_lib_unit_tests.step);
 | 
					    const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
 | 
				
			||||||
    test_step.dependOn(&run_exe_unit_tests.step);
 | 
					    test_step.dependOn(&run_exe_unit_tests.step);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										30
									
								
								src/main.zig
									
										
									
									
									
								
							
							
						
						
									
										30
									
								
								src/main.zig
									
										
									
									
									
								
							| 
						 | 
					@ -1,6 +1,3 @@
 | 
				
			||||||
//! By convention, main.zig is where your main function lives in the case that
 | 
					 | 
				
			||||||
//! you are building an executable. If you are making a library, the convention
 | 
					 | 
				
			||||||
//! is to delete this file and start with root.zig instead.
 | 
					 | 
				
			||||||
const std = @import("std");
 | 
					const std = @import("std");
 | 
				
			||||||
const Vec3 = @import("vector.zig").Vec3;
 | 
					const Vec3 = @import("vector.zig").Vec3;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,31 +6,4 @@ pub fn main() !void {
 | 
				
			||||||
    const b = Vec3.new(4.0, 5.0, 6.0);
 | 
					    const b = Vec3.new(4.0, 5.0, 6.0);
 | 
				
			||||||
    const c = a.dot(b);
 | 
					    const c = a.dot(b);
 | 
				
			||||||
    std.debug.print("a dot b = {d}\n", .{c});
 | 
					    std.debug.print("a dot b = {d}\n", .{c});
 | 
				
			||||||
 | 
					 | 
				
			||||||
    // 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());
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
test "fuzz example" {
 | 
					 | 
				
			||||||
    // Try passing `--fuzz` to `zig build` and see if it manages to fail this test case!
 | 
					 | 
				
			||||||
    const input_bytes = std.testing.fuzzInput(.{});
 | 
					 | 
				
			||||||
    try std.testing.expect(!std.mem.eql(u8, "canyoufindme", input_bytes));
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										13
									
								
								src/root.zig
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								src/root.zig
									
										
									
									
									
								
							| 
						 | 
					@ -1,13 +0,0 @@
 | 
				
			||||||
//! By convention, root.zig is the root source file when making a library. If
 | 
					 | 
				
			||||||
//! you are making an executable, the convention is to delete this file and
 | 
					 | 
				
			||||||
//! start with main.zig instead.
 | 
					 | 
				
			||||||
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);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue