aboutsummaryrefslogtreecommitdiff
path: root/test/cli.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-02-07 00:49:06 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-02-07 00:49:06 -0500
commit7fc99c33bde54e3f4bc946e7e00351bf594daa37 (patch)
tree5ecb89cb50e08dc7032e31c84128f5d32d20d315 /test/cli.zig
parent8a5d3e2eaf72195993e4932bfda66d08a36c6064 (diff)
parent36bade5c562bf0b2479b6dfdd465a1a312890835 (diff)
downloadzig-7fc99c33bde54e3f4bc946e7e00351bf594daa37.tar.gz
zig-7fc99c33bde54e3f4bc946e7e00351bf594daa37.zip
Merge branch 'kristate-zig-backport-std.os.path'
Diffstat (limited to 'test/cli.zig')
-rw-r--r--test/cli.zig8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cli.zig b/test/cli.zig
index a07c447d2d..745da4dd80 100644
--- a/test/cli.zig
+++ b/test/cli.zig
@@ -27,9 +27,9 @@ pub fn main() !void {
std.debug.warn("Expected second argument to be cache root directory path\n");
return error.InvalidArgs;
});
- const zig_exe = try os.path.resolve(a, zig_exe_rel);
+ const zig_exe = try os.path.resolve(a, [][]const u8{zig_exe_rel});
- const dir_path = try os.path.join(a, cache_root, "clitest");
+ const dir_path = try os.path.join(a, [][]const u8{ cache_root, "clitest" });
const TestFn = fn ([]const u8, []const u8) anyerror!void;
const test_fns = []TestFn{
testZigInitLib,
@@ -99,8 +99,8 @@ fn testZigInitExe(zig_exe: []const u8, dir_path: []const u8) !void {
fn testGodboltApi(zig_exe: []const u8, dir_path: []const u8) anyerror!void {
if (builtin.os != builtin.Os.linux or builtin.arch != builtin.Arch.x86_64) return;
- const example_zig_path = try os.path.join(a, dir_path, "example.zig");
- const example_s_path = try os.path.join(a, dir_path, "example.s");
+ const example_zig_path = try os.path.join(a, [][]const u8{ dir_path, "example.zig" });
+ const example_s_path = try os.path.join(a, [][]const u8{ dir_path, "example.s" });
try std.io.writeFile(example_zig_path,
\\// Type your code here, or load an example.