The branch master has been updated via 777ae7c4eea9e517cfacddb92c37c481ad500747 (commit) via c9f6be4ead3ddc5044c1c0430b4d0335301f202b (commit) via 17979f55267e67fe4fcafd02c92c8c27af7e65f0 (commit) via 6ff42117815bdba9e84b049e4da3455a5baa7b85 (commit) via 7f990b0ee3abbb94bdb929d38435cce5332f5601 (commit) from da9a22bb579821d0ababac7319c2f2995e66e4d3 (commit)
- Log ----------------------------------------------------------------- commit 777ae7c4eea9e517cfacddb92c37c481ad500747 Author: Richard Levitte <levi...@openssl.org> Date: Sun Sep 20 02:15:49 2015 +0200 Simplify Simple.pm further, and make it more verbose Reviewed-by: Stephen Henson <st...@openssl.org> commit c9f6be4ead3ddc5044c1c0430b4d0335301f202b Author: Richard Levitte <levi...@openssl.org> Date: Sun Sep 20 02:05:35 2015 +0200 Correct srp test There actually is a "srp" feature to check the availability on Reviewed-by: Stephen Henson <st...@openssl.org> commit 17979f55267e67fe4fcafd02c92c8c27af7e65f0 Author: Richard Levitte <levi...@openssl.org> Date: Sun Sep 20 02:04:47 2015 +0200 Correct jpake test There actually is a "jpake" feature to check the availability on Reviewed-by: Stephen Henson <st...@openssl.org> commit 6ff42117815bdba9e84b049e4da3455a5baa7b85 Author: Richard Levitte <levi...@openssl.org> Date: Sun Sep 20 02:03:19 2015 +0200 Correct sha tests These tests were checking for specific sha variants, when they should just check if "sha" is disabled. Reviewed-by: Stephen Henson <st...@openssl.org> commit 7f990b0ee3abbb94bdb929d38435cce5332f5601 Author: Richard Levitte <levi...@openssl.org> Date: Sun Sep 20 00:34:16 2015 +0200 Correct whirlpool test It depended on 'openssl no-wp', which always exited with code 0, so this test would never be performed, and this, I never discovered that the program it's supposed to run was misspellt. Furthermore, the feature to check is 'whirlpool', not 'wp'. All corrected. Reviewed-by: Stephen Henson <st...@openssl.org> ----------------------------------------------------------------------- Summary of changes: test/recipes/05-test_sha1.t | 2 +- test/recipes/05-test_sha256.t | 2 +- test/recipes/05-test_sha512.t | 2 +- test/recipes/05-test_wp.t | 2 +- test/recipes/90-test_jpake.t | 2 +- test/recipes/90-test_srp.t | 2 +- test/testlib/OpenSSL/Test/Simple.pm | 9 ++++----- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/test/recipes/05-test_sha1.t b/test/recipes/05-test_sha1.t index 9f8a570..310022e 100644 --- a/test/recipes/05-test_sha1.t +++ b/test/recipes/05-test_sha1.t @@ -2,4 +2,4 @@ use OpenSSL::Test::Simple; -simple_test("test_sha1", "sha1test", "sha1"); +simple_test("test_sha1", "sha1test", "sha"); diff --git a/test/recipes/05-test_sha256.t b/test/recipes/05-test_sha256.t index cb63aa8..02058c7 100644 --- a/test/recipes/05-test_sha256.t +++ b/test/recipes/05-test_sha256.t @@ -2,4 +2,4 @@ use OpenSSL::Test::Simple; -simple_test("test_sha256", "sha256t", "sha256"); +simple_test("test_sha256", "sha256t", "sha"); diff --git a/test/recipes/05-test_sha512.t b/test/recipes/05-test_sha512.t index f353ac1..6522ddd 100644 --- a/test/recipes/05-test_sha512.t +++ b/test/recipes/05-test_sha512.t @@ -2,4 +2,4 @@ use OpenSSL::Test::Simple; -simple_test("test_sha512", "sha512t", "sha512"); +simple_test("test_sha512", "sha512t", "sha"); diff --git a/test/recipes/05-test_wp.t b/test/recipes/05-test_wp.t index c05be9c..e745f23 100644 --- a/test/recipes/05-test_wp.t +++ b/test/recipes/05-test_wp.t @@ -2,4 +2,4 @@ use OpenSSL::Test::Simple; -simple_test("test_wp", "wptest", "wp"); +simple_test("test_wp", "wp_test", "whirlpool"); diff --git a/test/recipes/90-test_jpake.t b/test/recipes/90-test_jpake.t index fa1292a..519bf1e 100644 --- a/test/recipes/90-test_jpake.t +++ b/test/recipes/90-test_jpake.t @@ -2,4 +2,4 @@ use OpenSSL::Test::Simple; -simple_test("test_jpake", "jpaketest"); +simple_test("test_jpake", "jpaketest", "jpake"); diff --git a/test/recipes/90-test_srp.t b/test/recipes/90-test_srp.t index 6be2c39..9110319 100644 --- a/test/recipes/90-test_srp.t +++ b/test/recipes/90-test_srp.t @@ -2,4 +2,4 @@ use OpenSSL::Test::Simple; -simple_test("test_srp", "srptest"); +simple_test("test_srp", "srptest", "srp"); diff --git a/test/testlib/OpenSSL/Test/Simple.pm b/test/testlib/OpenSSL/Test/Simple.pm index 0637e3d..dfae026 100644 --- a/test/testlib/OpenSSL/Test/Simple.pm +++ b/test/testlib/OpenSSL/Test/Simple.pm @@ -56,13 +56,12 @@ sub simple_test { setup($name); + plan skip_all => "$algo is not supported by this OpenSSL build" + if $algo && disabled($algo); + plan tests => 1; - SKIP: { - skip "$algo is not supported by this OpenSSL build, skipping this test...", 1 - if $algo && disabled($algo); - ok(run(test([$prgr])), "running $prgr"); - } + ok(run(test([$prgr])), "running $prgr"); } =head1 SEE ALSO _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits