diff options
| author | Ryan Liptak <squeek502@hotmail.com> | 2022-09-23 05:32:04 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-10-05 04:21:16 -0400 |
| commit | 6ac0d2d9d6a28dc79f78ed9a4e66f5145d6d7765 (patch) | |
| tree | 86537a7b1ae513f80518283d5ff978b0a08840ea /src/Module.zig | |
| parent | ff534d22676b8a934acf1931f91d70c554a4bdca (diff) | |
| download | zig-6ac0d2d9d6a28dc79f78ed9a4e66f5145d6d7765.tar.gz zig-6ac0d2d9d6a28dc79f78ed9a4e66f5145d6d7765.zip | |
Fix all std lib tests being run for any file within the std package
Before this commit:
```
$ zig test lib/std/fs/test.zig --main-pkg-path lib/std --zig-lib-dir lib
2170 passed; 37 skipped; 0 failed.
```
After this commit:
```
$ zig test lib/std/fs/test.zig --main-pkg-path lib/std --zig-lib-dir lib
All 45 tests passed.
```
This matches stage1 behavior:
```
$ zig test -fstage1 lib/std/fs/test.zig --main-pkg-path lib/std --zig-lib-dir lib
All 45 tests passed.
```
All tests are still run if `zig test` is run directly on `lib/std/std.zig`:
```
$ zig test lib/std/std.zig --main-pkg-path lib/std --zig-lib-dir lib
2170 passed; 37 skipped; 0 failed.
```
`zig build test-std` is unaffected by this change.
Closes #12926
Diffstat (limited to 'src/Module.zig')
| -rw-r--r-- | src/Module.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Module.zig b/src/Module.zig index 959c2ab4b2..81a9ec220b 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -142,7 +142,7 @@ job_queued_update_builtin_zig: bool = true, /// This makes it so that we can run `zig test` on the standard library. /// Otherwise, the logic for scanning test decls skips all of them because /// `main_pkg != std_pkg`. -main_pkg_in_std: bool, +main_pkg_is_std: bool, compile_log_text: ArrayListUnmanaged(u8) = .{}, @@ -5174,7 +5174,7 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err // the test name filter. if (!comp.bin_file.options.is_test) break :blk false; if (decl_pkg != mod.main_pkg) { - if (!mod.main_pkg_in_std) break :blk false; + if (!mod.main_pkg_is_std) break :blk false; const std_pkg = mod.main_pkg.table.get("std").?; if (std_pkg != decl_pkg) break :blk false; } @@ -5185,7 +5185,7 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err if (!is_named_test) break :blk false; if (!comp.bin_file.options.is_test) break :blk false; if (decl_pkg != mod.main_pkg) { - if (!mod.main_pkg_in_std) break :blk false; + if (!mod.main_pkg_is_std) break :blk false; const std_pkg = mod.main_pkg.table.get("std").?; if (std_pkg != decl_pkg) break :blk false; } |