diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-08-05 00:32:36 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-05 21:17:05 +0200 |
| commit | 5cdad22f3e6ed5077b6c06dc2ac4edcea7bc0bb4 (patch) | |
| tree | 20e8668d7f2f13a3813b3e43bf08db292685965b /test | |
| parent | 39a43280316f1b9c45be5ac5b04f4f5c3f923686 (diff) | |
Move the building of test/buildtest_*. to be done unconditionally
These were guarded by $disabled{tests}. However, 'tests' is disabled
if we configure 'no-stdio', which means that we don't detect the lack
of OPENSSL_NO_STDIO guards in our public header files. So we move the
generation and build of test/buildtest_*.c to be unconditional.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 15 | ||||
| -rw-r--r-- | test/generate_buildtest.pl | 9 |
2 files changed, 16 insertions, 8 deletions
diff --git a/test/build.info b/test/build.info index d731f9cceb..0c51d1e5c8 100644 --- a/test/build.info +++ b/test/build.info @@ -262,7 +262,13 @@ IF[{- !$disabled{tests} -}] SOURCE[bioprinttest]=bioprinttest.c INCLUDE[bioprinttest]=../include DEPEND[bioprinttest]=../libcrypto - {- + + SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c + INCLUDE[sslapitest]=../include + DEPEND[sslapitest]=../libcrypto ../libssl +ENDIF + +{- use File::Spec::Functions; use File::Basename; use if $^O ne "VMS", 'File::Glob' => qw/glob/; @@ -286,9 +292,4 @@ IF[{- !$disabled{tests} -}] DEPEND[buildtest_$name]=../libssl ../libcrypto _____ } - -} - - SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c - INCLUDE[sslapitest]=../include - DEPEND[sslapitest]=../libcrypto ../libssl -ENDIF +-} diff --git a/test/generate_buildtest.pl b/test/generate_buildtest.pl index 7921021e45..0a9d879eb1 100644 --- a/test/generate_buildtest.pl +++ b/test/generate_buildtest.pl @@ -11,6 +11,7 @@ use warnings; # First argument is name; my $name = shift @ARGV; +my $name_uc = uc $name; # All other arguments are ignored for now print <<"_____"; @@ -18,7 +19,13 @@ print <<"_____"; * Generated with test/generate_buildtest.pl, to check that such a simple * program builds. */ -#include <openssl/$name.h> +#include <openssl/opensslconf.h> +#ifndef OPENSSL_NO_STDIO +# include <stdio.h> +#endif +#ifndef OPENSSL_NO_${name_uc} +# include <openssl/$name.h> +#endif int main() { |