diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-14 13:44:15 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-14 16:41:03 +0100 |
| commit | d90a6beb0e8b519e345204cc533597a2e563dab5 (patch) | |
| tree | 572d1c4d34de850f3bed7e609894acebcd4fb0df /Configurations | |
| parent | c3a64b52788df139d649efaaf993c27dc89ba6ce (diff) | |
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: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 4 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 85e1cd9e21..28231abbad 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -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 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 9054f6a863..e0ad21b683 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -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 diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 6a450b14de..0c043a098e 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -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) |