Better method of skipping all the tests in 00-check_testexes.t

[openssl.git] / test / recipes / 00-check_testexes.t

diff --git a/test/recipes/00-check_testexes.t b/test/recipes/00-check_testexes.t
index 6cbb7b2cabc8879275ca8e6718272b568c435543..483d8830fe196c461b7dfba20788fdc0f5a66941 100644 (file)
--- a/test/recipes/00-check_testexes.t
+++ b/test/recipes/00-check_testexes.t
@@ -3,51 +3,41 @@
 use strict;
 
 use File::Spec::Functions;
 use strict;
 
 use File::Spec::Functions;

-use Test::More;
-
+use File::Basename;

 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("check_testexes");
 
 my $MINFO = top_file("MINFO");
 
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("check_testexes");
 
 my $MINFO = top_file("MINFO");
 

-plan tests => 2;
-if (ok(open(FH,$MINFO), "MINFO exists")) {
-    subtest 'Finding test scripts for the compiled test binaries' => sub {
-       find_tests(\*FH); close FH;
-    };
-} else {
-    diag("Expected to find $MINFO, please run 'make files' in the top directory");
+plan skip_all => "because MINFO not found. If you want this test to run, please do 'perl util/mkfiles.pl > MINFO'"
+    unless open(FH,$MINFO);
+
+while(<FH>) {
+    chomp;
+    last if /^RELATIVE_DIRECTORY=test$/;
+}
+while(<FH>) {
+    chomp;
+    last if /^EXE=/;

 }
 }

+close FH;
+
+s/^EXE=\s*//;
+s/\s*$//;
+my @expected_tests =
+    map { s/\..*$//;           # Remove extension
+         s/_?test$//;          # Remove 'test', possibly prefixed with '_'
+         s/(sha\d+)t/$1/;      # sha comes with no t at the end
+         $_; } split(/\s+/, $_);
+
+plan tests => scalar @expected_tests;
+
+my @found_tests =
+    map { basename($_) } glob(top_file("test", "recipes", "*.t"));

 
 

-#-------------
-# test script finder
-sub find_tests {
-    my $fh = shift;
-    while(<$fh>) {
-       chomp;
-       last if /^RELATIVE_DIRECTORY=test$/;
-    }
-    while(<$fh>) {
-       chomp;
-       last if /^EXE=/;
-    }
-
-    s/^EXE=\s*//;
-    s/\s*$//;
-    my %foundfiles =
-       map {
-           my $key = $_;
-           s/_?test$//;
-           s/(sha\d+)t/$1/;
-           $key => top_file("test",
-                            "recipes/[0-9][0-9]-test_$_.t"); } split(/\s+/, $_);
-
-    plan tests => scalar (keys %foundfiles);
-
-    foreach (sort keys %foundfiles) {
-       my @check = glob($foundfiles{$_});
-       ok(scalar @check, "check that a test for $_ exists")
-           || diag("Expected to find something matching $foundfiles{$_}");
-    }
+foreach my $test (sort @expected_tests) {
+    ok(scalar(grep(/^[0-9][0-9]-test_$test\.t$/, @found_tests)),
+       "check that a test for $test exists")
+       || diag("Expected to find something matching '[0-9][0-9]-test_$test.t'");

 }
 }