mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6728 from Snektron/std-build-dupePkg-fix

Browse Source 
Fix invalid call to dupePkg in build.zig
This commit is contained in:
Jakub Konka 2020-10-18 15:29:51 +02:00 committed by GitHub
commit dc68aab6fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/std/build.zig
View File

@ -1843,7 +1843,7 @@ pub const LibExeObjStep = struct {
}
pub fn addPackage(self: *LibExeObjStep, package: Pkg) void {
self.packages.append(self.dupePkg(package)) catch unreachable;
self.packages.append(self.builder.dupePkg(package)) catch unreachable;
}
pub fn addPackagePath(self: *LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void {
@ -2749,6 +2749,37 @@ test "Builder.dupePkg()" {
std.testing.expect(dupe_deps[0].path.ptr != pkg_dep.path.ptr);
}
test "LibExeObjStep.addPackage" {
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
defer arena.deinit();
var builder = try Builder.create(
&arena.allocator,
"test",
"test",
"test",
);
defer builder.destroy();
const pkg_dep = Pkg{
.name = "pkg_dep",
.path = "/not/a/pkg_dep.zig",
};
const pkg_top = Pkg{
.name = "pkg_dep",
.path = "/not/a/pkg_top.zig",
.dependencies = &[_]Pkg{pkg_dep},
};
var exe = builder.addExecutable("not_an_executable", "/not/an/executable.zig");
exe.addPackage(pkg_top);
std.testing.expectEqual(@as(usize, 1), exe.packages.items.len);
const dupe = exe.packages.items[0];
std.testing.expectEqualStrings(pkg_top.name, dupe.name);
}
test "" {
// The only purpose of this test is to get all these untested functions
// to be referenced to avoid regression so it is okay to skip some targets.