Use BIO not FILE for test file

[openssl.git] / test / recipes / 10-test_bn.t

diff --git a/test/recipes/10-test_bn.t b/test/recipes/10-test_bn.t
index e35498d5a1f9bb21d21abfd075563457dcb828c0..f5c3fb14ebb1d9af2e86962d791fe0d69b782aa7 100644 (file)
--- a/test/recipes/10-test_bn.t
+++ b/test/recipes/10-test_bn.t
@@ -16,67 +16,13 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_bn");
 
-plan tests => 3;
-
-require_ok(srctop_file("test","recipes","bc.pl"));
-
-my $testresults = "tmp.bntest";
-my $init = ok(run(test(["bntest"], stdout => $testresults)), 'initialize');
-
- SKIP: {
-     skip "Initializing failed, skipping", 1 if !$init;
-
-     subtest 'Checking the bn results' => sub {
-        my @lines = ();
-        if (open DATA, $testresults) {
-            @lines = <DATA>;
-            close DATA;
-        }
-        map { s/\R//; } @lines;        # chomp(@lines);
-
-        plan tests => scalar grep(/^print /, @lines);
-
-        my $l = "";
-
-        while (scalar @lines) {
-            $l = shift @lines;
-
-            last if $l =~ /^print /;
-        }
-
-        while (1) {
-            $l =~ s/^print "//;
-            $l =~ s/\\n"//;
-            my $t = $l;
-            my @operations = ();
-
-            $l = undef;
-            while (scalar @lines) {
-                $l = shift @lines;
-
-                last if $l =~ /^print /;
-                push @operations, $l;
-                $l = undef;
-            }
-
-            ok(check_operations(@operations), "verify $t");
-
-            last unless $l;
-        }
-     };
-}
-
-sub check_operations {
-    my $failcount = 0;
-
-    foreach my $line (@_) {
-       my $result = calc(split /\s+/, $line);
-
-       if ($result ne "0" && $result ne "0x0") {
-           $failcount++;
-           print STDERR "Failed! $line => $result\n";
-       }
-    }
-
-    return $failcount == 0;
+my @files = (
+    "bnexp.txt", "bnmod.txt", "bnmul.txt", "bnshift.txt", "bnsum.txt"
+    );
+plan tests => 1 + scalar(@files);
+
+foreach my $f ( @files ) {
+    ok(run(test(["bntest", srctop_file("test", $f)])),
+        "running bntest $f");
 }
+ok(run(test(["bntest"])), "running bntest");