From 3dd74e21fa04c7d8d7793b25b9a4609625e314cd Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 6 Sep 2021 21:49:34 +0200 Subject: [PATCH] Fix a few tests that fail on VMS In one spot, files aren't properly closed, so the sub-process program that's supposed to read them can't, because it's locked out. In another spot, srctop_file() was used where srctop_dir() should be used to properly format a directory specification. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/16518) (cherry picked from commit 7364545e0734ad25e08d7d5ad0e2c9dac85d2d0d) --- test/recipes/25-test_verify.t | 6 ++++-- test/recipes/30-test_defltfips.t | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t index f7a9f626ca9..bcd823bcfb0 100644 --- a/test/recipes/25-test_verify.t +++ b/test/recipes/25-test_verify.t @@ -461,7 +461,8 @@ SKIP: { skip "Couldn't create certplusrsa.pem", 1 unless ( open $certplusrsa, '>', $certplusrsa_file and copy($cert_file, $certplusrsa) - and copy($rsa_file, $certplusrsa) ); + and copy($rsa_file, $certplusrsa) + and close $certplusrsa ); ok(run(app([ qw(openssl verify -trusted), $certplusrsa_file, $cert_file ])), 'Mixed cert + key file test'); @@ -474,7 +475,8 @@ SKIP: { skip "Couldn't create rsapluscert.pem", 1 unless ( open $rsapluscert, '>', $rsapluscert_file and copy($rsa_file, $rsapluscert) - and copy($cert_file, $rsapluscert) ); + and copy($cert_file, $rsapluscert) + and close $rsapluscert ); ok(run(app([ qw(openssl verify -trusted), $rsapluscert_file, $cert_file ])), 'Mixed key + cert file test'); diff --git a/test/recipes/30-test_defltfips.t b/test/recipes/30-test_defltfips.t index f0338bb3e0b..426bd660d1f 100644 --- a/test/recipes/30-test_defltfips.t +++ b/test/recipes/30-test_defltfips.t @@ -36,7 +36,7 @@ unless ($no_fips) { #Configured to run FIPS but the module-mac is bad $ENV{OPENSSL_CONF} = abs_path(srctop_file("test", "fips.cnf")); - $ENV{OPENSSL_CONF_INCLUDE} = srctop_file("test", "recipes", "30-test_defltfips"); + $ENV{OPENSSL_CONF_INCLUDE} = srctop_dir("test", "recipes", "30-test_defltfips"); ok(run(test(["defltfips_test", "badfips"])), "running defltfips_test badfips"); #Test an alternative way of configuring fips (but still with bad module-mac) -- 2.47.2