Commit d90a6beb authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-stdio and no-autoalginit 



no-stdio does not work with the apps. Since the tests also need the apps
it doesn't support that either. Therefore we disable building of both.

no-autoalginit is not compatible with the apps because it requires explicit
loading of the algorithms, and the apps don't do that. Therefore we disable
building the apps for this option. Similarly the tests depend on the apps
so we also disable the tests. Finally the whole point about no-autoalginit
is to avoid excessive executable sizes when doing static linking. Therefore
we disable "shared" if this option is selected.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent c3a64b52

Configurations/descrip.mms.tmpl

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ build_tests_nodep : $(TESTPROGS) 
test tests : configdata.pm, -

             build_apps_nodep, build_engines_nodep, build_tests_nodep, -

             depend

        @ ! {- output_off() if $disabled{tests}; "" -}

        SET DEFAULT [.test]{- move("test") -}

        DEFINE SRCTOP {- sourcedir() -}

        DEFINE BLDTOP {- builddir() -}
@@ -235,6 +236,9 @@ test tests : configdata.pm, - 
        DEASSIGN BLDTOP

        DEASSIGN SRCTOP

        SET DEFAULT [-]{- move("..") -}

        @ ! {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}

        @ WRITE SYS$OUTPUT "Tests are not supported with your chosen Configure options"

        @ ! {- output_on() if !$disabled{tests}; "" -}



list-tests :

        @ TOP=$(SRCDIR) PERL=$(PERL) $(PERL) {- catfile($config{sourcedir},"test", "run_tests.pl") -} list

Configurations/unix-Makefile.tmpl

+4 −0
Original line number Diff line number Diff line
@@ -217,12 +217,16 @@ build_tests_nodep: $(TESTPROGS) 


test tests: build_tests_nodep build_apps_nodep build_engines_nodep \

            depend link-utils

	@ : {- output_off() if $disabled{tests}; "" -}

	( cd test; \

	  SRCTOP=../$(SRCDIR) \

	  BLDTOP=../$(BLDDIR) \

	  EXE_EXT={- $exeext -} \

	  OPENSSL_ENGINES=../$(BLDDIR)/engines \

	    $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )

	@ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}

	@echo "Tests are not supported with your chosen Configure options"

	@ : {- output_on() if !$disabled{tests}; "" -}



list-tests:

	@TOP=$(SRCDIR) PERL=$(PERL) $(PERL) $(SRCDIR)/test/run_tests.pl list

Configurations/windows-makefile.tmpl

+4 −0
Original line number Diff line number Diff line
@@ -139,10 +139,14 @@ build_tests: configdata.pm build_tests_nodep depend 
build_tests_nodep: $(TESTPROGS)



test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend

	@rem {- output_off() if $disabled{tests}; "" -}

	set SRCTOP=$(SRCDIR)

	set BLDTOP=$(BLDDIR)

	set PERL=$(PERL)

	$(PERL) $(SRCDIR)\test\run_tests.pl $(TESTS)

	@rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}

	@echo "Tests are not supported with your chosen Configure options"

	@rem {- output_on() if !$disabled{tests}; "" -}



list-tests:

	@set TOP=$(SRCDIR)

Configure

+6 −0
Original line number Diff line number Diff line
@@ -400,6 +400,12 @@ my @disable_cascades = ( 
    "pic"               => [ "shared" ],

    "shared"            => [ "dynamic-engine" ],

    "engine"            => [ "afalgeng" ],



    # no-autoalginit is only useful when building non-shared

    "autoalginit"       => [ "shared", "apps" ],



    "stdio"             => [ "apps" ],

    "apps"              => [ "tests" ],

    "comp"		=> [ "zlib" ],

    sub { !$disabled{"unit-test"} } => [ "heartbeats" ],

    );

apps/build.info

+19 −17
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/catdir rel2abs/; -}

IF[{- !$disabled{apps} -}]

  PROGRAMS=openssl

  SOURCE[openssl]=\

          openssl.c \
@@ -17,3 +18,4 @@ DEPEND[openssl]=../libssl 
  SCRIPTS=CA.pl tsget

  SOURCE[CA.pl]=CA.pl.in

  SOURCE[tsget]=tsget.in

ENDIF