[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Mar 10 19:48:46 UTC 2017
The branch master has been updated
via 22cef4e1f1f8f4346cc8b10b3374936c6b33624f (commit)
from d063132737c9064e9f57d041c3849282315ac445 (commit)
- Log -----------------------------------------------------------------
commit 22cef4e1f1f8f4346cc8b10b3374936c6b33624f
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Mar 10 20:18:56 2017 +0100
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 at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2901)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/03-test_internal.t | 35 ----------------------
.../{03-test_ui.t => 03-test_internal_asn1.t} | 8 +++--
.../{03-test_ui.t => 03-test_internal_chacha.t} | 8 +++--
.../{03-test_ui.t => 03-test_internal_mdc2.t} | 3 +-
.../{03-test_ui.t => 03-test_internal_modes.t} | 8 +++--
.../{03-test_ui.t => 03-test_internal_poly1305.t} | 8 +++--
.../{03-test_ui.t => 03-test_internal_siphash.t} | 8 +++--
.../{03-test_ui.t => 03-test_internal_x509.t} | 8 +++--
8 files changed, 37 insertions(+), 49 deletions(-)
delete mode 100644 test/recipes/03-test_internal.t
copy test/recipes/{03-test_ui.t => 03-test_internal_asn1.t} (59%)
copy test/recipes/{03-test_ui.t => 03-test_internal_chacha.t} (58%)
copy test/recipes/{03-test_ui.t => 03-test_internal_mdc2.t} (85%)
copy test/recipes/{03-test_ui.t => 03-test_internal_modes.t} (59%)
copy test/recipes/{03-test_ui.t => 03-test_internal_poly1305.t} (58%)
copy test/recipes/{03-test_ui.t => 03-test_internal_siphash.t} (58%)
copy test/recipes/{03-test_ui.t => 03-test_internal_x509.t} (59%)
diff --git a/test/recipes/03-test_internal.t b/test/recipes/03-test_internal.t
deleted file mode 100644
index 8cd9029..0000000
--- 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_ui.t b/test/recipes/03-test_internal_asn1.t
similarity index 59%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_asn1.t
index cf2f5ac..2db7813 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_asn1.t
@@ -7,7 +7,11 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
+use OpenSSL::Test; # get 'plan'
use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
-simple_test("test_ui", "uitest", "ui");
+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_ui.t b/test/recipes/03-test_internal_chacha.t
similarity index 58%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_chacha.t
index cf2f5ac..642c00a 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_chacha.t
@@ -7,7 +7,11 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
+use OpenSSL::Test; # get 'plan'
use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
-simple_test("test_ui", "uitest", "ui");
+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_ui.t b/test/recipes/03-test_internal_mdc2.t
similarity index 85%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_mdc2.t
index cf2f5ac..dfc0678 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_mdc2.t
@@ -7,7 +7,6 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
use OpenSSL::Test::Simple;
-simple_test("test_ui", "uitest", "ui");
+simple_test("test_internal_mdc2", "mdc2_internal_test", "mdc2");
diff --git a/test/recipes/03-test_ui.t b/test/recipes/03-test_internal_modes.t
similarity index 59%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_modes.t
index cf2f5ac..9f66702 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_modes.t
@@ -7,7 +7,11 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
+use OpenSSL::Test; # get 'plan'
use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
-simple_test("test_ui", "uitest", "ui");
+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_ui.t b/test/recipes/03-test_internal_poly1305.t
similarity index 58%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_poly1305.t
index cf2f5ac..1c88d28 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_poly1305.t
@@ -7,7 +7,11 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
+use OpenSSL::Test; # get 'plan'
use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
-simple_test("test_ui", "uitest", "ui");
+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_ui.t b/test/recipes/03-test_internal_siphash.t
similarity index 58%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_siphash.t
index cf2f5ac..f8569de 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_siphash.t
@@ -7,7 +7,11 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
+use OpenSSL::Test; # get 'plan'
use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
-simple_test("test_ui", "uitest", "ui");
+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_ui.t b/test/recipes/03-test_internal_x509.t
similarity index 59%
copy from test/recipes/03-test_ui.t
copy to test/recipes/03-test_internal_x509.t
index cf2f5ac..2f6402c 100644
--- a/test/recipes/03-test_ui.t
+++ b/test/recipes/03-test_internal_x509.t
@@ -7,7 +7,11 @@
# https://www.openssl.org/source/license.html
use strict;
-use warnings;
+use OpenSSL::Test; # get 'plan'
use OpenSSL::Test::Simple;
+use OpenSSL::Test::Utils;
-simple_test("test_ui", "uitest", "ui");
+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");
More information about the openssl-commits
mailing list