sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

selftest: Use idlist testing for python tests.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-09-21 20:58:23 -07:00
parent bf907d2c4a
commit 7c1b00f4a8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
selftest/selftest.pl
View File

@ -633,7 +633,7 @@ sub read_testlist($)
open(IN, $filename) or die("Unable to open $filename: $!"); open(IN, $filename) or die("Unable to open $filename: $!");
while (<IN>) { while (<IN>) {
if (/-- TEST(-LOADLIST|IDLIST)? --\n/) { if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST"); my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
my $supports_idlist = (defined($1) and $1 eq "-IDLIST"); my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
my $name = <IN>; my $name = <IN>;
@ -955,7 +955,8 @@ $envvarstr
} }
$cmd .= " --load-list=$listid_file"; $cmd .= " --load-list=$listid_file";
} elsif ($$_[4]) { } elsif ($$_[4]) {
$cmd .= join(' ', @{$individual_tests->{$name}}); $cmd =~ s/\s+[^\s]+\s*$//;
$cmd .= " " . join(' ', @{$individual_tests->{$name}});
} }
} }

7
source4/selftest/tests.sh
View File

@ -102,10 +102,9 @@ planperltestsuite() {
planpythontestsuite() { planpythontestsuite() {
name=$1 name=$1
env=$2 env=$2
shift 2 module="$3"
other_args="$*" shift 3
cmdline="$SUBUNITRUN $other_args" plantestsuite_idlist "$name" "$env" python -m subunit.run $module
plantestsuite "$name" "$env" $cmdline
} }
plansmbtorturetestsuite() { plansmbtorturetestsuite() {