Split test/recipes/03_test_internal.t into individual tests

This allows a finer granularity when selecting which tests to run, and
makes the tests more vidible.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2901)

8 files changed, 114 insertions, 35 deletions

diff --git a/test/recipes/03-test_internal.t b/test/recipes/03-test_internal.t
deleted file mode 100644
index 8cd9029b1b..0000000000
--- a/test/recipes/03-test_internal.t
+++ /dev/null
@@ -1,35 +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 OpenSSL::Test qw/:DEFAULT bldtop_file/;
-use OpenSSL::Test::Utils;
-
-setup("test_internal");
-
-my $shared_windows = $^O eq 'MSWin32' && !disabled("shared");
-
-my %known_internal_tests =
-  ( mdc2_internal_test => !disabled("mdc2"),
-    poly1305_internal_test => !disabled("poly1305") && !$shared_windows,
-    chacha_internal_test => !disabled("chacha") && !$shared_windows,
-    modes_internal_test => !$shared_windows,
-    asn1_internal_test => !$shared_windows,
-    x509_internal_test => !$shared_windows,
-    siphash_internal_test => !disabled("siphash") && !$shared_windows );
-
-plan tests => scalar keys %known_internal_tests;
-
-foreach (keys %known_internal_tests) {
- SKIP:
-    {
-	skip "Skipping $_, it's disabled in this configuration", 1
-	    unless $known_internal_tests{$_};
-	ok(run(test([$_])), "Running $_");
-    }
-}
diff --git a/test/recipes/03-test_internal_asn1.t b/test/recipes/03-test_internal_asn1.t
new file mode 100644
index 0000000000..2db781365a
--- /dev/null
+++ b/test/recipes/03-test_internal_asn1.t
@@ -0,0 +1,17 @@
+#! /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 OpenSSL::Test;              # get 'plan'
+use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
+
+plan skip_all => "This test is unsupported in a shared library build on Windows"
+    if $^O eq 'MSWin32' && !disabled("shared");
+
+simple_test("test_internal_asn1", "asn1_internal_test");
diff --git a/test/recipes/03-test_internal_chacha.t b/test/recipes/03-test_internal_chacha.t
new file mode 100644
index 0000000000..642c00a1ba
--- /dev/null
+++ b/test/recipes/03-test_internal_chacha.t
@@ -0,0 +1,17 @@
+#! /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 OpenSSL::Test;              # get 'plan'
+use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
+
+plan skip_all => "This test is unsupported in a shared library build on Windows"
+    if $^O eq 'MSWin32' && !disabled("shared");
+
+simple_test("test_internal_chacha", "chacha_internal_test", "mdc2");
diff --git a/test/recipes/03-test_internal_mdc2.t b/test/recipes/03-test_internal_mdc2.t
new file mode 100644
index 0000000000..dfc06780de
--- /dev/null
+++ b/test/recipes/03-test_internal_mdc2.t
@@ -0,0 +1,12 @@
+#! /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 OpenSSL::Test::Simple;
+
+simple_test("test_internal_mdc2", "mdc2_internal_test", "mdc2");
diff --git a/test/recipes/03-test_internal_modes.t b/test/recipes/03-test_internal_modes.t
new file mode 100644
index 0000000000..9f66702e49
--- /dev/null
+++ b/test/recipes/03-test_internal_modes.t
@@ -0,0 +1,17 @@
+#! /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 OpenSSL::Test;              # get 'plan'
+use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
+
+plan skip_all => "This test is unsupported in a shared library build on Windows"
+    if $^O eq 'MSWin32' && !disabled("shared");
+
+simple_test("test_internal_modes", "modes_internal_test");
diff --git a/test/recipes/03-test_internal_poly1305.t b/test/recipes/03-test_internal_poly1305.t
new file mode 100644
index 0000000000..1c88d28f11
--- /dev/null
+++ b/test/recipes/03-test_internal_poly1305.t
@@ -0,0 +1,17 @@
+#! /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 OpenSSL::Test;              # get 'plan'
+use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
+
+plan skip_all => "This test is unsupported in a shared library build on Windows"
+    if $^O eq 'MSWin32' && !disabled("shared");
+
+simple_test("test_internal_poly1305", "poly1305_internal_test", "mdc2");
diff --git a/test/recipes/03-test_internal_siphash.t b/test/recipes/03-test_internal_siphash.t
new file mode 100644
index 0000000000..f8569de769
--- /dev/null
+++ b/test/recipes/03-test_internal_siphash.t
@@ -0,0 +1,17 @@
+#! /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 OpenSSL::Test;              # get 'plan'
+use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
+
+plan skip_all => "This test is unsupported in a shared library build on Windows"
+    if $^O eq 'MSWin32' && !disabled("shared");
+
+simple_test("test_internal_siphash", "siphash_internal_test", "mdc2");
diff --git a/test/recipes/03-test_internal_x509.t b/test/recipes/03-test_internal_x509.t
new file mode 100644
index 0000000000..2f6402cac8
--- /dev/null
+++ b/test/recipes/03-test_internal_x509.t
@@ -0,0 +1,17 @@
+#! /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 OpenSSL::Test;              # get 'plan'
+use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
+
+plan skip_all => "This test is unsupported in a shared library build on Windows"
+    if $^O eq 'MSWin32' && !disabled("shared");
+
+simple_test("test_internal_x509", "x509_internal_test");