summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-22 19:08:37 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-09-22 22:29:08 -0700
commit9bce7838788db26c9846b619e3ac7edc46a65beb (patch)
tree748793f324cc277e9b6e899462054cad7825d273
parentcd8d7804208c9674be07b239e22fd4f612fb9952 (diff)
downloadsamba-9bce7838788db26c9846b619e3ac7edc46a65beb.tar.gz
samba-9bce7838788db26c9846b619e3ac7edc46a65beb.tar.bz2
samba-9bce7838788db26c9846b619e3ac7edc46a65beb.zip
selftest: Fix use of --load-list.
-rwxr-xr-xselftest/selftest.pl2
-rwxr-xr-xsource4/selftest/tests.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index f973ae589f..5457306c62 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -940,7 +940,7 @@ $envvarstr
foreach my $test (@{$individual_tests->{$name}}) {
print $fh "$test\n";
}
- $cmd .= " --load-list=$listid_file";
+ $cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
} elsif ($$_[4]) {
$cmd =~ s/\s+[^\s]+\s*$//;
$cmd .= " " . join(' ', @{$individual_tests->{$name}});
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 4a91affdd0..ed72752455 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -57,7 +57,7 @@ plantestsuite_loadlist() {
fi
echo $fullname
echo $env
- echo "$cmdline 2>&1 | ../selftest/filter-subunit --prefix=\"$fullname.\""
+ echo "$cmdline \$LOADLIST 2>&1 | ../selftest/filter-subunit --prefix=\"$fullname.\""
}
plantestsuite_idlist() {