summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xselftest/selftest.pl5
-rwxr-xr-xsource4/selftest/tests.sh7
2 files changed, 6 insertions, 6 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 37433de42d..a21ecbabe4 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -633,7 +633,7 @@ sub read_testlist($)
open(IN, $filename) or die("Unable to open $filename: $!");
while (<IN>) {
- if (/-- TEST(-LOADLIST|IDLIST)? --\n/) {
+ if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
my $name = <IN>;
@@ -955,7 +955,8 @@ $envvarstr
}
$cmd .= " --load-list=$listid_file";
} elsif ($$_[4]) {
- $cmd .= join(' ', @{$individual_tests->{$name}});
+ $cmd =~ s/\s+[^\s]+\s*$//;
+ $cmd .= " " . join(' ', @{$individual_tests->{$name}});
}
}
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index f31f0823d3..719f4a65b1 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -102,10 +102,9 @@ planperltestsuite() {
planpythontestsuite() {
name=$1
env=$2
- shift 2
- other_args="$*"
- cmdline="$SUBUNITRUN $other_args"
- plantestsuite "$name" "$env" $cmdline
+ module="$3"
+ shift 3
+ plantestsuite_idlist "$name" "$env" python -m subunit.run $module
}
plansmbtorturetestsuite() {