From b7f491cbd65116761da0565895069431b6cb8ef3 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 25 Nov 2019 16:30:51 +0100 Subject: [PATCH] test/cipher_overhead_test.c: build unconditionally Build it against static libraries always, since that's the only way it can work as intended. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/10516) --- test/build.info | 12 ++++++------ test/recipes/90-test_overhead.t | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/test/build.info b/test/build.info index e4fff15883..e17e1b5984 100644 --- a/test/build.info +++ b/test/build.info @@ -445,12 +445,12 @@ IF[{- !$disabled{tests} -}] INCLUDE[shlibloadtest]=../include ../apps/include ../crypto/include ENDIF - IF[{- $disabled{shared} -}] - PROGRAMS{noinst}=cipher_overhead_test - SOURCE[cipher_overhead_test]=cipher_overhead_test.c - INCLUDE[cipher_overhead_test]=.. ../include ../apps/include - DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a - ENDIF + # cipher_overhead_test uses internal symbols, so it must be linked with + # the static libraries + PROGRAMS{noinst}=cipher_overhead_test + SOURCE[cipher_overhead_test]=cipher_overhead_test.c + INCLUDE[cipher_overhead_test]=.. ../include ../apps/include + DEPEND[cipher_overhead_test]=../libcrypto.a ../libssl.a libtestutil.a SOURCE[uitest]=uitest.c ../apps/lib/apps_ui.c INCLUDE[uitest]=.. ../include ../apps/include diff --git a/test/recipes/90-test_overhead.t b/test/recipes/90-test_overhead.t index 9a108cd003..e9319003b2 100644 --- a/test/recipes/90-test_overhead.t +++ b/test/recipes/90-test_overhead.t @@ -12,9 +12,6 @@ use OpenSSL::Test::Utils; setup("test_overhead"); -plan skip_all => "Only supported in no-shared builds" - if !disabled("shared"); - plan tests => 1; ok(run(test(["cipher_overhead_test"])), "running cipher_overhead_test"); -- 2.25.1