External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

testutils: find perl early

Browse Source 
Commit 843a70a changed test-wrap-argv.pl to use
/usr/bin/env perl
instead of
/usr/bin/perl

However when called from qemuxml2argvtest with
VIR_TEST_REGENERATE_OUTPUT, PATH is set to '/bin'.

Find the path to perl early in virTestMain, in case we
are going to need it later after we've overridden PATH.
This commit is contained in:
Ján Tomko 2016-07-11 14:45:49 +02:00
parent 45ff2362e4
commit bd6708a862
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/testutils.c
View File

@ -83,6 +83,7 @@ static size_t testCounter;
static virBitmapPtr testBitmap;
char *progname;
static char *perl;
bool virTestOOMActive(void)
{
@ -441,10 +442,15 @@ virTestRewrapFile(const char *filename)
char *script = NULL;
virCommandPtr cmd = NULL;
if (!perl) {
fprintf(stderr, "cannot rewrap %s: unable to find perl in path", filename);
return -1;
}
if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0)
goto cleanup;
cmd = virCommandNewArgList(script, "--in-place", filename, NULL);
cmd = virCommandNewArgList(perl, script, "--in-place", filename, NULL);
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
@ -966,6 +972,9 @@ int virTestMain(int argc,
}
#endif /* TEST_OOM */
/* Find perl early because some tests override PATH */
perl = virFindFileInPath("perl");
ret = (func)();
virResetLastError();
@ -974,6 +983,7 @@ int virTestMain(int argc,
fprintf(stderr, "%*s", 40 - (int)(testCounter % 40), "");
fprintf(stderr, " %-3zu %s\n", testCounter, ret == 0 ? "OK" : "FAIL");
}
VIR_FREE(perl);
return ret;
}