Prefer TAP::Harness over Test::Harness

[openssl.git] / test / run_tests.pl

diff --git a/test/run_tests.pl b/test/run_tests.pl
index b8281acceb22ca9641df05cc80bb4bc521dea1ea..aa1dba024236bbc51fa0663e9b0a6ab41e1edde8 100644 (file)
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -16,7 +16,11 @@ BEGIN {
 
 use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
 use File::Basename;
-use Test::Harness qw/runtests $switches/;
+use if $^O ne "VMS", 'File::Glob' => qw/glob/;
+use Module::Load::Conditional qw(can_load);
+
+my $TAP_Harness = can_load({modules => [ 'TAP::Harness' ]})
+    ? 'TAP::Harness' : 'OpenSSL::TAP::Harness';
 
 my $srctop = $ENV{SRCTOP} || $ENV{TOP};
 my $bldtop = $ENV{BLDTOP} || $ENV{TOP};
@@ -24,41 +28,102 @@ my $recipesdir = catdir($srctop, "test", "recipes");
 my $testlib = catdir($srctop, "test", "testlib");
 my $utillib = catdir($srctop, "util");
 
-# It seems that $switches is getting interpreted with 'eval' or something
-# like that, and that we need to take care of backslashes or they will
-# disappear along the way.
-$testlib =~ s|\\|\\\\|g if $^O eq "MSWin32";
-$utillib =~ s|\\|\\\\|g if $^O eq "MSWin32";
+my %tapargs =
+    ( verbosity => $ENV{VERBOSE} || $ENV{V} || $ENV{HARNESS_VERBOSE} ? 1 : 0,
+      lib       => [ $testlib, $utillib ],
+      switches  => '-w',
+      merge     => 1
+    );
+
+my @alltests = find_matching_tests("*");
+my %tests = ();
 
-# Test::Harness provides the variable $switches to give it
-# switches to be used when it calls our recipes.
-$switches = "-w \"-I$testlib\" \"-I$utillib\"";
+my $initial_arg = 1;
+foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
+    if ($arg eq 'list') {
+       foreach (@alltests) {
+           (my $x = basename($_)) =~ s|^[0-9][0-9]-(.*)\.t$|$1|;
+           print $x,"\n";
+       }
+       exit 0;
+    }
+    if ($arg eq 'alltests') {
+       warn "'alltests' encountered, ignoring everything before that...\n"
+           unless $initial_arg;
+       %tests = map { $_ => 1 } @alltests;
+    } elsif ($arg =~ m/^(-?)(.*)/) {
+       my $sign = $1;
+       my $test = $2;
+       my @matches = find_matching_tests($test);
 
-my @tests = ( "alltests" );
-if (@ARGV) {
-    @tests = @ARGV;
+       # If '-foo' is the first arg, it's short for 'alltests -foo'
+       if ($sign eq '-' && $initial_arg) {
+           %tests = map { $_ => 1 } @alltests;
+       }
+
+       if (scalar @matches == 0) {
+           warn "Test $test found no match, skipping ",
+               ($sign eq '-' ? "removal" : "addition"),
+               "...\n";
+       } else {
+           foreach $test (@matches) {
+               if ($sign eq '-') {
+                   delete $tests{$test};
+               } else {
+                   $tests{$test} = 1;
+               }
+           }
+       }
+    } else {
+       warn "I don't know what '$arg' is about, ignoring...\n";
+    }
+
+    $initial_arg = 0;
 }
-my $list_mode = scalar(grep /^list$/, @tests) != 0;
-if (grep /^alltests|list$/, @tests) {
-    @tests = grep {
-       basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
-    } glob(catfile($recipesdir,"*.t"));
-} else {
-    my @t = ();
-    foreach (@tests) {
-       push @t, grep {
-           basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
-       } glob(catfile($recipesdir,"*-$_.t"));
+
+my $harness = $TAP_Harness->new(\%tapargs);
+$harness->runtests(map { abs2rel($_, rel2abs(curdir())); } sort keys %tests);
+
+sub find_matching_tests {
+    my ($glob) = @_;
+
+    if ($glob =~ m|^[\d\[\]\?\-]+$|) {
+        return glob(catfile($recipesdir,"$glob-*.t"));
     }
-    @tests = @t;
+    return glob(catfile($recipesdir,"*-$glob.t"));
 }
 
-if ($list_mode) {
-    @tests = map { $_ = basename($_); $_ =~ s/^[0-9][0-9]-//; $_ =~ s/\.t$//;
-                   $_ } @tests;
-    print join("\n", @tests), "\n";
-} else {
-    @tests = map { abs2rel($_, rel2abs(curdir())); } @tests;
 
-    runtests(sort @tests);
+# Fake TAP::Harness in case it's not loaded
+use Test::Harness;
+package OpenSSL::TAP::Harness;
+
+sub new {
+    my $class = shift;
+    my %args = %{ shift() };
+
+    return bless { %args }, $class;
+}
+
+sub runtests {
+    my $self = shift;
+
+    my @switches = ();
+    if ($self->{switches}) {
+       push @switches, $self->{switches};
+    }
+    if ($self->{lib}) {
+       foreach (@{$self->{lib}}) {
+           my $l = $_;
+
+           # It seems that $switches is getting interpreted with 'eval' or
+           # something like that, and that we need to take care of backslashes
+           # or they will disappear along the way.
+           $l =~ s|\\|\\\\|g if $^O eq "MSWin32";
+           push @switches, "-I$l";
+       }
+    }
+
+    $Test::Harness::switches = join(' ', @switches);
+    Test::Harness::runtests(@_);
 }