The branch master has been updated via 53eecb5de5e97fe436a1ccaff8bad5aaa8fb3edc (commit) from bf5b37cedf373a6fde496e1f7bb0a63db29a6cd2 (commit)
- Log ----------------------------------------------------------------- commit 53eecb5de5e97fe436a1ccaff8bad5aaa8fb3edc Author: Richard Levitte <levi...@openssl.org> Date: Wed Mar 10 22:24:11 2021 +0100 TEST: Cleanup test recipes Name mixups cleared, and a few more test case result files that arent't removed, making forensics on failed tests easier. Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14505) ----------------------------------------------------------------------- Summary of changes: test/recipes/02-test_internal_keymgmt.t | 2 +- test/recipes/{04-test_pem.t => 04-test_pem_reading.t} | 0 .../NOTES.txt | 0 .../beermug.pem | 0 .../cert-1023line.pem | 0 .../cert-1024line.pem | 0 .../cert-1025line.pem | 0 .../cert-254-chars-at-the-end.pem | 0 .../cert-254-chars-in-the-middle.pem | 0 .../cert-255line.pem | 0 .../cert-256line.pem | 0 .../cert-257line.pem | 0 .../cert-blankline.pem | 0 .../cert-bom.pem | 0 .../cert-comment.pem | 0 .../cert-earlypad.pem | 0 .../cert-extrapad.pem | 0 .../cert-infixwhitespace.pem | 0 .../cert-junk.pem | 0 .../cert-leadingwhitespace.pem | 0 .../cert-longline.pem | 0 .../cert-misalignedpad.pem | 0 .../cert-onecolumn.pem | 0 .../cert-oneline-multiple-of-254.pem | 0 .../cert-oneline.pem | 0 .../cert-shortandlongline.pem | 0 .../cert-shortline.pem | 0 .../cert-threecolumn.pem | 0 .../cert-trailingwhitespace.pem | 0 .../{04-test_pem_data => 04-test_pem_reading_data}/cert.pem | 0 .../{04-test_pem_data => 04-test_pem_reading_data}/csr.pem | 0 .../dsa-1023line.pem | 0 .../dsa-1024line.pem | 0 .../dsa-1025line.pem | 0 .../dsa-255line.pem | 0 .../dsa-256line.pem | 0 .../dsa-257line.pem | 0 .../dsa-blankline.pem | 0 .../dsa-comment.pem | 0 .../dsa-corruptedheader.pem | 0 .../dsa-corruptiv.pem | 0 .../dsa-earlypad.pem | 0 .../dsa-extrapad.pem | 0 .../dsa-infixwhitespace.pem | 0 .../dsa-junk.pem | 0 .../dsa-leadingwhitespace.pem | 0 .../dsa-longline.pem | 0 .../dsa-misalignedpad.pem | 0 .../dsa-onecolumn.pem | 0 .../dsa-oneline.pem | 0 .../dsa-onelineheader.pem | 0 .../dsa-shortandlongline.pem | 0 .../dsa-shortline.pem | 0 .../dsa-threecolumn.pem | 0 .../dsa-trailingwhitespace.pem | 0 .../{04-test_pem_data => 04-test_pem_reading_data}/dsa.pem | 0 .../dsaparam.pem | 0 .../{04-test_pem_data => 04-test_pem_reading_data}/key.pem | 0 .../wellknown | 0 test/recipes/{06-test-rdrand.t => 06-test_rdrand_sanity.t} | 0 test/recipes/20-test_mac.t | 3 +-- test/recipes/25-test_eai_data.t | 13 +++++++++---- test/recipes/65-test_cmp_hdr.t | 2 +- test/recipes/65-test_cmp_status.t | 2 +- test/recipes/70-test_sslvertol.t | 2 +- test/recipes/71-test_ssl_ctx.t | 2 +- test/recipes/90-test_tls13encryption.t | 2 +- test/recipes/90-test_tls13secrets.t | 2 +- test/recipes/95-test_external_gost_engine.t | 2 +- test/recipes/95-test_external_pyca.t | 2 +- 70 files changed, 19 insertions(+), 15 deletions(-) rename test/recipes/{04-test_pem.t => 04-test_pem_reading.t} (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/NOTES.txt (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/beermug.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-1023line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-1024line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-1025line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-254-chars-at-the-end.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-254-chars-in-the-middle.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-255line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-256line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-257line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-blankline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-bom.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-comment.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-earlypad.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-extrapad.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-infixwhitespace.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-junk.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-leadingwhitespace.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-longline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-misalignedpad.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-onecolumn.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-oneline-multiple-of-254.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-oneline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-shortandlongline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-shortline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-threecolumn.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert-trailingwhitespace.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/cert.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/csr.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-1023line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-1024line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-1025line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-255line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-256line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-257line.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-blankline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-comment.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-corruptedheader.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-corruptiv.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-earlypad.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-extrapad.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-infixwhitespace.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-junk.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-leadingwhitespace.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-longline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-misalignedpad.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-onecolumn.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-oneline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-onelineheader.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-shortandlongline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-shortline.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-threecolumn.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa-trailingwhitespace.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsa.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/dsaparam.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/key.pem (100%) rename test/recipes/{04-test_pem_data => 04-test_pem_reading_data}/wellknown (100%) rename test/recipes/{06-test-rdrand.t => 06-test_rdrand_sanity.t} (100%) diff --git a/test/recipes/02-test_internal_keymgmt.t b/test/recipes/02-test_internal_keymgmt.t index f7b2eb3f1c..2f78ed5ae4 100644 --- a/test/recipes/02-test_internal_keymgmt.t +++ b/test/recipes/02-test_internal_keymgmt.t @@ -11,7 +11,7 @@ use OpenSSL::Test qw(:DEFAULT bldtop_dir); use OpenSSL::Test::Simple; use OpenSSL::Test::Utils; -setup("test_internal_provider"); +setup("test_internal_keymgmt"); $ENV{OPENSSL_MODULES} = bldtop_dir("test"); diff --git a/test/recipes/04-test_pem.t b/test/recipes/04-test_pem_reading.t similarity index 100% rename from test/recipes/04-test_pem.t rename to test/recipes/04-test_pem_reading.t diff --git a/test/recipes/04-test_pem_data/NOTES.txt b/test/recipes/04-test_pem_reading_data/NOTES.txt similarity index 100% rename from test/recipes/04-test_pem_data/NOTES.txt rename to test/recipes/04-test_pem_reading_data/NOTES.txt diff --git a/test/recipes/04-test_pem_data/beermug.pem b/test/recipes/04-test_pem_reading_data/beermug.pem similarity index 100% rename from test/recipes/04-test_pem_data/beermug.pem rename to test/recipes/04-test_pem_reading_data/beermug.pem diff --git a/test/recipes/04-test_pem_data/cert-1023line.pem b/test/recipes/04-test_pem_reading_data/cert-1023line.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-1023line.pem rename to test/recipes/04-test_pem_reading_data/cert-1023line.pem diff --git a/test/recipes/04-test_pem_data/cert-1024line.pem b/test/recipes/04-test_pem_reading_data/cert-1024line.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-1024line.pem rename to test/recipes/04-test_pem_reading_data/cert-1024line.pem diff --git a/test/recipes/04-test_pem_data/cert-1025line.pem b/test/recipes/04-test_pem_reading_data/cert-1025line.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-1025line.pem rename to test/recipes/04-test_pem_reading_data/cert-1025line.pem diff --git a/test/recipes/04-test_pem_data/cert-254-chars-at-the-end.pem b/test/recipes/04-test_pem_reading_data/cert-254-chars-at-the-end.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-254-chars-at-the-end.pem rename to test/recipes/04-test_pem_reading_data/cert-254-chars-at-the-end.pem diff --git a/test/recipes/04-test_pem_data/cert-254-chars-in-the-middle.pem b/test/recipes/04-test_pem_reading_data/cert-254-chars-in-the-middle.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-254-chars-in-the-middle.pem rename to test/recipes/04-test_pem_reading_data/cert-254-chars-in-the-middle.pem diff --git a/test/recipes/04-test_pem_data/cert-255line.pem b/test/recipes/04-test_pem_reading_data/cert-255line.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-255line.pem rename to test/recipes/04-test_pem_reading_data/cert-255line.pem diff --git a/test/recipes/04-test_pem_data/cert-256line.pem b/test/recipes/04-test_pem_reading_data/cert-256line.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-256line.pem rename to test/recipes/04-test_pem_reading_data/cert-256line.pem diff --git a/test/recipes/04-test_pem_data/cert-257line.pem b/test/recipes/04-test_pem_reading_data/cert-257line.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-257line.pem rename to test/recipes/04-test_pem_reading_data/cert-257line.pem diff --git a/test/recipes/04-test_pem_data/cert-blankline.pem b/test/recipes/04-test_pem_reading_data/cert-blankline.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-blankline.pem rename to test/recipes/04-test_pem_reading_data/cert-blankline.pem diff --git a/test/recipes/04-test_pem_data/cert-bom.pem b/test/recipes/04-test_pem_reading_data/cert-bom.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-bom.pem rename to test/recipes/04-test_pem_reading_data/cert-bom.pem diff --git a/test/recipes/04-test_pem_data/cert-comment.pem b/test/recipes/04-test_pem_reading_data/cert-comment.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-comment.pem rename to test/recipes/04-test_pem_reading_data/cert-comment.pem diff --git a/test/recipes/04-test_pem_data/cert-earlypad.pem b/test/recipes/04-test_pem_reading_data/cert-earlypad.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-earlypad.pem rename to test/recipes/04-test_pem_reading_data/cert-earlypad.pem diff --git a/test/recipes/04-test_pem_data/cert-extrapad.pem b/test/recipes/04-test_pem_reading_data/cert-extrapad.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-extrapad.pem rename to test/recipes/04-test_pem_reading_data/cert-extrapad.pem diff --git a/test/recipes/04-test_pem_data/cert-infixwhitespace.pem b/test/recipes/04-test_pem_reading_data/cert-infixwhitespace.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-infixwhitespace.pem rename to test/recipes/04-test_pem_reading_data/cert-infixwhitespace.pem diff --git a/test/recipes/04-test_pem_data/cert-junk.pem b/test/recipes/04-test_pem_reading_data/cert-junk.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-junk.pem rename to test/recipes/04-test_pem_reading_data/cert-junk.pem diff --git a/test/recipes/04-test_pem_data/cert-leadingwhitespace.pem b/test/recipes/04-test_pem_reading_data/cert-leadingwhitespace.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-leadingwhitespace.pem rename to test/recipes/04-test_pem_reading_data/cert-leadingwhitespace.pem diff --git a/test/recipes/04-test_pem_data/cert-longline.pem b/test/recipes/04-test_pem_reading_data/cert-longline.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-longline.pem rename to test/recipes/04-test_pem_reading_data/cert-longline.pem diff --git a/test/recipes/04-test_pem_data/cert-misalignedpad.pem b/test/recipes/04-test_pem_reading_data/cert-misalignedpad.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-misalignedpad.pem rename to test/recipes/04-test_pem_reading_data/cert-misalignedpad.pem diff --git a/test/recipes/04-test_pem_data/cert-onecolumn.pem b/test/recipes/04-test_pem_reading_data/cert-onecolumn.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-onecolumn.pem rename to test/recipes/04-test_pem_reading_data/cert-onecolumn.pem diff --git a/test/recipes/04-test_pem_data/cert-oneline-multiple-of-254.pem b/test/recipes/04-test_pem_reading_data/cert-oneline-multiple-of-254.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-oneline-multiple-of-254.pem rename to test/recipes/04-test_pem_reading_data/cert-oneline-multiple-of-254.pem diff --git a/test/recipes/04-test_pem_data/cert-oneline.pem b/test/recipes/04-test_pem_reading_data/cert-oneline.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-oneline.pem rename to test/recipes/04-test_pem_reading_data/cert-oneline.pem diff --git a/test/recipes/04-test_pem_data/cert-shortandlongline.pem b/test/recipes/04-test_pem_reading_data/cert-shortandlongline.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-shortandlongline.pem rename to test/recipes/04-test_pem_reading_data/cert-shortandlongline.pem diff --git a/test/recipes/04-test_pem_data/cert-shortline.pem b/test/recipes/04-test_pem_reading_data/cert-shortline.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-shortline.pem rename to test/recipes/04-test_pem_reading_data/cert-shortline.pem diff --git a/test/recipes/04-test_pem_data/cert-threecolumn.pem b/test/recipes/04-test_pem_reading_data/cert-threecolumn.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-threecolumn.pem rename to test/recipes/04-test_pem_reading_data/cert-threecolumn.pem diff --git a/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem b/test/recipes/04-test_pem_reading_data/cert-trailingwhitespace.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert-trailingwhitespace.pem rename to test/recipes/04-test_pem_reading_data/cert-trailingwhitespace.pem diff --git a/test/recipes/04-test_pem_data/cert.pem b/test/recipes/04-test_pem_reading_data/cert.pem similarity index 100% rename from test/recipes/04-test_pem_data/cert.pem rename to test/recipes/04-test_pem_reading_data/cert.pem diff --git a/test/recipes/04-test_pem_data/csr.pem b/test/recipes/04-test_pem_reading_data/csr.pem similarity index 100% rename from test/recipes/04-test_pem_data/csr.pem rename to test/recipes/04-test_pem_reading_data/csr.pem diff --git a/test/recipes/04-test_pem_data/dsa-1023line.pem b/test/recipes/04-test_pem_reading_data/dsa-1023line.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-1023line.pem rename to test/recipes/04-test_pem_reading_data/dsa-1023line.pem diff --git a/test/recipes/04-test_pem_data/dsa-1024line.pem b/test/recipes/04-test_pem_reading_data/dsa-1024line.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-1024line.pem rename to test/recipes/04-test_pem_reading_data/dsa-1024line.pem diff --git a/test/recipes/04-test_pem_data/dsa-1025line.pem b/test/recipes/04-test_pem_reading_data/dsa-1025line.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-1025line.pem rename to test/recipes/04-test_pem_reading_data/dsa-1025line.pem diff --git a/test/recipes/04-test_pem_data/dsa-255line.pem b/test/recipes/04-test_pem_reading_data/dsa-255line.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-255line.pem rename to test/recipes/04-test_pem_reading_data/dsa-255line.pem diff --git a/test/recipes/04-test_pem_data/dsa-256line.pem b/test/recipes/04-test_pem_reading_data/dsa-256line.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-256line.pem rename to test/recipes/04-test_pem_reading_data/dsa-256line.pem diff --git a/test/recipes/04-test_pem_data/dsa-257line.pem b/test/recipes/04-test_pem_reading_data/dsa-257line.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-257line.pem rename to test/recipes/04-test_pem_reading_data/dsa-257line.pem diff --git a/test/recipes/04-test_pem_data/dsa-blankline.pem b/test/recipes/04-test_pem_reading_data/dsa-blankline.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-blankline.pem rename to test/recipes/04-test_pem_reading_data/dsa-blankline.pem diff --git a/test/recipes/04-test_pem_data/dsa-comment.pem b/test/recipes/04-test_pem_reading_data/dsa-comment.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-comment.pem rename to test/recipes/04-test_pem_reading_data/dsa-comment.pem diff --git a/test/recipes/04-test_pem_data/dsa-corruptedheader.pem b/test/recipes/04-test_pem_reading_data/dsa-corruptedheader.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-corruptedheader.pem rename to test/recipes/04-test_pem_reading_data/dsa-corruptedheader.pem diff --git a/test/recipes/04-test_pem_data/dsa-corruptiv.pem b/test/recipes/04-test_pem_reading_data/dsa-corruptiv.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-corruptiv.pem rename to test/recipes/04-test_pem_reading_data/dsa-corruptiv.pem diff --git a/test/recipes/04-test_pem_data/dsa-earlypad.pem b/test/recipes/04-test_pem_reading_data/dsa-earlypad.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-earlypad.pem rename to test/recipes/04-test_pem_reading_data/dsa-earlypad.pem diff --git a/test/recipes/04-test_pem_data/dsa-extrapad.pem b/test/recipes/04-test_pem_reading_data/dsa-extrapad.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-extrapad.pem rename to test/recipes/04-test_pem_reading_data/dsa-extrapad.pem diff --git a/test/recipes/04-test_pem_data/dsa-infixwhitespace.pem b/test/recipes/04-test_pem_reading_data/dsa-infixwhitespace.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-infixwhitespace.pem rename to test/recipes/04-test_pem_reading_data/dsa-infixwhitespace.pem diff --git a/test/recipes/04-test_pem_data/dsa-junk.pem b/test/recipes/04-test_pem_reading_data/dsa-junk.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-junk.pem rename to test/recipes/04-test_pem_reading_data/dsa-junk.pem diff --git a/test/recipes/04-test_pem_data/dsa-leadingwhitespace.pem b/test/recipes/04-test_pem_reading_data/dsa-leadingwhitespace.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-leadingwhitespace.pem rename to test/recipes/04-test_pem_reading_data/dsa-leadingwhitespace.pem diff --git a/test/recipes/04-test_pem_data/dsa-longline.pem b/test/recipes/04-test_pem_reading_data/dsa-longline.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-longline.pem rename to test/recipes/04-test_pem_reading_data/dsa-longline.pem diff --git a/test/recipes/04-test_pem_data/dsa-misalignedpad.pem b/test/recipes/04-test_pem_reading_data/dsa-misalignedpad.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-misalignedpad.pem rename to test/recipes/04-test_pem_reading_data/dsa-misalignedpad.pem diff --git a/test/recipes/04-test_pem_data/dsa-onecolumn.pem b/test/recipes/04-test_pem_reading_data/dsa-onecolumn.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-onecolumn.pem rename to test/recipes/04-test_pem_reading_data/dsa-onecolumn.pem diff --git a/test/recipes/04-test_pem_data/dsa-oneline.pem b/test/recipes/04-test_pem_reading_data/dsa-oneline.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-oneline.pem rename to test/recipes/04-test_pem_reading_data/dsa-oneline.pem diff --git a/test/recipes/04-test_pem_data/dsa-onelineheader.pem b/test/recipes/04-test_pem_reading_data/dsa-onelineheader.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-onelineheader.pem rename to test/recipes/04-test_pem_reading_data/dsa-onelineheader.pem diff --git a/test/recipes/04-test_pem_data/dsa-shortandlongline.pem b/test/recipes/04-test_pem_reading_data/dsa-shortandlongline.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-shortandlongline.pem rename to test/recipes/04-test_pem_reading_data/dsa-shortandlongline.pem diff --git a/test/recipes/04-test_pem_data/dsa-shortline.pem b/test/recipes/04-test_pem_reading_data/dsa-shortline.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-shortline.pem rename to test/recipes/04-test_pem_reading_data/dsa-shortline.pem diff --git a/test/recipes/04-test_pem_data/dsa-threecolumn.pem b/test/recipes/04-test_pem_reading_data/dsa-threecolumn.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-threecolumn.pem rename to test/recipes/04-test_pem_reading_data/dsa-threecolumn.pem diff --git a/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem b/test/recipes/04-test_pem_reading_data/dsa-trailingwhitespace.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem rename to test/recipes/04-test_pem_reading_data/dsa-trailingwhitespace.pem diff --git a/test/recipes/04-test_pem_data/dsa.pem b/test/recipes/04-test_pem_reading_data/dsa.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsa.pem rename to test/recipes/04-test_pem_reading_data/dsa.pem diff --git a/test/recipes/04-test_pem_data/dsaparam.pem b/test/recipes/04-test_pem_reading_data/dsaparam.pem similarity index 100% rename from test/recipes/04-test_pem_data/dsaparam.pem rename to test/recipes/04-test_pem_reading_data/dsaparam.pem diff --git a/test/recipes/04-test_pem_data/key.pem b/test/recipes/04-test_pem_reading_data/key.pem similarity index 100% rename from test/recipes/04-test_pem_data/key.pem rename to test/recipes/04-test_pem_reading_data/key.pem diff --git a/test/recipes/04-test_pem_data/wellknown b/test/recipes/04-test_pem_reading_data/wellknown similarity index 100% rename from test/recipes/04-test_pem_data/wellknown rename to test/recipes/04-test_pem_reading_data/wellknown diff --git a/test/recipes/06-test-rdrand.t b/test/recipes/06-test_rdrand_sanity.t similarity index 100% rename from test/recipes/06-test-rdrand.t rename to test/recipes/06-test_rdrand_sanity.t diff --git a/test/recipes/20-test_mac.t b/test/recipes/20-test_mac.t index b6a8078763..ee5f77d361 100644 --- a/test/recipes/20-test_mac.t +++ b/test/recipes/20-test_mac.t @@ -190,10 +190,9 @@ sub comparefile { my $buffer; my $BUFSIZE = 1024; read($out, $buffer, $BUFSIZE) or die "unable to read"; - # Not unlinking $outfile - my $line = uc unpack("H*", $buffer); close($out); + # Not unlinking $outfile if ($line eq $expect) { return 1; diff --git a/test/recipes/25-test_eai_data.t b/test/recipes/25-test_eai_data.t index 9b42229e94..a314538e85 100644 --- a/test/recipes/25-test_eai_data.t +++ b/test/recipes/25-test_eai_data.t @@ -32,16 +32,21 @@ my $utf8_pem = srctop_file($folder, "utf8_leaf.pem"); my $ascii_chain_pem = srctop_file($folder, "ascii_chain.pem"); my $utf8_chain_pem = srctop_file($folder, "utf8_chain.pem"); -my $out = "san.tmp"; - +my $out; +my $outcnt = 0; +sub outname { + $outcnt++; + return "sanout-$outcnt.tmp"; +} + +$out = outname(); ok(run(app(["openssl", "x509", "-ext", "subjectAltName", "-in", $ascii_pem, "-noout", "-out", $out]))); is(cmp_text($out, srctop_file($folder, "san.ascii")), 0, 'Comparing othername for ASCII domain'); +$out = outname(); ok(run(app(["openssl", "x509", "-ext", "subjectAltName", "-in", $utf8_pem, "-noout", "-out", $out]))); is(cmp_text($out, srctop_file($folder, "san.utf8")), 0, 'Comparing othername for IDN domain'); -unlink $out; - ok(run(app(["openssl", "verify", "-nameopt", "utf8", "-no_check_time", "-verify_email", "学生\@elementary.school.example.com", "-CAfile", $ascii_chain_pem, $ascii_pem]))); ok(run(app(["openssl", "verify", "-nameopt", "utf8", "-no_check_time", "-verify_email", "医生\@大学.example.com", "-CAfile", $utf8_chain_pem, $utf8_pem]))); diff --git a/test/recipes/65-test_cmp_hdr.t b/test/recipes/65-test_cmp_hdr.t index e013a6d820..9acb784d7e 100644 --- a/test/recipes/65-test_cmp_hdr.t +++ b/test/recipes/65-test_cmp_hdr.t @@ -12,7 +12,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT data_file/; use OpenSSL::Test::Utils; -setup("test_cmp_lib"); +setup("test_cmp_hdr"); plan skip_all => "This test is not supported in a no-cmp build" if disabled("cmp"); diff --git a/test/recipes/65-test_cmp_status.t b/test/recipes/65-test_cmp_status.t index 6a0a0c06b6..23f833f695 100644 --- a/test/recipes/65-test_cmp_status.t +++ b/test/recipes/65-test_cmp_status.t @@ -12,7 +12,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT data_file/; use OpenSSL::Test::Utils; -setup("test_cmp_lib"); +setup("test_cmp_status"); plan skip_all => "This test is not supported in a no-cmp build" if disabled("cmp"); diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index 775cf6df67..b254597c31 100644 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -11,7 +11,7 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/; use OpenSSL::Test::Utils; use TLSProxy::Proxy; -my $test_name = "test_sslextension"; +my $test_name = "test_sslvertol"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" diff --git a/test/recipes/71-test_ssl_ctx.t b/test/recipes/71-test_ssl_ctx.t index 6d5fc7a338..a9af0ac078 100644 --- a/test/recipes/71-test_ssl_ctx.t +++ b/test/recipes/71-test_ssl_ctx.t @@ -10,7 +10,7 @@ use strict; use warnings; use OpenSSL::Test; -setup("ssl_ctx_test"); +setup("test_ssl_ctx"); plan tests => 1; ok(run(test(["ssl_ctx_test"]))); diff --git a/test/recipes/90-test_tls13encryption.t b/test/recipes/90-test_tls13encryption.t index 7e4037e508..06b33229d4 100644 --- a/test/recipes/90-test_tls13encryption.t +++ b/test/recipes/90-test_tls13encryption.t @@ -9,7 +9,7 @@ use OpenSSL::Test; use OpenSSL::Test::Utils; -my $test_name = "tls13encryption"; +my $test_name = "test_tls13encryption"; setup($test_name); plan skip_all => "$test_name is not supported in this build" diff --git a/test/recipes/90-test_tls13secrets.t b/test/recipes/90-test_tls13secrets.t index 0adef9a9f5..72bb60fdb1 100644 --- a/test/recipes/90-test_tls13secrets.t +++ b/test/recipes/90-test_tls13secrets.t @@ -9,7 +9,7 @@ use OpenSSL::Test; use OpenSSL::Test::Utils; -my $test_name = "tls13secrets"; +my $test_name = "test_tls13secrets"; setup($test_name); plan skip_all => "$test_name is not supported in this build" diff --git a/test/recipes/95-test_external_gost_engine.t b/test/recipes/95-test_external_gost_engine.t index 204f78a928..07097d3ef9 100644 --- a/test/recipes/95-test_external_gost_engine.t +++ b/test/recipes/95-test_external_gost_engine.t @@ -11,7 +11,7 @@ use OpenSSL::Test; use OpenSSL::Test::Utils; use OpenSSL::Test qw/:DEFAULT bldtop_file data_file srctop_file cmdstr/; -setup("test_external"); +setup("test_external_gost_engine"); plan skip_all => "No external tests in this configuration" if disabled("external-tests"); diff --git a/test/recipes/95-test_external_pyca.t b/test/recipes/95-test_external_pyca.t index 1eae23557f..5460d4987e 100644 --- a/test/recipes/95-test_external_pyca.t +++ b/test/recipes/95-test_external_pyca.t @@ -11,7 +11,7 @@ use OpenSSL::Test; use OpenSSL::Test::Utils; use OpenSSL::Test qw/:DEFAULT bldtop_file data_file srctop_file cmdstr/; -setup("test_external"); +setup("test_external_pyca"); plan skip_all => "No external tests in this configuration" if disabled("external-tests");