mirror of
https://github.com/openssl/openssl.git
synced 2024-12-04 07:24:52 +08:00
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>
This commit is contained in:
parent
39a4328031
commit
5cdad22f3e
@ -262,7 +262,13 @@ IF[{- !$disabled{tests} -}]
|
|||||||
SOURCE[bioprinttest]=bioprinttest.c
|
SOURCE[bioprinttest]=bioprinttest.c
|
||||||
INCLUDE[bioprinttest]=../include
|
INCLUDE[bioprinttest]=../include
|
||||||
DEPEND[bioprinttest]=../libcrypto
|
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::Spec::Functions;
|
||||||
use File::Basename;
|
use File::Basename;
|
||||||
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
|
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
|
||||||
@ -286,9 +292,4 @@ IF[{- !$disabled{tests} -}]
|
|||||||
DEPEND[buildtest_$name]=../libssl ../libcrypto
|
DEPEND[buildtest_$name]=../libssl ../libcrypto
|
||||||
_____
|
_____
|
||||||
}
|
}
|
||||||
-}
|
-}
|
||||||
|
|
||||||
SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c
|
|
||||||
INCLUDE[sslapitest]=../include
|
|
||||||
DEPEND[sslapitest]=../libcrypto ../libssl
|
|
||||||
ENDIF
|
|
||||||
|
@ -11,6 +11,7 @@ use warnings;
|
|||||||
|
|
||||||
# First argument is name;
|
# First argument is name;
|
||||||
my $name = shift @ARGV;
|
my $name = shift @ARGV;
|
||||||
|
my $name_uc = uc $name;
|
||||||
# All other arguments are ignored for now
|
# All other arguments are ignored for now
|
||||||
|
|
||||||
print <<"_____";
|
print <<"_____";
|
||||||
@ -18,7 +19,13 @@ print <<"_____";
|
|||||||
* Generated with test/generate_buildtest.pl, to check that such a simple
|
* Generated with test/generate_buildtest.pl, to check that such a simple
|
||||||
* program builds.
|
* 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()
|
int main()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user