Skip to content

Commit

Permalink
test: disable invalid check that needs upstream fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kubkon committed Aug 4, 2023
1 parent cfb8815 commit 2e9a9b9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
18 changes: 10 additions & 8 deletions test/elf.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1833,10 +1833,11 @@ fn testSharedAbsSymbol(b: *Build, opts: Options) *Step {
run.expectStdOutEqual("foo=0x3\n");
test_step.dependOn(run.step());

const check = exe.check();
check.checkInSymtab();
check.checkNotPresent("foo");
test_step.dependOn(&check.step);
// TODO fix/improve in CheckObject
// const check = exe.check();
// check.checkInSymtab();
// check.checkNotPresent("foo");
// test_step.dependOn(&check.step);
}

{
Expand All @@ -1850,10 +1851,11 @@ fn testSharedAbsSymbol(b: *Build, opts: Options) *Step {
run.expectStdOutEqual("foo=0x3\n");
test_step.dependOn(run.step());

const check = exe.check();
check.checkInSymtab();
check.checkNotPresent("foo");
test_step.dependOn(&check.step);
// TODO fix/improve in CheckObject
// const check = exe.check();
// check.checkInSymtab();
// check.checkNotPresent("foo");
// test_step.dependOn(&check.step);
}

return test_step;
Expand Down
4 changes: 2 additions & 2 deletions test/test.zig
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub fn addTests(b: *Build, comp: *Compile, build_opts: struct {

const zld = FileSourceWithDir.fromFileSource(b, comp.getOutputSource(), "ld");
const sdk_path = if (builtin.target.isDarwin())
std.zig.system.darwin.getDarwinSDK(b.allocator, builtin.target)
std.zig.system.darwin.getSdk(b.allocator, builtin.target)
else
null;

Expand All @@ -48,7 +48,7 @@ pub const SystemCompiler = enum {
pub const Options = struct {
zld: FileSourceWithDir,
system_compiler: SystemCompiler,
sdk_path: ?std.zig.system.darwin.DarwinSDK = null,
sdk_path: ?std.zig.system.darwin.Sdk = null,
has_static: bool = false,
is_musl: bool = false,
cc_override: ?[]const u8 = null,
Expand Down

0 comments on commit 2e9a9b9

Please sign in to comment.