diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-26 21:15:04 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:38 +0100 |
| commit | e690c56ab7180f135ba0e67a24f53282c3f0d144 (patch) | |
| tree | c467e0ce9aae18c2d6fbc202ed1894c163d8ce38 /source4/selftest/selftest.pl | |
| parent | 90964021eb10264b3df6be9e9d1ea7ab45c7c1da (diff) | |
| download | samba-e690c56ab7180f135ba0e67a24f53282c3f0d144.tar.gz samba-e690c56ab7180f135ba0e67a24f53282c3f0d144.tar.bz2 samba-e690c56ab7180f135ba0e67a24f53282c3f0d144.zip | |
r25741: Simplify calls to Subunit functions.
(This used to be commit e42de5d8346a12c3fcdb8f9af1efa650c368a442)
Diffstat (limited to 'source4/selftest/selftest.pl')
| -rwxr-xr-x | source4/selftest/selftest.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 725e1dc153..810a6f31c0 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -470,10 +470,10 @@ sub read_test_regexes($) open(LF, "<$name") or die("unable to read $name: $!"); while (<LF>) { chomp; - if (/^(.*?)([ \t]+)\#(.*)$/) { - push (@ret, [$1, $3]); + if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) { + push (@ret, [$1, $4]); } else { - s/^(.*?)([ \t]+)\#(.*)$//; + s/^(.*?)([ \t]+)\#([\t ]*)(.*?)$//; push (@ret, [$_, undef]); } } @@ -783,7 +783,7 @@ $envvarstr my $skipreason = skip($name); if ($skipreason) { - $msg_ops->skip_testsuite($envname, $name, $skipreason); + $msg_ops->skip_testsuite($name, $skipreason); $statistics->{SUITES_SKIPPED}++; next; } @@ -791,7 +791,7 @@ $envvarstr my $envvars = setup_env($envname); if (not defined($envvars)) { $statistics->{SUITES_SKIPPED}++; - $msg_ops->missing_env($name, $envname); + $msg_ops->skip_testsuite($name, "unable to set up environment $envname"); next; } |