From 2c9def25b1948f5f231b1acc15c060d9c2264816 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 12 Dec 2017 19:55:38 +0000 Subject: [PATCH] Move curve448_test.c to be a full internal test This ensures that this test is run as part of the test suite Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/5105) --- test/build.info | 7 ++++++- .../curve448_internal_test.c | 0 test/recipes/03-test_internal_curve448.t | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) rename crypto/ec/curve448/curve448_test.c => test/curve448_internal_test.c (100%) create mode 100644 test/recipes/03-test_internal_curve448.t diff --git a/test/build.info b/test/build.info index 7811f04e13..d8ea2f29a0 100644 --- a/test/build.info +++ b/test/build.info @@ -400,7 +400,8 @@ 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 + tls13encryptiontest wpackettest ctype_internal_test \ + curve448_internal_test IF[{- !$disabled{poly1305} -}] PROGRAMS_NO_INST=poly1305_internal_test ENDIF @@ -453,6 +454,10 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN SOURCE[sm4_internal_test]=sm4_internal_test.c INCLUDE[sm4_internal_test]=.. ../include ../crypto/include DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a + + SOURCE[curve448_internal_test]=curve448_internal_test.c + INCLUDE[curve448_internal_test]=.. ../include ../crypto/ec/curve448 + DEPEND[curve448_internal_test]=../libcrypto.a libtestutil.a ENDIF IF[{- !$disabled{mdc2} -}] diff --git a/crypto/ec/curve448/curve448_test.c b/test/curve448_internal_test.c similarity index 100% rename from crypto/ec/curve448/curve448_test.c rename to test/curve448_internal_test.c diff --git a/test/recipes/03-test_internal_curve448.t b/test/recipes/03-test_internal_curve448.t new file mode 100644 index 0000000000..1099d9ec2a --- /dev/null +++ b/test/recipes/03-test_internal_curve448.t @@ -0,0 +1,19 @@ +#! /usr/bin/env perl +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +use strict; +use OpenSSL::Test; # get 'plan' +use OpenSSL::Test::Simple; +use OpenSSL::Test::Utils; + +setup("test_internal_curve448"); + +plan skip_all => "This test is unsupported in a shared library build on Windows" + if $^O eq 'MSWin32' && !disabled("shared"); + +simple_test("test_internal_curve448", "curve448_internal_test"); -- 2.25.1