authorgravatar for carl@astholm.seCarl Åstholm <carl@astholm.se> 2024-03-03 22:13:38+01:00
committergravatar for carl@astholm.seCarl Åstholm <carl@astholm.se> 2024-04-07 15:34:47+02:00
log7b1a6a93a4e94ee859ab2a41c7865b7859d19e62
tree49ef6f6560e5ab80c301724d2bca8e89e278e3a2
parent8ce3a8b6041d2dd2eea1e9fcb55bc9d602469667

Fix install_headers test on macOS (and possibly Linux)

3 files changed, 4 insertions(+), 4 deletions(-)

test/standalone/install_headers/check_exists.zig+3-3
...@@ -12,12 +12,12 @@ pub fn main() !void {...@@ -12,12 +12,12 @@ pub fn main() !void {
12 _ = arg_it.next();12 _ = arg_it.next();
1313
14 const cwd = std.fs.cwd();14 const cwd = std.fs.cwd();
15 const cwd_realpath = try cwd.realpathAlloc(arena, "");15 const cwd_realpath = try cwd.realpathAlloc(arena, ".");
1616
17 while (arg_it.next()) |file_path| {17 while (arg_it.next()) |file_path| {
18 if (file_path.len > 0 and file_path[0] == '!') {18 if (file_path.len > 0 and file_path[0] == '!') {
19 errdefer std.log.err(19 errdefer std.log.err(
20 "excluded file check '{s}{c}{s}' failed",20 "exclusive file check '{s}{c}{s}' failed",
21 .{ cwd_realpath, std.fs.path.sep, file_path[1..] },21 .{ cwd_realpath, std.fs.path.sep, file_path[1..] },
22 );22 );
23 if (std.fs.cwd().statFile(file_path[1..])) |_| {23 if (std.fs.cwd().statFile(file_path[1..])) |_| {
...@@ -28,7 +28,7 @@ pub fn main() !void {...@@ -28,7 +28,7 @@ pub fn main() !void {
28 }28 }
29 } else {29 } else {
30 errdefer std.log.err(30 errdefer std.log.err(
31 "included file check '{s}{c}{s}' failed",31 "inclusive file check '{s}{c}{s}' failed",
32 .{ cwd_realpath, std.fs.path.sep, file_path },32 .{ cwd_realpath, std.fs.path.sep, file_path },
33 );33 );
34 _ = try std.fs.cwd().statFile(file_path);34 _ = try std.fs.cwd().statFile(file_path);
test/standalone/install_headers/include/sub_dir/c.ignore_me.h created+1
...@@ -0,0 +1 @@
1#error "ignore me"
test/standalone/install_headers/include/sub_dir/ignore_me.h deleted-1
...@@ -1 +0,0 @@
1#error "ignore me"