Make 25-test_gen.t and 25-test_req.t into one

Since one generates files that the other depends on, there's no
real reason to keep them separate.  Since they were both different
aspects of 'openssl req', the merge ends up in 25-test_req.t.

This also makes cleanup easier.

Reviewed-by: Rich Salz <rsalz@openssl.org>

2 files changed, 30 insertions, 55 deletions

diff --git a/test/recipes/25-test_gen.t b/test/recipes/25-test_gen.t
deleted file mode 100644
index 6eac7cab49..0000000000
--- a/test/recipes/25-test_gen.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /usr/bin/env perl
-# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
-#
-# Licensed under the OpenSSL license (the "License").  You may not use
-# this file except in compliance with the License.  You can obtain a copy
-# in the file LICENSE in the source distribution or at
-# https://www.openssl.org/source/license.html
-
-
-use strict;
-use warnings;
-
-use File::Spec;
-use OpenSSL::Test qw/:DEFAULT srctop_file/;
-use OpenSSL::Test::Utils;
-
-setup("test_gen");
-
-plan tests => 1;
-
-my $T = "testcert";
-my $KEY = 512;
-my $CA = srctop_file("certs", "testca.pem");
-
-unlink "$T.1", "$T.2", "$T.key";
-open RND, ">>", ".rnd";
-print RND "string to make the random number generator think it has entropy";
-close RND;
-
-subtest "generating certificate requests" => sub {
-    my @req_new;
-    if (disabled("rsa")) {
-	@req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
-    } else {
-	@req_new = ("-new");
-	note("There should be a 2 sequences of .'s and some +'s.");
-	note("There should not be more that at most 80 per line");
-    }
-
-    unlink "testkey.pem", "testreq.pem";
-
-    plan tests => 2;
-
-    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
-		@req_new, "-out", "testreq.pem"])),
-       "Generating request");
-
-    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
-		"-verify", "-in", "testreq.pem", "-noout"])),
-       "Verifying signature on request");
-};
diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index d5eb29b6cb..bcc10257d4 100644
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -10,21 +10,47 @@
 use strict;
 use warnings;
 
-use File::Spec;
+use OpenSSL::Test::Utils;
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_req");
 
-plan tests => 3;
+plan tests => 4;
 
 require_ok(srctop_file('test','recipes','tconversion.pl'));
 
+open RND, ">>", ".rnd";
+print RND "string to make the random number generator think it has entropy";
+close RND;
+subtest "generating certificate requests" => sub {
+    my @req_new;
+    if (disabled("rsa")) {
+	@req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
+    } else {
+	@req_new = ("-new");
+	note("There should be a 2 sequences of .'s and some +'s.");
+	note("There should not be more that at most 80 per line");
+    }
+
+    plan tests => 2;
+
+    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
+		@req_new, "-out", "testreq.pem"])),
+       "Generating request");
+
+    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
+		"-verify", "-in", "testreq.pem", "-noout"])),
+       "Verifying signature on request");
+};
+
 my @openssl_args = ("req", "-config", srctop_file("apps", "openssl.cnf"));
 
 run_conversion('req conversions',
 	       "testreq.pem");
 run_conversion('req conversions -- testreq2',
-	       "testreq2.pem");
+	       srctop_file("test", "testreq2.pem"));
+
+unlink "testkey.pem", "testreq.pem";
 
 sub run_conversion {
     my $title = shift;
@@ -40,7 +66,7 @@ sub run_conversion {
 	  plan skip_all => "skipping req conversion test for $reqfile"
 	      if grep /Unknown Public Key/, map { s/\R//; } <DATA>;
 
-	  tconversion("req", "testreq.pem", @openssl_args);
+	  tconversion("req", $reqfile, @openssl_args);
 	}
 	close DATA;
 	unlink "req-check.err";