From c7a47adca29e1ec761d639dd75336bb36ebf4a9b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 20 Feb 2018 14:53:40 +0000 Subject: [PATCH] Fix no-ec build [extended tests] Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5418) --- test/build.info | 6 ++++-- test/recipes/03-test_internal_curve448.t | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/build.info b/test/build.info index d8ea2f29a0..38fcf842b8 100644 --- a/test/build.info +++ b/test/build.info @@ -400,8 +400,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN # names with the DLL import libraries. IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}] PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \ - tls13encryptiontest wpackettest ctype_internal_test \ - curve448_internal_test + tls13encryptiontest wpackettest ctype_internal_test IF[{- !$disabled{poly1305} -}] PROGRAMS_NO_INST=poly1305_internal_test ENDIF @@ -414,6 +413,9 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN IF[{- !$disabled{sm4} -}] PROGRAMS_NO_INST=sm4_internal_test ENDIF + IF[{- !$disabled{ec} -}] + PROGRAMS_NO_INST=curve448_internal_test + ENDIF SOURCE[poly1305_internal_test]=poly1305_internal_test.c INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include diff --git a/test/recipes/03-test_internal_curve448.t b/test/recipes/03-test_internal_curve448.t index 1099d9ec2a..44bac026e8 100644 --- a/test/recipes/03-test_internal_curve448.t +++ b/test/recipes/03-test_internal_curve448.t @@ -16,4 +16,7 @@ setup("test_internal_curve448"); plan skip_all => "This test is unsupported in a shared library build on Windows" if $^O eq 'MSWin32' && !disabled("shared"); +plan skip_all => "This test is unsupported in a no-ec build" + if disabled("ec"); + simple_test("test_internal_curve448", "curve448_internal_test"); -- 2.25.1