From edc0e84270c04acf432096c4772bfe199afdaf15 Mon Sep 17 00:00:00 2001
From: dweiller <4678790+dweiller@users.noreplay.github.com>
Date: Wed, 8 Feb 2023 15:04:29 +1100
Subject: allow custom test runners to import modules

---
 src/Compilation.zig | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/Compilation.zig')

diff --git a/src/Compilation.zig b/src/Compilation.zig
index 8f265f9eb6..f19e83680d 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -1624,16 +1624,21 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
                 const test_pkg = if (options.test_runner_path) |test_runner| test_pkg: {
                     const test_dir = std.fs.path.dirname(test_runner);
                     const basename = std.fs.path.basename(test_runner);
-                    break :test_pkg try Package.create(gpa, "root", test_dir, basename);
-                }
-                else
-                    try Package.createWithDir(
-                        gpa,
-                        "root",
-                        options.zig_lib_directory,
-                        null,
-                        "test_runner.zig",
-                    );
+                    const pkg = try Package.create(gpa, "root", test_dir, basename);
+
+                    // copy package table from main_pkg to root_pkg
+                    var iter = main_pkg.table.valueIterator();
+                    while (iter.next()) |v| {
+                        try pkg.add(gpa, v.*);
+                    }
+                    break :test_pkg pkg;
+                } else try Package.createWithDir(
+                    gpa,
+                    "root",
+                    options.zig_lib_directory,
+                    null,
+                    "test_runner.zig",
+                );
                 errdefer test_pkg.destroy(gpa);
 
                 break :root_pkg test_pkg;
-- 
cgit v1.2.3