svn commit: samba r25360 - in branches/SAMBA_4_0: . source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-09-26 19:25:50 +0000 (Wed, 26 Sep 2007)
New Revision: 25360

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25360

Log:
Allow --skip to be specified more than once.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-09-26 19:23:54 UTC (rev 25359)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-09-26 19:25:50 UTC (rev 25360)
@@ -137,7 +137,7 @@
 my $opt_one = 0;
 my $opt_immediate = 0;
 my $opt_expected_failures = undef;
-my $opt_skip = undef;
+my @opt_skip = ();
 my $opt_verbose = 0;
 my $opt_testenv = 0;
 my $ldap = undef;
@@ -321,7 +321,7 @@
 		'one' => \$opt_one,
 		'immediate' => \$opt_immediate,
 		'expected-failures=s' => \$opt_expected_failures,
-		'skip=s' => \$opt_skip,
+		'skip=s' => \@opt_skip,
 		'srcdir=s' => \$srcdir,
 		'builddir=s' => \$builddir,
 		'verbose' => \$opt_verbose,
@@ -458,8 +458,8 @@
 	@expected_failures = read_test_regexes($opt_expected_failures);
 }
 
-if (defined($opt_skip)) {
-	@skips = read_test_regexes($opt_skip);
+foreach (@opt_skip) {
+	push (@skips, read_test_regexes($_));
 }
 
 my $interfaces = join(',', ("127.0.0.6/8",