Commit 0e9458a3fc18bb6e31dda23811943ac3988fa385 | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-06-14 22:15:22-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-06-14 22:15:22-07:00
log	0e9458a3fc18bb6e31dda23811943ac3988fa385
tree	65c09c6987149544c77f12d58c3dc4f5f566c6f2
parent	8caa20641787944651f7c6fe2f664e93c55d79ec

test-cases: avoid using realpath since it is not portable

For example FreeBSD does not support this syscall.

1 files changed, 11 insertions(+), 9 deletions(-)

src
- test.zig

src/test.zig+11-9

 @@ -1800,19 +1800,21 @@ pub const TestContext = struct {
                         exec_node.activate();
                         defer exec_node.end();
-                        // We use relative to cwd here because we pass a new cwd to the
+                        // We go out of our way here to use the unique temporary directory name in
-                        // child process.
+                        // the exe_path so that it makes its way into the cache hash, avoiding
-                        const exe_path = try std.fmt.allocPrint(arena, "." ++ std.fs.path.sep_str ++ "{s}", .{bin_name});
+                        // cache collisions from multiple threads doing `zig run` at the same time
+                        // on the same test_case.c input filename.
+                        const ss = std.fs.path.sep_str;
+                        const exe_path = try std.fmt.allocPrint(
+                            arena,
+                            ".." ++ ss ++ "{s}" ++ ss ++ "{s}",
+                            .{ &tmp.sub_path, bin_name },
+                        );
                         if (case.object_format != null and case.object_format.? == .c) {
                             if (host.getExternalExecutor(target_info, .{ .link_libc = true }) != .native) {
                                 // We wouldn't be able to run the compiled C code.
                                 return; // Pass test.
                             }
-                            // Use an absolute path here so that the unique directory name
-                            // for this Case makes it into the cache hash, avoiding cache
-                            // collisions from multiple threads doing `zig run` at the same
-                            // time on the same test_case.c input filename.
-                            const abs_exe_path = try tmp.dir.realpathAlloc(arena, bin_name);
                             try argv.appendSlice(&[_][]const u8{
                                 std.testing.zig_exe_path,
                                 "run",
 @@ -1823,7 +1825,7 @@ pub const TestContext = struct {
                                 "-Wno-incompatible-library-redeclaration", // https://github.com/ziglang/zig/issues/875
                                 "--",
                                 "-lc",
-                                abs_exe_path,
+                                exe_path,
                             });
                         } else switch (host.getExternalExecutor(target_info, .{ .link_libc = case.link_libc })) {
                             .native => try argv.append(exe_path),