summaryrefslogtreecommitdiff
path: root/selftest/selftest.pl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-10-26 20:17:20 -0700
committerJelmer Vernooij <jelmer@samba.org>2014-11-30 14:22:05 +0100
commitf6e3cd7f03a15595a2fa65c22a56c60d7d3f8bff (patch)
treef8e1e988650370d44aad24befc20cf5853b63a0c /selftest/selftest.pl
parent13a1406fa11f4c7eb1996a5ac1e33c966b886082 (diff)
downloadsamba-f6e3cd7f03a15595a2fa65c22a56c60d7d3f8bff.tar.gz
selftest: Drop support for TESTSUITE-IDLIST, and remove its last user.
Change-Id: Ic616676bb770fa4769195d73c4309915646caae0 Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/selftest.pl')
-rwxr-xr-xselftest/selftest.pl11
1 files changed, 4 insertions, 7 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 7dde5b27364..34ae6056efd 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -568,9 +568,8 @@ sub read_testlist($)
open(IN, $filename) or die("Unable to open $filename: $!");
while (<IN>) {
- if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
+ if (/-- TEST(-LOADLIST|) --\n/) {
my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
- my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
my $name = <IN>;
$name =~ s/\n//g;
my $env = <IN>;
@@ -578,7 +577,7 @@ sub read_testlist($)
my $cmdline = <IN>;
$cmdline =~ s/\n//g;
if (should_run_test($name) == 1) {
- push (@ret, [$name, $env, $cmdline, $supports_loadlist, $supports_idlist]);
+ push (@ret, [$name, $env, $cmdline, $supports_loadlist]);
}
} else {
print;
@@ -823,7 +822,6 @@ sub setup_env($$)
}
}
-
return undef unless defined($testenv_vars);
$running_envs{$envname} = $testenv_vars;
@@ -995,9 +993,8 @@ $envvarstr
print $fh substr($test, length($name)+1) . "\n";
}
$cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
- } elsif ($$_[4]) {
- $cmd =~ s/\s+[^\s]+\s*$//;
- $cmd .= " " . join(' ', @{$individual_tests->{$name}});
+ } else {
+ warn("Unable to run individual tests in $name, it does not support --loadlist.");
}
}