Compare commits

..

No commits in common. "849138902301910f39e3b9d61fd54979da9171ae" and "240f3f148fc259ad1c92572fc712b926fb4dd8dd" have entirely different histories.

View file

@ -145,18 +145,15 @@ var temp_dir_counter = std.atomic.Value(u32).init(0);
/// Create a fresh temporary directory and return its absolute path (caller frees). /// Create a fresh temporary directory and return its absolute path (caller frees).
fn makeTempDir(allocator: std.mem.Allocator) ![]u8 { fn makeTempDir(allocator: std.mem.Allocator) ![]u8 {
const n = temp_dir_counter.fetchAdd(1, .monotonic); const n = temp_dir_counter.fetchAdd(1, .monotonic);
const pid = switch (builtin.os.tag) { const name = try std.fmt.allocPrint(
.linux => std.os.linux.getpid(), allocator,
.windows => std.os.windows.GetCurrentProcessId(), "/tmp/nightwatch_test_{d}_{d}",
else => std.c.getpid(), .{ switch (builtin.os.tag) {
}; .linux => std.os.linux.getpid(),
const name = if (builtin.os.tag == .windows) blk: { .windows => std.os.windows.GetCurrentProcessId(),
const tmp_dir = std.process.getEnvVarOwned(allocator, "TEMP") catch else => std.c.getpid(),
try std.process.getEnvVarOwned(allocator, "TMP"); }, n },
defer allocator.free(tmp_dir); );
break :blk try std.fmt.allocPrint(allocator, "{s}\\nightwatch_test_{d}_{d}", .{ tmp_dir, pid, n });
} else
try std.fmt.allocPrint(allocator, "/tmp/nightwatch_test_{d}_{d}", .{ pid, n });
errdefer allocator.free(name); errdefer allocator.free(name);
try std.fs.makeDirAbsolute(name); try std.fs.makeDirAbsolute(name);
return name; return name;
@ -197,7 +194,7 @@ test "creating a file emits a 'created' event" {
defer watcher.deinit(); defer watcher.deinit();
try watcher.watch(tmp); try watcher.watch(tmp);
const file_path = try std.fs.path.join(allocator, &.{ tmp, "hello.txt" }); const file_path = try std.fmt.allocPrint(allocator, "{s}/hello.txt", .{tmp});
defer allocator.free(file_path); defer allocator.free(file_path);
{ {
const f = try std.fs.createFileAbsolute(file_path, .{}); const f = try std.fs.createFileAbsolute(file_path, .{});
@ -222,7 +219,7 @@ test "writing to a file emits a 'modified' event" {
defer th.deinit(); defer th.deinit();
// Create the file before setting up the watcher to start from a clean slate. // Create the file before setting up the watcher to start from a clean slate.
const file_path = try std.fs.path.join(allocator, &.{ tmp, "data.txt" }); const file_path = try std.fmt.allocPrint(allocator, "{s}/data.txt", .{tmp});
defer allocator.free(file_path); defer allocator.free(file_path);
{ {
const f = try std.fs.createFileAbsolute(file_path, .{}); const f = try std.fs.createFileAbsolute(file_path, .{});
@ -256,7 +253,7 @@ test "deleting a file emits a 'deleted' event" {
const th = try TestHandler.init(allocator); const th = try TestHandler.init(allocator);
defer th.deinit(); defer th.deinit();
const file_path = try std.fs.path.join(allocator, &.{ tmp, "gone.txt" }); const file_path = try std.fmt.allocPrint(allocator, "{s}/gone.txt", .{tmp});
defer allocator.free(file_path); defer allocator.free(file_path);
{ {
const f = try std.fs.createFileAbsolute(file_path, .{}); const f = try std.fs.createFileAbsolute(file_path, .{});
@ -290,7 +287,7 @@ test "creating a sub-directory emits a 'dir_created' event" {
defer watcher.deinit(); defer watcher.deinit();
try watcher.watch(tmp); try watcher.watch(tmp);
const dir_path = try std.fs.path.join(allocator, &.{ tmp, "subdir" }); const dir_path = try std.fmt.allocPrint(allocator, "{s}/subdir", .{tmp});
defer allocator.free(dir_path); defer allocator.free(dir_path);
try std.fs.makeDirAbsolute(dir_path); try std.fs.makeDirAbsolute(dir_path);