launcher: support multi-for loop syntax
At the moment we need both old and new zig, so doing a way that's compatible with both.
This commit is contained in:
parent
0fd73783db
commit
b4d067adbe
|
@ -252,9 +252,15 @@ fn shouldReturnEarly(args: []const []const u8) bool {
|
||||||
const prelude = comptimeSplit("-Wl,--no-gc-sections -x c - -o /dev/null");
|
const prelude = comptimeSplit("-Wl,--no-gc-sections -x c - -o /dev/null");
|
||||||
if (args.len < prelude.len)
|
if (args.len < prelude.len)
|
||||||
return false;
|
return false;
|
||||||
for (prelude) |arg, i|
|
|
||||||
|
// TODO: replace with:
|
||||||
|
// for (prelude, 0..) |arg, i|
|
||||||
|
var i: usize = 0;
|
||||||
|
for (prelude) |arg| {
|
||||||
if (!mem.eql(u8, arg, args[args.len - prelude.len + i]))
|
if (!mem.eql(u8, arg, args[args.len - prelude.len + i]))
|
||||||
return false;
|
return false;
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,8 +342,13 @@ fn compareExec(
|
||||||
) !void {
|
) !void {
|
||||||
try testing.expectEqual(want_args.len, res.exec.args.items.len);
|
try testing.expectEqual(want_args.len, res.exec.args.items.len);
|
||||||
|
|
||||||
for (want_args) |want_arg, i|
|
// TODO: replace with:
|
||||||
|
// for (prelude, 0..) |arg, i|
|
||||||
|
var i: usize = 0;
|
||||||
|
for (want_args) |want_arg| {
|
||||||
try testing.expectEqualStrings(want_arg, res.exec.args.items[i]);
|
try testing.expectEqualStrings(want_arg, res.exec.args.items[i]);
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
|
||||||
try testing.expectEqualStrings(
|
try testing.expectEqualStrings(
|
||||||
want_env_zig_lib_dir,
|
want_env_zig_lib_dir,
|
||||||
|
|
Loading…
Reference in New Issue