summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-23 10:28:22 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-09-23 11:36:12 -0700
commite74b7091cd97eba52227d8e93d003043a2f1a0cf (patch)
tree384bef2209b589f85a97e79a496dacb227d81fc0 /selftest
parent4c3985b584e89cb90e49c352f53da5621107c453 (diff)
downloadsamba-e74b7091cd97eba52227d8e93d003043a2f1a0cf.tar.gz
samba-e74b7091cd97eba52227d8e93d003043a2f1a0cf.tar.bz2
samba-e74b7091cd97eba52227d8e93d003043a2f1a0cf.zip
selftest: Pass prefix to setup_env function.
Diffstat (limited to 'selftest')
-rwxr-xr-xselftest/selftest.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 864892fcb6..37360b9413 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -809,9 +809,9 @@ $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
die("Received signal $signame");
};
-sub setup_env($)
+sub setup_env($$)
{
- my ($name) = @_;
+ my ($name, $prefix) = @_;
my $testenv_vars = undef;
@@ -904,7 +904,7 @@ if ($opt_testenv) {
my $testenv_name = $ENV{SELFTEST_TESTENV};
$testenv_name = $testenv_default unless defined($testenv_name);
- my $testenv_vars = setup_env($testenv_name);
+ my $testenv_vars = setup_env($testenv_name, $prefix);
die("Unable to setup environment $testenv_name") unless ($testenv_vars);
@@ -933,7 +933,7 @@ $envvarstr
my $name = $$_[0];
my $envname = $$_[1];
- my $envvars = setup_env($envname);
+ my $envvars = setup_env($envname, $prefix);
if (not defined($envvars)) {
Subunit::start_testsuite($name);
Subunit::end_testsuite($name, "error",