From 99f8d8c45dc953b0d30b411457dad516d84844ee Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 26 Sep 2007 19:25:50 +0000 Subject: r25360: Allow --skip to be specified more than once. (This used to be commit f6dd844dc4ad7da7508b3ff78190ce6d5c697789) --- source4/selftest/selftest.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 7089cfa022..8fd6b440b1 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -137,7 +137,7 @@ my $opt_socket_wrapper_keep_pcap = undef; 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 @@ my $result = GetOptions ( '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 @@ if (defined($opt_expected_failures)) { @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", -- cgit