authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-10-24 22:04:50+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-10-24 22:08:36+02:00
log89563f07e3956a44e37eb59e618d926bd401055c
tree379396e9dae61764b0e9406ba33a4fd32807c5f7
parent22a6a5d93f000afd7e00450bb5a359f39bb598bf

build: match and ignore /?/ in expected compile errors

1 files changed, 13 insertions(+), 0 deletions(-)

lib/std/Build/Step/Compile.zig+13
...@@ -2410,6 +2410,19 @@ fn checkCompileErrors(self: *Compile) !void {...@@ -2410,6 +2410,19 @@ fn checkCompileErrors(self: *Compile) !void {
2410 continue;2410 continue;
2411 }2411 }
2412 }2412 }
2413 // We scan for /?/ in expected line and if there is a match, we match everything
2414 // up to and after /?/.
2415 const expect_line_trim = mem.trim(u8, expect_line, " ");
2416 if (mem.indexOf(u8, expect_line_trim, "/?/")) |exp_index| {
2417 const actual_line_trim = mem.trim(u8, actual_line, " ");
2418 const exp_lhs = expect_line_trim[0..exp_index];
2419 const exp_rhs = expect_line_trim[exp_index + "/?/".len ..];
2420 if (mem.startsWith(u8, actual_line_trim, exp_lhs) and mem.endsWith(u8, actual_line_trim, exp_rhs)) {
2421 try expected_generated.appendSlice(actual_line);
2422 try expected_generated.append('\n');
2423 continue;
2424 }
2425 }
2413 try expected_generated.appendSlice(expect_line);2426 try expected_generated.appendSlice(expect_line);
2414 try expected_generated.append('\n');2427 try expected_generated.append('\n');
2415 }2428 }