2017-04-19 18:00:12 +00:00
|
|
|
const std = @import("std");
|
2020-02-25 08:43:21 +00:00
|
|
|
const builtin = std.builtin;
|
2017-04-19 18:00:12 +00:00
|
|
|
const debug = std.debug;
|
2017-10-31 08:47:55 +00:00
|
|
|
const warn = debug.warn;
|
2017-04-19 18:00:12 +00:00
|
|
|
const build = std.build;
|
2020-02-26 06:18:23 +00:00
|
|
|
const CrossTarget = std.zig.CrossTarget;
|
2017-04-19 18:00:12 +00:00
|
|
|
const io = std.io;
|
2019-05-26 17:17:34 +00:00
|
|
|
const fs = std.fs;
|
2017-04-19 18:00:12 +00:00
|
|
|
const mem = std.mem;
|
|
|
|
const fmt = std.fmt;
|
2017-05-04 18:05:06 +00:00
|
|
|
const ArrayList = std.ArrayList;
|
2017-08-30 18:55:26 +00:00
|
|
|
const Mode = builtin.Mode;
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const LibExeObjStep = build.LibExeObjStep;
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2020-01-03 03:45:48 +00:00
|
|
|
// Cases
|
2017-04-19 20:59:20 +00:00
|
|
|
const compare_output = @import("compare_output.zig");
|
2019-07-16 16:15:46 +00:00
|
|
|
const standalone = @import("standalone.zig");
|
2019-09-03 14:08:39 +00:00
|
|
|
const stack_traces = @import("stack_traces.zig");
|
2017-04-19 20:59:20 +00:00
|
|
|
const compile_errors = @import("compile_errors.zig");
|
|
|
|
const assemble_and_link = @import("assemble_and_link.zig");
|
2018-01-25 06:46:12 +00:00
|
|
|
const runtime_safety = @import("runtime_safety.zig");
|
2017-11-24 19:56:05 +00:00
|
|
|
const translate_c = @import("translate_c.zig");
|
2020-01-03 03:45:48 +00:00
|
|
|
const run_translated_c = @import("run_translated_c.zig");
|
2018-01-23 03:24:07 +00:00
|
|
|
const gen_h = @import("gen_h.zig");
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2020-01-03 03:45:48 +00:00
|
|
|
// Implementations
|
2020-01-05 07:01:28 +00:00
|
|
|
pub const TranslateCContext = @import("src/translate_c.zig").TranslateCContext;
|
2020-01-03 03:45:48 +00:00
|
|
|
pub const RunTranslatedCContext = @import("src/run_translated_c.zig").RunTranslatedCContext;
|
2020-01-05 07:01:28 +00:00
|
|
|
pub const CompareOutputContext = @import("src/compare_output.zig").CompareOutputContext;
|
2020-01-03 03:45:48 +00:00
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
const TestTarget = struct {
|
2020-02-26 06:18:23 +00:00
|
|
|
target: CrossTarget = @as(CrossTarget, .{}),
|
2019-09-22 03:55:56 +00:00
|
|
|
mode: builtin.Mode = .Debug,
|
|
|
|
link_libc: bool = false,
|
|
|
|
single_threaded: bool = false,
|
2019-09-22 18:40:54 +00:00
|
|
|
disable_native: bool = false,
|
2019-09-22 03:55:56 +00:00
|
|
|
};
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
const test_targets = blk: {
|
|
|
|
// getBaselineCpuFeatures calls populateDependencies which has a O(N ^ 2) algorithm
|
|
|
|
// (where N is roughly 160, which technically makes it O(1), but it adds up to a
|
|
|
|
// lot of branches)
|
|
|
|
@setEvalBranchQuota(50000);
|
|
|
|
break :blk [_]TestTarget{
|
|
|
|
TestTarget{},
|
|
|
|
TestTarget{
|
|
|
|
.link_libc = true,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.single_threaded = true,
|
|
|
|
},
|
2019-09-22 03:55:56 +00:00
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .x86_64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .none,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .x86_64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .gnu,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .x86_64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .musl,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .i386,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .none,
|
2019-11-30 15:13:33 +00:00
|
|
|
},
|
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .i386,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .musl,
|
2019-11-30 15:13:33 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-11-30 15:13:33 +00:00
|
|
|
},
|
2020-04-03 22:36:13 +00:00
|
|
|
// https://github.com/ziglang/zig/issues/4926
|
|
|
|
//TestTarget{
|
|
|
|
// .target = .{
|
|
|
|
// .cpu_arch = .i386,
|
|
|
|
// .os_tag = .linux,
|
|
|
|
// .abi = .gnu,
|
|
|
|
// },
|
|
|
|
// .link_libc = true,
|
|
|
|
//},
|
2019-11-30 15:13:33 +00:00
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .aarch64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .none,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .aarch64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .musl,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .aarch64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .gnu,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = CrossTarget.parse(.{
|
2020-02-20 02:30:36 +00:00
|
|
|
.arch_os_abi = "arm-linux-none",
|
2020-02-20 23:31:17 +00:00
|
|
|
.cpu_features = "generic+v8a",
|
2020-02-20 02:30:36 +00:00
|
|
|
}) catch unreachable,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = CrossTarget.parse(.{
|
2020-02-20 02:30:36 +00:00
|
|
|
.arch_os_abi = "arm-linux-musleabihf",
|
2020-02-20 23:31:17 +00:00
|
|
|
.cpu_features = "generic+v8a",
|
2020-02-20 02:30:36 +00:00
|
|
|
}) catch unreachable,
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-25 19:57:13 +00:00
|
|
|
},
|
2020-04-03 22:36:13 +00:00
|
|
|
// https://github.com/ziglang/zig/issues/3287
|
2020-01-22 22:13:31 +00:00
|
|
|
//TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
// .target = CrossTarget.parse(.{
|
2020-02-20 02:30:36 +00:00
|
|
|
// .arch_os_abi = "arm-linux-gnueabihf",
|
2020-02-20 23:31:17 +00:00
|
|
|
// .cpu_features = "generic+v8a",
|
2020-02-20 02:30:36 +00:00
|
|
|
// }) catch unreachable,
|
2020-01-22 22:13:31 +00:00
|
|
|
// .link_libc = true,
|
|
|
|
//},
|
2019-09-22 03:55:56 +00:00
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .mipsel,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .none,
|
2019-09-21 21:00:36 +00:00
|
|
|
},
|
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .mipsel,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .musl,
|
2019-09-27 16:20:17 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-27 16:20:17 +00:00
|
|
|
},
|
2020-04-03 22:36:13 +00:00
|
|
|
// https://github.com/ziglang/zig/issues/4927
|
|
|
|
//TestTarget{
|
|
|
|
// .target = .{
|
|
|
|
// .cpu_arch = .mipsel,
|
|
|
|
// .os_tag = .linux,
|
|
|
|
// .abi = .gnu,
|
|
|
|
// },
|
|
|
|
// .link_libc = true,
|
|
|
|
//},
|
2019-09-21 21:00:36 +00:00
|
|
|
|
2020-04-02 23:48:48 +00:00
|
|
|
TestTarget{
|
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .riscv64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .none,
|
|
|
|
},
|
|
|
|
},
|
2020-02-17 05:06:19 +00:00
|
|
|
|
2020-04-03 15:02:22 +00:00
|
|
|
TestTarget{
|
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .riscv64,
|
|
|
|
.os_tag = .linux,
|
|
|
|
.abi = .musl,
|
|
|
|
},
|
|
|
|
.link_libc = true,
|
|
|
|
},
|
2020-02-17 05:06:19 +00:00
|
|
|
|
|
|
|
// https://github.com/ziglang/zig/issues/3340
|
|
|
|
//TestTarget{
|
2020-03-03 14:44:13 +00:00
|
|
|
// .target = .{
|
|
|
|
// .cpu_arch = .riscv64,
|
|
|
|
// .os = .linux,
|
|
|
|
// .abi = .gnu,
|
2020-02-17 05:06:19 +00:00
|
|
|
// },
|
|
|
|
// .link_libc = true,
|
|
|
|
//},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .x86_64,
|
|
|
|
.os_tag = .macosx,
|
|
|
|
.abi = .gnu,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
2020-04-03 22:36:13 +00:00
|
|
|
// https://github.com/ziglang/zig/issues/3295
|
2020-01-22 22:13:31 +00:00
|
|
|
.disable_native = true,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .i386,
|
|
|
|
.os_tag = .windows,
|
|
|
|
.abi = .msvc,
|
2019-10-11 17:13:59 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .x86_64,
|
|
|
|
.os_tag = .windows,
|
|
|
|
.abi = .msvc,
|
2019-09-22 03:55:56 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .i386,
|
|
|
|
.os_tag = .windows,
|
|
|
|
.abi = .gnu,
|
2019-10-09 20:49:33 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-10-09 20:49:33 +00:00
|
|
|
},
|
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
2020-02-26 06:18:23 +00:00
|
|
|
.target = .{
|
|
|
|
.cpu_arch = .x86_64,
|
|
|
|
.os_tag = .windows,
|
|
|
|
.abi = .gnu,
|
2019-09-22 23:11:41 +00:00
|
|
|
},
|
2020-01-22 22:13:31 +00:00
|
|
|
.link_libc = true,
|
2019-09-22 23:11:41 +00:00
|
|
|
},
|
2019-09-22 18:41:47 +00:00
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
// Do the release tests last because they take a long time
|
|
|
|
TestTarget{
|
|
|
|
.mode = .ReleaseFast,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.link_libc = true,
|
|
|
|
.mode = .ReleaseFast,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.mode = .ReleaseFast,
|
|
|
|
.single_threaded = true,
|
|
|
|
},
|
2019-09-22 18:41:47 +00:00
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
|
|
|
.mode = .ReleaseSafe,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.link_libc = true,
|
|
|
|
.mode = .ReleaseSafe,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.mode = .ReleaseSafe,
|
|
|
|
.single_threaded = true,
|
|
|
|
},
|
2019-09-22 18:41:47 +00:00
|
|
|
|
2020-01-22 22:13:31 +00:00
|
|
|
TestTarget{
|
|
|
|
.mode = .ReleaseSmall,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.link_libc = true,
|
|
|
|
.mode = .ReleaseSmall,
|
|
|
|
},
|
|
|
|
TestTarget{
|
|
|
|
.mode = .ReleaseSmall,
|
|
|
|
.single_threaded = true,
|
|
|
|
},
|
|
|
|
};
|
2017-08-30 18:55:26 +00:00
|
|
|
};
|
|
|
|
|
2017-10-31 08:47:55 +00:00
|
|
|
const max_stdout_size = 1 * 1024 * 1024; // 1 MB
|
|
|
|
|
2018-07-11 23:38:01 +00:00
|
|
|
pub fn addCompareOutputTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const cases = b.allocator.create(CompareOutputContext) catch unreachable;
|
|
|
|
cases.* = CompareOutputContext{
|
2017-04-19 18:00:12 +00:00
|
|
|
.b = b,
|
|
|
|
.step = b.step("test-compare-output", "Run the compare output tests"),
|
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2018-07-11 23:38:01 +00:00
|
|
|
.modes = modes,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-19 18:00:12 +00:00
|
|
|
|
|
|
|
compare_output.addCases(cases);
|
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2019-09-03 14:08:39 +00:00
|
|
|
pub fn addStackTraceTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
|
|
|
const cases = b.allocator.create(StackTracesContext) catch unreachable;
|
|
|
|
cases.* = StackTracesContext{
|
2019-05-28 00:07:05 +00:00
|
|
|
.b = b,
|
2019-09-03 14:08:39 +00:00
|
|
|
.step = b.step("test-stack-traces", "Run the stack trace tests"),
|
2019-05-28 00:07:05 +00:00
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
|
|
|
.modes = modes,
|
|
|
|
};
|
|
|
|
|
2019-09-03 14:08:39 +00:00
|
|
|
stack_traces.addCases(cases);
|
2019-05-28 00:07:05 +00:00
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2018-07-11 23:38:01 +00:00
|
|
|
pub fn addRuntimeSafetyTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const cases = b.allocator.create(CompareOutputContext) catch unreachable;
|
|
|
|
cases.* = CompareOutputContext{
|
2017-04-19 18:41:59 +00:00
|
|
|
.b = b,
|
2018-01-25 06:46:12 +00:00
|
|
|
.step = b.step("test-runtime-safety", "Run the runtime safety tests"),
|
2017-04-19 18:41:59 +00:00
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2018-07-11 23:38:01 +00:00
|
|
|
.modes = modes,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-19 18:41:59 +00:00
|
|
|
|
2018-01-25 06:46:12 +00:00
|
|
|
runtime_safety.addCases(cases);
|
2017-04-19 18:41:59 +00:00
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2018-07-11 23:38:01 +00:00
|
|
|
pub fn addCompileErrorTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const cases = b.allocator.create(CompileErrorContext) catch unreachable;
|
|
|
|
cases.* = CompileErrorContext{
|
2017-04-19 18:00:12 +00:00
|
|
|
.b = b,
|
|
|
|
.step = b.step("test-compile-errors", "Run the compile error tests"),
|
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2018-07-11 23:38:01 +00:00
|
|
|
.modes = modes,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-19 18:00:12 +00:00
|
|
|
|
|
|
|
compile_errors.addCases(cases);
|
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
pub fn addStandaloneTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
|
|
|
const cases = b.allocator.create(StandaloneContext) catch unreachable;
|
|
|
|
cases.* = StandaloneContext{
|
2017-04-19 18:00:12 +00:00
|
|
|
.b = b,
|
2019-07-16 16:15:46 +00:00
|
|
|
.step = b.step("test-standalone", "Run the standalone tests"),
|
2017-04-19 18:00:12 +00:00
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2018-07-18 08:28:14 +00:00
|
|
|
.modes = modes,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
standalone.addCases(cases);
|
2017-04-19 18:00:12 +00:00
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2018-09-17 21:08:56 +00:00
|
|
|
pub fn addCliTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
|
|
|
const step = b.step("test-cli", "Test the command line interface");
|
|
|
|
|
|
|
|
const exe = b.addExecutable("test-cli", "test/cli.zig");
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const run_cmd = exe.run();
|
2019-11-27 08:30:39 +00:00
|
|
|
run_cmd.addArgs(&[_][]const u8{
|
2019-05-26 17:37:34 +00:00
|
|
|
fs.realpathAlloc(b.allocator, b.zig_exe) catch unreachable,
|
2018-09-17 21:08:56 +00:00
|
|
|
b.pathFromRoot(b.cache_root),
|
|
|
|
});
|
|
|
|
|
|
|
|
step.dependOn(&run_cmd.step);
|
|
|
|
return step;
|
|
|
|
}
|
|
|
|
|
2018-07-11 23:38:01 +00:00
|
|
|
pub fn addAssembleAndLinkTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const cases = b.allocator.create(CompareOutputContext) catch unreachable;
|
|
|
|
cases.* = CompareOutputContext{
|
2017-04-19 18:00:12 +00:00
|
|
|
.b = b,
|
|
|
|
.step = b.step("test-asm-link", "Run the assemble and link tests"),
|
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2018-07-11 23:38:01 +00:00
|
|
|
.modes = modes,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-19 18:00:12 +00:00
|
|
|
|
|
|
|
assemble_and_link.addCases(cases);
|
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addTranslateCTests(b: *build.Builder, test_filter: ?[]const u8) *build.Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const cases = b.allocator.create(TranslateCContext) catch unreachable;
|
|
|
|
cases.* = TranslateCContext{
|
2017-04-19 20:59:20 +00:00
|
|
|
.b = b,
|
2018-01-23 03:24:07 +00:00
|
|
|
.step = b.step("test-translate-c", "Run the C transation tests"),
|
2017-04-19 20:59:20 +00:00
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-19 20:59:20 +00:00
|
|
|
|
2017-11-24 19:56:05 +00:00
|
|
|
translate_c.addCases(cases);
|
2017-04-19 20:59:20 +00:00
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2020-01-03 03:45:48 +00:00
|
|
|
pub fn addRunTranslatedCTests(b: *build.Builder, test_filter: ?[]const u8) *build.Step {
|
|
|
|
const cases = b.allocator.create(RunTranslatedCContext) catch unreachable;
|
|
|
|
cases.* = .{
|
|
|
|
.b = b,
|
|
|
|
.step = b.step("test-run-translated-c", "Run the Run-Translated-C tests"),
|
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
|
|
|
};
|
|
|
|
|
|
|
|
run_translated_c.addCases(cases);
|
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addGenHTests(b: *build.Builder, test_filter: ?[]const u8) *build.Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const cases = b.allocator.create(GenHContext) catch unreachable;
|
|
|
|
cases.* = GenHContext{
|
2018-01-23 03:24:07 +00:00
|
|
|
.b = b,
|
|
|
|
.step = b.step("test-gen-h", "Run the C header file generation tests"),
|
|
|
|
.test_index = 0,
|
|
|
|
.test_filter = test_filter,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2018-01-23 03:24:07 +00:00
|
|
|
|
|
|
|
gen_h.addCases(cases);
|
|
|
|
|
|
|
|
return cases.step;
|
|
|
|
}
|
|
|
|
|
2019-05-15 01:21:59 +00:00
|
|
|
pub fn addPkgTests(
|
|
|
|
b: *build.Builder,
|
|
|
|
test_filter: ?[]const u8,
|
|
|
|
root_src: []const u8,
|
|
|
|
name: []const u8,
|
|
|
|
desc: []const u8,
|
|
|
|
modes: []const Mode,
|
2019-09-22 03:55:56 +00:00
|
|
|
skip_single_threaded: bool,
|
2019-05-15 01:21:59 +00:00
|
|
|
skip_non_native: bool,
|
2019-09-22 03:55:56 +00:00
|
|
|
skip_libc: bool,
|
|
|
|
is_wine_enabled: bool,
|
|
|
|
is_qemu_enabled: bool,
|
|
|
|
glibc_dir: ?[]const u8,
|
2019-05-15 01:21:59 +00:00
|
|
|
) *build.Step {
|
2019-12-09 03:53:51 +00:00
|
|
|
const step = b.step(b.fmt("test-{}", .{name}), desc);
|
2019-09-09 21:57:32 +00:00
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
for (test_targets) |test_target| {
|
2020-02-26 06:18:23 +00:00
|
|
|
if (skip_non_native and !test_target.target.isNative())
|
2019-09-22 03:55:56 +00:00
|
|
|
continue;
|
2019-09-09 21:57:32 +00:00
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
if (skip_libc and test_target.link_libc)
|
|
|
|
continue;
|
|
|
|
|
2020-02-26 06:18:23 +00:00
|
|
|
if (test_target.link_libc and test_target.target.getOs().requiresLibC()) {
|
2019-09-22 03:55:56 +00:00
|
|
|
// This would be a redundant test.
|
2019-05-15 01:21:59 +00:00
|
|
|
continue;
|
2017-04-20 06:26:36 +00:00
|
|
|
}
|
2019-09-22 03:55:56 +00:00
|
|
|
|
|
|
|
if (skip_single_threaded and test_target.single_threaded)
|
|
|
|
continue;
|
|
|
|
|
2019-09-22 18:40:54 +00:00
|
|
|
const ArchTag = @TagType(builtin.Arch);
|
|
|
|
if (test_target.disable_native and
|
2020-02-26 06:18:23 +00:00
|
|
|
test_target.target.getOsTag() == std.Target.current.os.tag and
|
|
|
|
test_target.target.getCpuArch() == std.Target.current.cpu.arch)
|
2019-09-22 18:40:54 +00:00
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
const want_this_mode = for (modes) |m| {
|
|
|
|
if (m == test_target.mode) break true;
|
|
|
|
} else false;
|
|
|
|
if (!want_this_mode) continue;
|
|
|
|
|
2020-02-26 06:18:23 +00:00
|
|
|
const libc_prefix = if (test_target.target.getOs().requiresLibC())
|
2019-09-22 03:55:56 +00:00
|
|
|
""
|
|
|
|
else if (test_target.link_libc)
|
|
|
|
"c"
|
|
|
|
else
|
|
|
|
"bare";
|
|
|
|
|
2020-02-26 06:18:23 +00:00
|
|
|
const triple_prefix = test_target.target.zigTriple(b.allocator) catch unreachable;
|
2019-09-22 03:55:56 +00:00
|
|
|
|
|
|
|
const these_tests = b.addTest(root_src);
|
2019-12-09 03:53:51 +00:00
|
|
|
const single_threaded_txt = if (test_target.single_threaded) "single" else "multi";
|
|
|
|
these_tests.setNamePrefix(b.fmt("{}-{}-{}-{}-{} ", .{
|
2019-09-22 03:55:56 +00:00
|
|
|
name,
|
|
|
|
triple_prefix,
|
|
|
|
@tagName(test_target.mode),
|
|
|
|
libc_prefix,
|
2019-12-09 03:53:51 +00:00
|
|
|
single_threaded_txt,
|
|
|
|
}));
|
2019-09-22 03:55:56 +00:00
|
|
|
these_tests.single_threaded = test_target.single_threaded;
|
|
|
|
these_tests.setFilter(test_filter);
|
|
|
|
these_tests.setBuildMode(test_target.mode);
|
2020-02-26 06:18:23 +00:00
|
|
|
these_tests.setTarget(test_target.target);
|
2019-09-22 03:55:56 +00:00
|
|
|
if (test_target.link_libc) {
|
|
|
|
these_tests.linkSystemLibrary("c");
|
|
|
|
}
|
2019-09-26 03:57:47 +00:00
|
|
|
these_tests.overrideZigLibDir("lib");
|
2019-09-22 03:55:56 +00:00
|
|
|
these_tests.enable_wine = is_wine_enabled;
|
|
|
|
these_tests.enable_qemu = is_qemu_enabled;
|
|
|
|
these_tests.glibc_multi_install_dir = glibc_dir;
|
|
|
|
|
|
|
|
step.dependOn(&these_tests.step);
|
2017-04-20 06:26:36 +00:00
|
|
|
}
|
|
|
|
return step;
|
|
|
|
}
|
|
|
|
|
2019-09-03 14:08:39 +00:00
|
|
|
pub const StackTracesContext = struct {
|
2019-05-28 00:07:05 +00:00
|
|
|
b: *build.Builder,
|
|
|
|
step: *build.Step,
|
|
|
|
test_index: usize,
|
|
|
|
test_filter: ?[]const u8,
|
|
|
|
modes: []const Mode,
|
|
|
|
|
|
|
|
const Expect = [@typeInfo(Mode).Enum.fields.len][]const u8;
|
|
|
|
|
|
|
|
pub fn addCase(
|
2019-09-03 14:08:39 +00:00
|
|
|
self: *StackTracesContext,
|
2019-05-28 00:07:05 +00:00
|
|
|
name: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
expect: Expect,
|
|
|
|
) void {
|
|
|
|
const b = self.b;
|
|
|
|
|
|
|
|
for (self.modes) |mode| {
|
|
|
|
const expect_for_mode = expect[@enumToInt(mode)];
|
|
|
|
if (expect_for_mode.len == 0) continue;
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "{} {} ({})", .{
|
|
|
|
"stack-trace",
|
|
|
|
name,
|
|
|
|
@tagName(mode),
|
|
|
|
}) catch unreachable;
|
2019-05-28 00:07:05 +00:00
|
|
|
if (self.test_filter) |filter| {
|
|
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
|
|
|
|
}
|
|
|
|
|
2020-01-05 07:35:52 +00:00
|
|
|
const src_basename = "source.zig";
|
|
|
|
const write_src = b.addWriteFile(src_basename, source);
|
|
|
|
const exe = b.addExecutableFromWriteFileStep("test", write_src, src_basename);
|
2019-05-28 00:07:05 +00:00
|
|
|
exe.setBuildMode(mode);
|
|
|
|
|
|
|
|
const run_and_compare = RunAndCompareStep.create(
|
|
|
|
self,
|
|
|
|
exe,
|
|
|
|
annotated_case_name,
|
|
|
|
mode,
|
|
|
|
expect_for_mode,
|
|
|
|
);
|
|
|
|
|
|
|
|
self.step.dependOn(&run_and_compare.step);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const RunAndCompareStep = struct {
|
|
|
|
step: build.Step,
|
2019-09-03 14:08:39 +00:00
|
|
|
context: *StackTracesContext,
|
2019-05-28 00:07:05 +00:00
|
|
|
exe: *LibExeObjStep,
|
|
|
|
name: []const u8,
|
|
|
|
mode: Mode,
|
|
|
|
expect_output: []const u8,
|
|
|
|
test_index: usize,
|
|
|
|
|
|
|
|
pub fn create(
|
2019-09-03 14:08:39 +00:00
|
|
|
context: *StackTracesContext,
|
2019-05-28 00:07:05 +00:00
|
|
|
exe: *LibExeObjStep,
|
|
|
|
name: []const u8,
|
|
|
|
mode: Mode,
|
|
|
|
expect_output: []const u8,
|
|
|
|
) *RunAndCompareStep {
|
|
|
|
const allocator = context.b.allocator;
|
|
|
|
const ptr = allocator.create(RunAndCompareStep) catch unreachable;
|
|
|
|
ptr.* = RunAndCompareStep{
|
2019-09-03 14:05:19 +00:00
|
|
|
.step = build.Step.init("StackTraceCompareOutputStep", allocator, make),
|
2019-05-28 00:07:05 +00:00
|
|
|
.context = context,
|
|
|
|
.exe = exe,
|
|
|
|
.name = name,
|
|
|
|
.mode = mode,
|
|
|
|
.expect_output = expect_output,
|
|
|
|
.test_index = context.test_index,
|
|
|
|
};
|
|
|
|
ptr.step.dependOn(&exe.step);
|
|
|
|
context.test_index += 1;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn make(step: *build.Step) !void {
|
|
|
|
const self = @fieldParentPtr(RunAndCompareStep, "step", step);
|
|
|
|
const b = self.context.b;
|
|
|
|
|
|
|
|
const full_exe_path = self.exe.getOutputPath();
|
|
|
|
var args = ArrayList([]const u8).init(b.allocator);
|
|
|
|
defer args.deinit();
|
|
|
|
args.append(full_exe_path) catch unreachable;
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Test {}/{} {}...", .{ self.test_index + 1, self.context.test_index, self.name });
|
2019-05-28 00:07:05 +00:00
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
const child = std.ChildProcess.init(args.span(), b.allocator) catch unreachable;
|
2019-05-28 00:07:05 +00:00
|
|
|
defer child.deinit();
|
|
|
|
|
|
|
|
child.stdin_behavior = .Ignore;
|
|
|
|
child.stdout_behavior = .Pipe;
|
|
|
|
child.stderr_behavior = .Pipe;
|
|
|
|
child.env_map = b.env_map;
|
|
|
|
|
2020-01-26 23:28:52 +00:00
|
|
|
if (b.verbose) {
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(args.span());
|
2020-01-26 23:28:52 +00:00
|
|
|
}
|
2019-12-09 03:53:51 +00:00
|
|
|
child.spawn() catch |err| debug.panic("Unable to spawn {}: {}\n", .{ full_exe_path, @errorName(err) });
|
2019-05-28 00:07:05 +00:00
|
|
|
|
2020-03-11 00:22:30 +00:00
|
|
|
const stdout = child.stdout.?.inStream().readAllAlloc(b.allocator, max_stdout_size) catch unreachable;
|
2020-02-07 05:11:57 +00:00
|
|
|
defer b.allocator.free(stdout);
|
2020-03-11 00:22:30 +00:00
|
|
|
const stderr = child.stderr.?.inStream().readAllAlloc(b.allocator, max_stdout_size) catch unreachable;
|
2020-02-07 05:11:57 +00:00
|
|
|
defer b.allocator.free(stderr);
|
2019-05-28 00:07:05 +00:00
|
|
|
|
|
|
|
const term = child.wait() catch |err| {
|
2019-12-09 03:53:51 +00:00
|
|
|
debug.panic("Unable to spawn {}: {}\n", .{ full_exe_path, @errorName(err) });
|
2019-05-28 00:07:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
switch (term) {
|
|
|
|
.Exited => |code| {
|
|
|
|
const expect_code: u32 = 1;
|
|
|
|
if (code != expect_code) {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Process {} exited with error code {} but expected code {}\n", .{
|
|
|
|
full_exe_path,
|
|
|
|
code,
|
|
|
|
expect_code,
|
|
|
|
});
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(args.span());
|
2019-05-28 00:07:05 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
.Signal => |signum| {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Process {} terminated on signal {}\n", .{ full_exe_path, signum });
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(args.span());
|
2019-05-28 00:07:05 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
},
|
|
|
|
.Stopped => |signum| {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Process {} stopped on signal {}\n", .{ full_exe_path, signum });
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(args.span());
|
2019-05-28 00:07:05 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
},
|
|
|
|
.Unknown => |code| {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Process {} terminated unexpectedly with error code {}\n", .{ full_exe_path, code });
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(args.span());
|
2019-05-28 00:07:05 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// process result
|
|
|
|
// - keep only basename of source file path
|
|
|
|
// - replace address with symbolic string
|
|
|
|
// - skip empty lines
|
|
|
|
const got: []const u8 = got_result: {
|
2020-04-01 16:44:45 +00:00
|
|
|
var buf = ArrayList(u8).init(b.allocator);
|
2019-05-28 00:07:05 +00:00
|
|
|
defer buf.deinit();
|
2020-02-07 05:11:57 +00:00
|
|
|
if (stderr.len != 0 and stderr[stderr.len - 1] == '\n') stderr = stderr[0 .. stderr.len - 1];
|
2020-04-04 17:15:08 +00:00
|
|
|
var it = mem.split(stderr, "\n");
|
2019-05-28 00:07:05 +00:00
|
|
|
process_lines: while (it.next()) |line| {
|
|
|
|
if (line.len == 0) continue;
|
2019-09-03 14:05:19 +00:00
|
|
|
const delims = [_][]const u8{ ":", ":", ":", " in " };
|
|
|
|
var marks = [_]usize{0} ** 4;
|
2019-05-28 00:07:05 +00:00
|
|
|
// offset search past `[drive]:` on windows
|
2020-02-25 08:43:21 +00:00
|
|
|
var pos: usize = if (std.Target.current.os.tag == .windows) 2 else 0;
|
2019-05-28 00:07:05 +00:00
|
|
|
for (delims) |delim, i| {
|
|
|
|
marks[i] = mem.indexOfPos(u8, line, pos, delim) orelse {
|
2020-04-01 16:44:45 +00:00
|
|
|
try buf.appendSlice(line);
|
|
|
|
try buf.appendSlice("\n");
|
2019-05-28 00:07:05 +00:00
|
|
|
continue :process_lines;
|
|
|
|
};
|
|
|
|
pos = marks[i] + delim.len;
|
|
|
|
}
|
|
|
|
pos = mem.lastIndexOfScalar(u8, line[0..marks[0]], fs.path.sep) orelse {
|
2020-04-01 16:44:45 +00:00
|
|
|
try buf.appendSlice(line);
|
|
|
|
try buf.appendSlice("\n");
|
2019-05-28 00:07:05 +00:00
|
|
|
continue :process_lines;
|
|
|
|
};
|
2020-04-01 16:44:45 +00:00
|
|
|
try buf.appendSlice(line[pos + 1 .. marks[2] + delims[2].len]);
|
|
|
|
try buf.appendSlice(" [address]");
|
|
|
|
try buf.appendSlice(line[marks[3]..]);
|
|
|
|
try buf.appendSlice("\n");
|
2019-05-28 00:07:05 +00:00
|
|
|
}
|
|
|
|
break :got_result buf.toOwnedSlice();
|
|
|
|
};
|
|
|
|
|
|
|
|
if (!mem.eql(u8, self.expect_output, got)) {
|
|
|
|
warn(
|
|
|
|
\\
|
|
|
|
\\========= Expected this output: =========
|
|
|
|
\\{}
|
|
|
|
\\================================================
|
|
|
|
\\{}
|
|
|
|
\\
|
2019-12-09 03:53:51 +00:00
|
|
|
, .{ self.expect_output, got });
|
2019-05-28 00:07:05 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
}
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("OK\n", .{});
|
2019-05-28 00:07:05 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const CompileErrorContext = struct {
|
2018-05-31 14:56:59 +00:00
|
|
|
b: *build.Builder,
|
|
|
|
step: *build.Step,
|
2017-04-19 18:00:12 +00:00
|
|
|
test_index: usize,
|
|
|
|
test_filter: ?[]const u8,
|
2018-07-11 23:38:01 +00:00
|
|
|
modes: []const Mode,
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const TestCase = struct {
|
2017-04-19 18:00:12 +00:00
|
|
|
name: []const u8,
|
2017-05-04 18:05:06 +00:00
|
|
|
sources: ArrayList(SourceFile),
|
|
|
|
expected_errors: ArrayList([]const u8),
|
2019-02-17 20:47:53 +00:00
|
|
|
expect_exact: bool,
|
2017-04-19 18:00:12 +00:00
|
|
|
link_libc: bool,
|
|
|
|
is_exe: bool,
|
2019-02-09 00:23:46 +00:00
|
|
|
is_test: bool,
|
2020-02-26 06:18:23 +00:00
|
|
|
target: CrossTarget = CrossTarget{},
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const SourceFile = struct {
|
2017-04-19 18:00:12 +00:00
|
|
|
filename: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
};
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
|
2018-11-13 13:08:37 +00:00
|
|
|
self.sources.append(SourceFile{
|
2017-04-19 18:00:12 +00:00
|
|
|
.filename = filename,
|
|
|
|
.source = source,
|
2018-01-09 05:07:01 +00:00
|
|
|
}) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addExpectedError(self: *TestCase, text: []const u8) void {
|
2018-01-09 05:07:01 +00:00
|
|
|
self.expected_errors.append(text) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const CompileCmpOutputStep = struct {
|
2017-04-19 18:00:12 +00:00
|
|
|
step: build.Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
context: *CompileErrorContext,
|
2017-04-19 18:00:12 +00:00
|
|
|
name: []const u8,
|
|
|
|
test_index: usize,
|
2018-05-31 14:56:59 +00:00
|
|
|
case: *const TestCase,
|
2017-05-02 21:34:21 +00:00
|
|
|
build_mode: Mode,
|
2020-01-05 18:08:18 +00:00
|
|
|
write_src: *build.WriteFileStep,
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2019-02-17 20:47:53 +00:00
|
|
|
const ErrLineIter = struct {
|
|
|
|
lines: mem.SplitIterator,
|
|
|
|
|
2019-03-01 20:35:29 +00:00
|
|
|
const source_file = "tmp.zig";
|
2019-02-17 20:47:53 +00:00
|
|
|
|
|
|
|
fn init(input: []const u8) ErrLineIter {
|
2020-04-04 17:15:08 +00:00
|
|
|
return ErrLineIter{ .lines = mem.split(input, "\n") };
|
2019-02-17 20:47:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn next(self: *ErrLineIter) ?[]const u8 {
|
|
|
|
while (self.lines.next()) |line| {
|
|
|
|
if (mem.indexOf(u8, line, source_file) != null)
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2020-01-05 18:08:18 +00:00
|
|
|
pub fn create(
|
|
|
|
context: *CompileErrorContext,
|
|
|
|
name: []const u8,
|
|
|
|
case: *const TestCase,
|
|
|
|
build_mode: Mode,
|
|
|
|
write_src: *build.WriteFileStep,
|
|
|
|
) *CompileCmpOutputStep {
|
2017-04-19 18:00:12 +00:00
|
|
|
const allocator = context.b.allocator;
|
2019-02-03 21:13:28 +00:00
|
|
|
const ptr = allocator.create(CompileCmpOutputStep) catch unreachable;
|
|
|
|
ptr.* = CompileCmpOutputStep{
|
2017-04-19 18:00:12 +00:00
|
|
|
.step = build.Step.init("CompileCmpOutput", allocator, make),
|
|
|
|
.context = context,
|
|
|
|
.name = name,
|
|
|
|
.test_index = context.test_index,
|
|
|
|
.case = case,
|
2017-05-02 21:34:21 +00:00
|
|
|
.build_mode = build_mode,
|
2020-01-05 18:08:18 +00:00
|
|
|
.write_src = write_src,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2018-06-20 15:40:21 +00:00
|
|
|
|
2017-04-19 18:00:12 +00:00
|
|
|
context.test_index += 1;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *build.Step) !void {
|
2017-04-19 18:00:12 +00:00
|
|
|
const self = @fieldParentPtr(CompileCmpOutputStep, "step", step);
|
|
|
|
const b = self.context.b;
|
|
|
|
|
2017-05-04 18:05:06 +00:00
|
|
|
var zig_args = ArrayList([]const u8).init(b.allocator);
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append(b.zig_exe) catch unreachable;
|
2017-09-26 05:01:49 +00:00
|
|
|
|
2019-02-09 00:23:46 +00:00
|
|
|
if (self.case.is_exe) {
|
|
|
|
try zig_args.append("build-exe");
|
|
|
|
} else if (self.case.is_test) {
|
|
|
|
try zig_args.append("test");
|
|
|
|
} else {
|
|
|
|
try zig_args.append("build-obj");
|
|
|
|
}
|
2020-03-30 18:23:22 +00:00
|
|
|
const root_src_basename = self.case.sources.span()[0].filename;
|
2020-01-05 18:08:18 +00:00
|
|
|
try zig_args.append(self.write_src.getOutputPath(root_src_basename));
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--name") catch unreachable;
|
|
|
|
zig_args.append("test") catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
zig_args.append("--output-dir") catch unreachable;
|
|
|
|
zig_args.append(b.pathFromRoot(b.cache_root)) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2020-02-26 06:18:23 +00:00
|
|
|
if (!self.case.target.isNative()) {
|
|
|
|
try zig_args.append("-target");
|
|
|
|
try zig_args.append(try self.case.target.zigTriple(b.allocator));
|
2019-08-20 18:40:57 +00:00
|
|
|
}
|
|
|
|
|
2017-05-02 21:34:21 +00:00
|
|
|
switch (self.build_mode) {
|
|
|
|
Mode.Debug => {},
|
2018-01-09 05:07:01 +00:00
|
|
|
Mode.ReleaseSafe => zig_args.append("--release-safe") catch unreachable,
|
|
|
|
Mode.ReleaseFast => zig_args.append("--release-fast") catch unreachable,
|
2018-04-16 01:06:00 +00:00
|
|
|
Mode.ReleaseSmall => zig_args.append("--release-small") catch unreachable,
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Test {}/{} {}...", .{ self.test_index + 1, self.context.test_index, self.name });
|
2017-04-19 18:00:12 +00:00
|
|
|
|
|
|
|
if (b.verbose) {
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(zig_args.span());
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
const child = std.ChildProcess.init(zig_args.span(), b.allocator) catch unreachable;
|
2017-09-26 05:01:49 +00:00
|
|
|
defer child.deinit();
|
|
|
|
|
2018-10-15 22:23:47 +00:00
|
|
|
child.env_map = b.env_map;
|
2019-05-26 17:17:34 +00:00
|
|
|
child.stdin_behavior = .Ignore;
|
|
|
|
child.stdout_behavior = .Pipe;
|
|
|
|
child.stderr_behavior = .Pipe;
|
2017-09-26 05:01:49 +00:00
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
child.spawn() catch |err| debug.panic("Unable to spawn {}: {}\n", .{ zig_args.items[0], @errorName(err) });
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
var stdout_buf = ArrayList(u8).init(b.allocator);
|
|
|
|
var stderr_buf = ArrayList(u8).init(b.allocator);
|
2017-04-22 15:36:42 +00:00
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
child.stdout.?.inStream().readAllArrayList(&stdout_buf, max_stdout_size) catch unreachable;
|
|
|
|
child.stderr.?.inStream().readAllArrayList(&stderr_buf, max_stdout_size) catch unreachable;
|
2017-04-22 15:36:42 +00:00
|
|
|
|
2018-01-07 22:28:20 +00:00
|
|
|
const term = child.wait() catch |err| {
|
2019-12-09 03:53:51 +00:00
|
|
|
debug.panic("Unable to spawn {}: {}\n", .{ zig_args.items[0], @errorName(err) });
|
2017-04-19 18:00:12 +00:00
|
|
|
};
|
|
|
|
switch (term) {
|
2019-05-26 17:17:34 +00:00
|
|
|
.Exited => |code| {
|
2017-04-19 18:00:12 +00:00
|
|
|
if (code == 0) {
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(zig_args.span());
|
2018-01-15 05:01:02 +00:00
|
|
|
return error.CompilationIncorrectlySucceeded;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
else => {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Process {} terminated unexpectedly\n", .{b.zig_exe});
|
2020-03-30 18:23:22 +00:00
|
|
|
printInvocation(zig_args.span());
|
2017-04-19 18:00:12 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
},
|
2017-12-22 05:50:30 +00:00
|
|
|
}
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
const stdout = stdout_buf.span();
|
|
|
|
const stderr = stderr_buf.span();
|
2017-04-19 18:00:12 +00:00
|
|
|
|
|
|
|
if (stdout.len != 0) {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn(
|
2017-04-19 18:00:12 +00:00
|
|
|
\\
|
|
|
|
\\Expected empty stdout, instead found:
|
|
|
|
\\================================================
|
|
|
|
\\{}
|
|
|
|
\\================================================
|
|
|
|
\\
|
2019-12-09 03:53:51 +00:00
|
|
|
, .{stdout});
|
2017-04-19 18:00:12 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
}
|
|
|
|
|
2019-02-17 20:47:53 +00:00
|
|
|
var ok = true;
|
|
|
|
if (self.case.expect_exact) {
|
|
|
|
var err_iter = ErrLineIter.init(stderr);
|
|
|
|
var i: usize = 0;
|
|
|
|
ok = while (err_iter.next()) |line| : (i += 1) {
|
2020-04-01 22:00:42 +00:00
|
|
|
if (i >= self.case.expected_errors.items.len) break false;
|
2019-02-17 20:47:53 +00:00
|
|
|
const expected = self.case.expected_errors.at(i);
|
|
|
|
if (mem.indexOf(u8, line, expected) == null) break false;
|
|
|
|
continue;
|
|
|
|
} else true;
|
|
|
|
|
2020-04-01 22:00:42 +00:00
|
|
|
ok = ok and i == self.case.expected_errors.items.len;
|
2019-02-17 20:47:53 +00:00
|
|
|
|
|
|
|
if (!ok) {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("\n======== Expected these compile errors: ========\n", .{});
|
2020-03-30 18:23:22 +00:00
|
|
|
for (self.case.expected_errors.span()) |expected| {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("{}\n", .{expected});
|
2019-02-17 20:47:53 +00:00
|
|
|
}
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
2019-02-17 20:47:53 +00:00
|
|
|
} else {
|
2020-03-30 18:23:22 +00:00
|
|
|
for (self.case.expected_errors.span()) |expected| {
|
2019-02-17 20:47:53 +00:00
|
|
|
if (mem.indexOf(u8, stderr, expected) == null) {
|
|
|
|
warn(
|
2019-02-20 13:04:46 +00:00
|
|
|
\\
|
|
|
|
\\=========== Expected compile error: ============
|
2019-02-17 20:47:53 +00:00
|
|
|
\\{}
|
|
|
|
\\
|
2019-12-09 03:53:51 +00:00
|
|
|
, .{expected});
|
2019-02-17 20:47:53 +00:00
|
|
|
ok = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ok) {
|
|
|
|
warn(
|
|
|
|
\\================= Full output: =================
|
|
|
|
\\{}
|
|
|
|
\\
|
2019-12-09 03:53:51 +00:00
|
|
|
, .{stderr});
|
2019-02-17 20:47:53 +00:00
|
|
|
return error.TestFailed;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
2019-02-17 20:47:53 +00:00
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("OK\n", .{});
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn create(
|
|
|
|
self: *CompileErrorContext,
|
|
|
|
name: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
expected_lines: []const []const u8,
|
|
|
|
) *TestCase {
|
2019-02-03 21:13:28 +00:00
|
|
|
const tc = self.b.allocator.create(TestCase) catch unreachable;
|
|
|
|
tc.* = TestCase{
|
2017-04-19 18:00:12 +00:00
|
|
|
.name = name,
|
2017-05-04 18:05:06 +00:00
|
|
|
.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
|
|
|
|
.expected_errors = ArrayList([]const u8).init(self.b.allocator),
|
2019-02-17 20:47:53 +00:00
|
|
|
.expect_exact = false,
|
2017-04-19 18:00:12 +00:00
|
|
|
.link_libc = false,
|
|
|
|
.is_exe = false,
|
2019-02-09 00:23:46 +00:00
|
|
|
.is_test = false,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2018-06-20 15:40:21 +00:00
|
|
|
|
2019-03-01 20:35:29 +00:00
|
|
|
tc.addSourceFile("tmp.zig", source);
|
2019-12-09 19:55:51 +00:00
|
|
|
var arg_i: usize = 0;
|
|
|
|
while (arg_i < expected_lines.len) : (arg_i += 1) {
|
2017-05-27 03:31:38 +00:00
|
|
|
tc.addExpectedError(expected_lines[arg_i]);
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
return tc;
|
|
|
|
}
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn addC(self: *CompileErrorContext, name: []const u8, source: []const u8, expected_lines: []const []const u8) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
var tc = self.create(name, source, expected_lines);
|
|
|
|
tc.link_libc = true;
|
|
|
|
self.addCase(tc);
|
|
|
|
}
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn addExe(
|
|
|
|
self: *CompileErrorContext,
|
|
|
|
name: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
expected_lines: []const []const u8,
|
|
|
|
) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
var tc = self.create(name, source, expected_lines);
|
|
|
|
tc.is_exe = true;
|
|
|
|
self.addCase(tc);
|
|
|
|
}
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn add(
|
|
|
|
self: *CompileErrorContext,
|
|
|
|
name: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
expected_lines: []const []const u8,
|
|
|
|
) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
const tc = self.create(name, source, expected_lines);
|
|
|
|
self.addCase(tc);
|
|
|
|
}
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn addTest(
|
|
|
|
self: *CompileErrorContext,
|
|
|
|
name: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
expected_lines: []const []const u8,
|
|
|
|
) void {
|
2019-02-09 00:23:46 +00:00
|
|
|
const tc = self.create(name, source, expected_lines);
|
|
|
|
tc.is_test = true;
|
|
|
|
self.addCase(tc);
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addCase(self: *CompileErrorContext, case: *const TestCase) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
const b = self.b;
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "compile-error {}", .{
|
|
|
|
case.name,
|
|
|
|
}) catch unreachable;
|
2019-06-23 06:06:57 +00:00
|
|
|
if (self.test_filter) |filter| {
|
|
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
|
|
|
|
}
|
2020-01-05 18:08:18 +00:00
|
|
|
const write_src = b.addWriteFiles();
|
2020-03-30 18:23:22 +00:00
|
|
|
for (case.sources.span()) |src_file| {
|
2020-01-05 18:08:18 +00:00
|
|
|
write_src.add(src_file.filename, src_file.source);
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
2020-01-05 18:08:18 +00:00
|
|
|
|
|
|
|
const compile_and_cmp_errors = CompileCmpOutputStep.create(self, annotated_case_name, case, .Debug, write_src);
|
|
|
|
compile_and_cmp_errors.step.dependOn(&write_src.step);
|
|
|
|
self.step.dependOn(&compile_and_cmp_errors.step);
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
pub const StandaloneContext = struct {
|
2018-05-31 14:56:59 +00:00
|
|
|
b: *build.Builder,
|
|
|
|
step: *build.Step,
|
2017-04-19 18:00:12 +00:00
|
|
|
test_index: usize,
|
|
|
|
test_filter: ?[]const u8,
|
2018-07-18 08:28:14 +00:00
|
|
|
modes: []const Mode,
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
pub fn addC(self: *StandaloneContext, root_src: []const u8) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
self.addAllArgs(root_src, true);
|
|
|
|
}
|
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
pub fn add(self: *StandaloneContext, root_src: []const u8) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
self.addAllArgs(root_src, false);
|
|
|
|
}
|
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
pub fn addBuildFile(self: *StandaloneContext, build_file: []const u8) void {
|
2017-04-21 05:56:12 +00:00
|
|
|
const b = self.b;
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
const annotated_case_name = b.fmt("build {} (Debug)", .{build_file});
|
2017-05-03 21:23:11 +00:00
|
|
|
if (self.test_filter) |filter| {
|
2018-05-18 03:21:44 +00:00
|
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2017-05-04 18:05:06 +00:00
|
|
|
var zig_args = ArrayList([]const u8).init(b.allocator);
|
2019-05-26 17:17:34 +00:00
|
|
|
const rel_zig_exe = fs.path.relative(b.allocator, b.build_root, b.zig_exe) catch unreachable;
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append(rel_zig_exe) catch unreachable;
|
|
|
|
zig_args.append("build") catch unreachable;
|
2017-04-21 05:56:12 +00:00
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--build-file") catch unreachable;
|
|
|
|
zig_args.append(b.pathFromRoot(build_file)) catch unreachable;
|
2017-04-21 05:56:12 +00:00
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("test") catch unreachable;
|
2017-04-21 05:56:12 +00:00
|
|
|
|
|
|
|
if (b.verbose) {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--verbose") catch unreachable;
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
const run_cmd = b.addSystemCommand(zig_args.span());
|
2017-04-21 05:56:12 +00:00
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
const log_step = b.addLog("PASS {}\n", .{annotated_case_name});
|
2017-04-21 05:56:12 +00:00
|
|
|
log_step.step.dependOn(&run_cmd.step);
|
|
|
|
|
|
|
|
self.step.dependOn(&log_step.step);
|
|
|
|
}
|
|
|
|
|
2019-07-16 16:15:46 +00:00
|
|
|
pub fn addAllArgs(self: *StandaloneContext, root_src: []const u8, link_libc: bool) void {
|
2017-04-19 18:00:12 +00:00
|
|
|
const b = self.b;
|
|
|
|
|
2018-07-18 08:28:14 +00:00
|
|
|
for (self.modes) |mode| {
|
2019-12-09 03:53:51 +00:00
|
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "build {} ({})", .{
|
|
|
|
root_src,
|
|
|
|
@tagName(mode),
|
|
|
|
}) catch unreachable;
|
2017-05-03 21:23:11 +00:00
|
|
|
if (self.test_filter) |filter| {
|
2018-05-18 03:21:44 +00:00
|
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const exe = b.addExecutable("test", root_src);
|
2017-05-02 21:34:21 +00:00
|
|
|
exe.setBuildMode(mode);
|
2017-04-19 18:00:12 +00:00
|
|
|
if (link_libc) {
|
2017-04-21 05:56:12 +00:00
|
|
|
exe.linkSystemLibrary("c");
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
const log_step = b.addLog("PASS {}\n", .{annotated_case_name});
|
2017-04-19 18:00:12 +00:00
|
|
|
log_step.step.dependOn(&exe.step);
|
|
|
|
|
|
|
|
self.step.dependOn(&log_step.step);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
2017-04-19 20:59:20 +00:00
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const GenHContext = struct {
|
2018-05-31 14:56:59 +00:00
|
|
|
b: *build.Builder,
|
|
|
|
step: *build.Step,
|
2018-01-23 03:24:07 +00:00
|
|
|
test_index: usize,
|
|
|
|
test_filter: ?[]const u8,
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const TestCase = struct {
|
2018-01-23 03:24:07 +00:00
|
|
|
name: []const u8,
|
|
|
|
sources: ArrayList(SourceFile),
|
|
|
|
expected_lines: ArrayList([]const u8),
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const SourceFile = struct {
|
2018-01-23 03:24:07 +00:00
|
|
|
filename: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
};
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
|
2018-11-13 13:08:37 +00:00
|
|
|
self.sources.append(SourceFile{
|
2018-01-23 03:24:07 +00:00
|
|
|
.filename = filename,
|
|
|
|
.source = source,
|
|
|
|
}) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addExpectedLine(self: *TestCase, text: []const u8) void {
|
2018-01-23 03:24:07 +00:00
|
|
|
self.expected_lines.append(text) catch unreachable;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const GenHCmpOutputStep = struct {
|
2018-01-23 03:24:07 +00:00
|
|
|
step: build.Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
context: *GenHContext,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
obj: *LibExeObjStep,
|
2018-01-23 03:24:07 +00:00
|
|
|
name: []const u8,
|
|
|
|
test_index: usize,
|
2018-05-31 14:56:59 +00:00
|
|
|
case: *const TestCase,
|
2018-01-23 03:24:07 +00:00
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
pub fn create(
|
|
|
|
context: *GenHContext,
|
|
|
|
obj: *LibExeObjStep,
|
|
|
|
name: []const u8,
|
|
|
|
case: *const TestCase,
|
|
|
|
) *GenHCmpOutputStep {
|
2018-01-23 03:24:07 +00:00
|
|
|
const allocator = context.b.allocator;
|
2019-02-03 21:13:28 +00:00
|
|
|
const ptr = allocator.create(GenHCmpOutputStep) catch unreachable;
|
|
|
|
ptr.* = GenHCmpOutputStep{
|
2018-01-23 03:24:07 +00:00
|
|
|
.step = build.Step.init("ParseCCmpOutput", allocator, make),
|
|
|
|
.context = context,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
.obj = obj,
|
2018-01-23 03:24:07 +00:00
|
|
|
.name = name,
|
|
|
|
.test_index = context.test_index,
|
|
|
|
.case = case,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
ptr.step.dependOn(&obj.step);
|
2018-01-23 03:24:07 +00:00
|
|
|
context.test_index += 1;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *build.Step) !void {
|
2018-01-23 03:24:07 +00:00
|
|
|
const self = @fieldParentPtr(GenHCmpOutputStep, "step", step);
|
|
|
|
const b = self.context.b;
|
|
|
|
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("Test {}/{} {}...", .{ self.test_index + 1, self.context.test_index, self.name });
|
2018-01-23 03:24:07 +00:00
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const full_h_path = self.obj.getOutputHPath();
|
2018-02-09 23:27:50 +00:00
|
|
|
const actual_h = try io.readFileAlloc(b.allocator, full_h_path);
|
2018-01-23 03:24:07 +00:00
|
|
|
|
2020-03-30 18:23:22 +00:00
|
|
|
for (self.case.expected_lines.span()) |expected_line| {
|
2018-01-23 03:24:07 +00:00
|
|
|
if (mem.indexOf(u8, actual_h, expected_line) == null) {
|
|
|
|
warn(
|
|
|
|
\\
|
|
|
|
\\========= Expected this output: ================
|
|
|
|
\\{}
|
2019-05-25 11:43:52 +00:00
|
|
|
\\========= But found: ===========================
|
2018-01-23 03:24:07 +00:00
|
|
|
\\{}
|
|
|
|
\\
|
2019-12-09 03:53:51 +00:00
|
|
|
, .{ expected_line, actual_h });
|
2018-01-23 03:24:07 +00:00
|
|
|
return error.TestFailed;
|
|
|
|
}
|
|
|
|
}
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("OK\n", .{});
|
2018-01-23 03:24:07 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-01-25 09:10:11 +00:00
|
|
|
fn printInvocation(args: []const []const u8) void {
|
2018-01-23 03:24:07 +00:00
|
|
|
for (args) |arg| {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("{} ", .{arg});
|
2018-01-23 03:24:07 +00:00
|
|
|
}
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("\n", .{});
|
2018-01-23 03:24:07 +00:00
|
|
|
}
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn create(
|
|
|
|
self: *GenHContext,
|
|
|
|
filename: []const u8,
|
|
|
|
name: []const u8,
|
|
|
|
source: []const u8,
|
|
|
|
expected_lines: []const []const u8,
|
|
|
|
) *TestCase {
|
2019-02-03 21:13:28 +00:00
|
|
|
const tc = self.b.allocator.create(TestCase) catch unreachable;
|
|
|
|
tc.* = TestCase{
|
2018-01-23 03:24:07 +00:00
|
|
|
.name = name,
|
|
|
|
.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
|
|
|
|
.expected_lines = ArrayList([]const u8).init(self.b.allocator),
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2018-06-20 15:40:21 +00:00
|
|
|
|
2018-01-23 03:24:07 +00:00
|
|
|
tc.addSourceFile(filename, source);
|
2019-12-09 19:55:51 +00:00
|
|
|
var arg_i: usize = 0;
|
|
|
|
while (arg_i < expected_lines.len) : (arg_i += 1) {
|
2018-01-23 03:24:07 +00:00
|
|
|
tc.addExpectedLine(expected_lines[arg_i]);
|
|
|
|
}
|
|
|
|
return tc;
|
|
|
|
}
|
|
|
|
|
2019-12-09 19:55:51 +00:00
|
|
|
pub fn add(self: *GenHContext, name: []const u8, source: []const u8, expected_lines: []const []const u8) void {
|
2019-03-11 14:29:57 +00:00
|
|
|
const tc = self.create("test.zig", name, source, expected_lines);
|
2018-01-23 03:24:07 +00:00
|
|
|
self.addCase(tc);
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addCase(self: *GenHContext, case: *const TestCase) void {
|
2018-01-23 03:24:07 +00:00
|
|
|
const b = self.b;
|
|
|
|
|
|
|
|
const mode = builtin.Mode.Debug;
|
2019-12-09 03:53:51 +00:00
|
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "gen-h {} ({})", .{ case.name, @tagName(mode) }) catch unreachable;
|
2018-01-23 03:24:07 +00:00
|
|
|
if (self.test_filter) |filter| {
|
2018-05-18 03:21:44 +00:00
|
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
|
2018-01-23 03:24:07 +00:00
|
|
|
}
|
|
|
|
|
2020-01-05 18:08:18 +00:00
|
|
|
const write_src = b.addWriteFiles();
|
2020-03-30 18:23:22 +00:00
|
|
|
for (case.sources.span()) |src_file| {
|
2020-01-05 18:08:18 +00:00
|
|
|
write_src.add(src_file.filename, src_file.source);
|
2018-01-23 03:24:07 +00:00
|
|
|
}
|
|
|
|
|
2020-01-05 18:08:18 +00:00
|
|
|
const obj = b.addObjectFromWriteFileStep("test", write_src, case.sources.items[0].filename);
|
|
|
|
obj.setBuildMode(mode);
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const cmp_h = GenHCmpOutputStep.create(self, obj, annotated_case_name, case);
|
2018-01-23 03:24:07 +00:00
|
|
|
|
|
|
|
self.step.dependOn(&cmp_h.step);
|
|
|
|
}
|
|
|
|
};
|
2019-03-15 21:47:47 +00:00
|
|
|
|
|
|
|
fn printInvocation(args: []const []const u8) void {
|
|
|
|
for (args) |arg| {
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("{} ", .{arg});
|
2019-03-15 21:47:47 +00:00
|
|
|
}
|
2019-12-09 03:53:51 +00:00
|
|
|
warn("\n", .{});
|
2019-03-15 21:47:47 +00:00
|
|
|
}
|