authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-03-06 23:00:32-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-03-15 10:48:14-07:00
log263aaf0e66a1e2cdf5cebdbfc5e2761dc5a67181
treebe4a849eb280831c05078dcf3ef9d4f9fd59798c
parent8b871ae27584c2433683ca064dbd3e7127d2a184

re-enable asm-and-link tests

These already looked pretty good. I deleted two unnecessary calls to expectStdErrEqual.

2 files changed, 1 insertions(+), 3 deletions(-)

build.zig+1-1
...@@ -464,7 +464,7 @@ pub fn build(b: *std.Build) !void {...@@ -464,7 +464,7 @@ pub fn build(b: *std.Build) !void {
464 //test_step.dependOn(tests.addLinkTests(b, test_filter, optimization_modes, enable_macos_sdk, skip_stage2_tests, enable_symlinks_windows));464 //test_step.dependOn(tests.addLinkTests(b, test_filter, optimization_modes, enable_macos_sdk, skip_stage2_tests, enable_symlinks_windows));
465 test_step.dependOn(tests.addStackTraceTests(b, test_filter, optimization_modes));465 test_step.dependOn(tests.addStackTraceTests(b, test_filter, optimization_modes));
466 test_step.dependOn(tests.addCliTests(b, test_filter, optimization_modes));466 test_step.dependOn(tests.addCliTests(b, test_filter, optimization_modes));
467 //test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, optimization_modes));467 test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, optimization_modes));
468 test_step.dependOn(tests.addTranslateCTests(b, test_filter));468 test_step.dependOn(tests.addTranslateCTests(b, test_filter));
469 if (!skip_run_translated_c) {469 if (!skip_run_translated_c) {
470 test_step.dependOn(tests.addRunTranslatedCTests(b, test_filter, target));470 test_step.dependOn(tests.addRunTranslatedCTests(b, test_filter, target));
test/src/CompareOutput.zig-2
...@@ -104,7 +104,6 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {...@@ -104,7 +104,6 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {
104 const run = exe.run();104 const run = exe.run();
105 run.setName(annotated_case_name);105 run.setName(annotated_case_name);
106 run.addArgs(case.cli_args);106 run.addArgs(case.cli_args);
107 run.expectStdErrEqual("");
108 run.expectStdOutEqual(case.expected_output);107 run.expectStdOutEqual(case.expected_output);
109108
110 self.step.dependOn(&run.step);109 self.step.dependOn(&run.step);
...@@ -132,7 +131,6 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {...@@ -132,7 +131,6 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {
132 const run = exe.run();131 const run = exe.run();
133 run.setName(annotated_case_name);132 run.setName(annotated_case_name);
134 run.addArgs(case.cli_args);133 run.addArgs(case.cli_args);
135 run.expectStdErrEqual("");
136 run.expectStdOutEqual(case.expected_output);134 run.expectStdOutEqual(case.expected_output);
137135
138 self.step.dependOn(&run.step);136 self.step.dependOn(&run.step);