1 files changed, 22 insertions, 21 deletions

diff --git a/src/main.zig b/src/main.zig
index e26ec6c..fcf2723 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1185,81 +1185,82 @@ test "e2e" {
             };
         }
 
-        fn run(tc: *Self, dest: Io.Dir) !void {
+        fn run(tc: *Self, dest: Dir) !void {
             std.debug.print("=== {s} =============================\n", .{tc.source.path});
 
-            defer tc.root_dir.close(io);
+            defer tc.root_dir.fd.close(io);
             defer tc.source.close(io);
 
-            const b = try Builder.init(gpa, tc.root_dir, tc.source, dest);
+            const b = try Builder.init(gpa, tc.root_dir, tc.source, dest, .{});
             defer b.deinit(gpa);
             try b.build(
                 io,
                 gpa,
             );
 
-            const fd = try dest.openFile(io, tc.expect_path, .{ .mode = .read_write, .lock = .exclusive });
+            const fd = try dest.fd.openFile(io, tc.expect_path, .{ .mode = .read_write, .lock = .exclusive });
             defer fd.close(io);
             const xattr_dgst = try getXattrSourceDigest(gpa, fd);
 
-            log.debug("{x} == {x}", .{ tc.expect_dgst, xattr_dgst });
-            if (!std.mem.eql(u8, &tc.expect_dgst, &xattr_dgst)) {
+            log.debug("{x} == {x}", .{ tc.expect_dgst, xattr_dgst.? });
+            if (!std.mem.eql(u8, &tc.expect_dgst, &xattr_dgst.?)) {
                 std.debug.print("====== expected this digest: =========\n", .{});
                 std.debug.print("{x}\n\n", .{tc.expect_dgst});
                 std.debug.print("======== instead found this: =========\n", .{});
-                std.debug.print("{x}\n\n", .{xattr_dgst});
+                std.debug.print("{x}\n\n", .{xattr_dgst.?});
                 std.debug.print("======================================\n", .{});
                 return error.TestExpectedEqual;
             }
 
-            try shell(io, "tree", .{ .cwd = .{ .dir = dest } });
+            try shell(io, "tree", .{ .cwd = .{ .dir = dest.fd } });
             const cmd = try std.fmt.allocPrint(gpa, "cat {s}", .{tc.expect_path});
             defer gpa.free(cmd);
-            try shell(io, cmd, .{ .cwd = .{ .dir = dest } });
+            try shell(io, cmd, .{ .cwd = .{ .dir = dest.fd } });
         }
     };
 
-    var tmp = std.testing.tmpDir(.{ .iterate = true });
-    defer tmp.cleanup();
+    var tmproot = std.testing.tmpDir(.{ .iterate = true });
+    defer tmproot.cleanup();
+    const tmp = Dir{ .fd = tmproot.dir, .path = "." };
 
     {
         var tc = try Tc.init(
             "./testdata/only-copy.html",
             "only-copy.html",
-            try Testing.parse_hash("eae5ff7df7c71f8bbeda89302f9fe721"),
+            try Testing.parse_hash("be89dea05afb8f216e8ad977edad28ee"),
         );
-        try tc.run(tmp.dir);
+        try tc.run(tmp);
     }
     {
         var tc = try Tc.init(
             "./testdata/only-copy.html",
             "only-copy.html",
-            try Testing.parse_hash("eae5ff7df7c71f8bbeda89302f9fe721"),
+            try Testing.parse_hash("be89dea05afb8f216e8ad977edad28ee"),
         );
-        try tc.run(tmp.dir);
+        try tc.run(tmp);
     }
     {
         var tc = try Tc.init(
             "./testdata/fragment.htm",
             "fragment.html",
-            try Testing.parse_hash("a5c099fac15ea9ea9928712fa6229702"),
+            try Testing.parse_hash("3d14d46139973e8ddf5bc6ebd2089a62"),
         );
-        try tc.run(tmp.dir);
+        try tc.run(tmp);
     }
     {
         var tc = try Tc.init(
             "./testdata/page.htm",
             "page.html",
-            try Testing.parse_hash("5d810c74eb9ba4d03fa49ab920b85e45"),
+            try Testing.parse_hash("091c13472ee74d2805765901b812266d"),
         );
-        try tc.run(tmp.dir);
+        try tc.run(tmp);
     }
     {
         var tc = try Tc.init(
             "./testdata/meta.tilde.foo.htm",
             "~foo",
-            try Testing.parse_hash("f5bdd49b1a3d691113033ee606e0aa1d"),
+            try Testing.parse_hash("fdb03f240780fb8a90e1d504366ee23b"),
         );
-        try tc.run(tmp.dir);
+        try tc.run(tmp);
     }
 }