Skip to content

Commit

Permalink
Update modulepath test for provider config to skip if not present
Browse files Browse the repository at this point in the history
If the p_test.so library isn't present, don't run the test

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>

(cherry picked from commit b80fed3)

(Merged from #24198)

(cherry picked from commit 83c6499)
  • Loading branch information
nhorman authored and t8m committed Apr 26, 2024
1 parent 74f551e commit f663322
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions test/prov_config_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* https://www.openssl.org/source/license.html
*/

#include <sys/stat.h>
#include <openssl/evp.h>
#include <openssl/conf.h>
#include "testutil.h"
Expand Down Expand Up @@ -71,15 +72,20 @@ static int test_recursive_config(void)
return testresult;
}

#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MACOSX) && !defined(NO_PROVIDER_MODULE)
static int test_path_config(void)
{
OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_new();
OSSL_LIB_CTX *ctx = NULL;
OSSL_PROVIDER *prov;
int testresult = 0;
struct stat sbuf;

if (stat("../test/p_test.so", &sbuf) == -1)
return TEST_skip("Skipping modulepath test as provider not present");

if (!TEST_ptr(pathedconfig))
return 0;

ctx = OSSL_LIB_CTX_new();
if (!TEST_ptr(ctx))
return 0;

Expand All @@ -97,7 +103,6 @@ static int test_path_config(void)
OSSL_LIB_CTX_free(ctx);
return testresult;
}
#endif

OPT_TEST_DECLARE_USAGE("configfile\n")

Expand All @@ -119,15 +124,6 @@ int setup_tests(void)

ADD_TEST(test_recursive_config);
ADD_TEST(test_double_config);
#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MACOSX) && !defined(NO_PROVIDER_MODULE)
/*
* This test has to specify a module path to a file
* Which is setup as ../test/p_test.so
* Since windows/macos doesn't build with that extension
* just skip the test here
* Additionally skip it if we're not building provider modules
*/
ADD_TEST(test_path_config);
#endif
return 1;
}

0 comments on commit f663322

Please sign in to comment.