aboutsummaryrefslogtreecommitdiff
path: root/test/cli.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-02-06 22:53:34 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-02-06 22:53:34 -0500
commitc804ae2d6b1f62d9cb45db2613d36ef14ac539a0 (patch)
tree28f614cb43731aef7c018b1d094f4d288d6635fa /test/cli.zig
parent8a5d3e2eaf72195993e4932bfda66d08a36c6064 (diff)
parent1e60ca4b752a61e26067b4893be623442836ec6f (diff)
downloadzig-c804ae2d6b1f62d9cb45db2613d36ef14ac539a0.tar.gz
zig-c804ae2d6b1f62d9cb45db2613d36ef14ac539a0.zip
Merge branch 'zig-backport-std.os.path' of https://github.com/kristate/zig into kristate-zig-backport-std.os.path
Diffstat (limited to 'test/cli.zig')
-rw-r--r--test/cli.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cli.zig b/test/cli.zig
index a07c447d2d..0980e8c2d8 100644
--- a/test/cli.zig
+++ b/test/cli.zig
@@ -29,7 +29,7 @@ pub fn main() !void {
});
const zig_exe = try os.path.resolve(a, 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.