cmd: preserve package-test driver identity
This commit is contained in:
@@ -114,9 +114,6 @@ exec_package_tests(int argc, char **argv, const char *target,
|
||||
const char *prog = override && override[0] ? override : fallback;
|
||||
if (prog == fallback)
|
||||
snprintf(fallback, sizeof fallback, "%s/wwtest", self_dir);
|
||||
char builder[1024];
|
||||
snprintf(builder, sizeof builder, "%s/ww", self_dir);
|
||||
|
||||
char **xargv = calloc((size_t)argc + 6, sizeof *xargv);
|
||||
if (xargv == NULL) {
|
||||
fputs("ww test: cannot allocate package coordinator arguments\n",
|
||||
@@ -127,7 +124,7 @@ exec_package_tests(int argc, char **argv, const char *target,
|
||||
xargv[n++] = (char *)prog;
|
||||
xargv[n++] = "package";
|
||||
xargv[n++] = "--ww-driver";
|
||||
xargv[n++] = builder;
|
||||
xargv[n++] = (char *)self_path;
|
||||
for (int i = 0; i < argc; i++) {
|
||||
if (add_dot && !dotted && strcmp(argv[i], "--") == 0) {
|
||||
xargv[n++] = ".";
|
||||
|
||||
@@ -194,7 +194,6 @@ fn execpackagetests(selfdir: *u8, argv: **u8, argc: i32, start: i32,
|
||||
case void => void;
|
||||
};
|
||||
|
||||
let builder: *u8 = joinpathlit(selfdir, "ww_ww");
|
||||
let cap: i32 = argc - start + 6;
|
||||
let execargv: []*u8 = alloc([], cap: u64)!;
|
||||
execargv.len = cap;
|
||||
@@ -202,7 +201,7 @@ fn execpackagetests(selfdir: *u8, argv: **u8, argc: i32, start: i32,
|
||||
execargv[n] = prog; n += 1;
|
||||
execargv[n] = "package".ptr; n += 1;
|
||||
execargv[n] = "--ww-driver".ptr; n += 1;
|
||||
execargv[n] = builder; n += 1;
|
||||
execargv[n] = selfpath; n += 1;
|
||||
let dotted: bool = false;
|
||||
let i: i32 = start;
|
||||
for (i < argc) {
|
||||
|
||||
Reference in New Issue
Block a user