generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't build test programs by default, add convenience targets for unified build

Browse Source 
Test programs are now only built when running "make test" or "make
build_tests".

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
2016-02-13 18:15:51 +01:00
parent dde10ab4d2
commit 68a5f1a278
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Configurations/descrip.mms.tmpl
View File

@@ -200,9 +200,14 @@ NODEBUG=@
# The main targets ################################################### # The main targets ###################################################
all : descrip.mms, $(LIBS), $(ENGINES), $(PROGRAMS), $(SCRIPTS), $(TESTPROGS) all : descrip.mms, build_libs, build_engines, build_apps
test tests : $(TESTPROGS), rehash build_libs : $(LIBS)
build_engines : $(ENGINES)
build_apps : $(PROGRAMS), $(SCRIPTS)
build_tests : $(TESTPROGS)
test tests : build_tests, rehash
SET DEFAULT [.test]{- move("test") -} SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -} DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -} DEFINE BLDTOP {- builddir() -}

10
Configurations/unix-Makefile.tmpl
View File

@@ -143,9 +143,15 @@ PROCESSOR= {- $config{processor} -}
# The main targets ################################################### # The main targets ###################################################
all: Makefile libcrypto.pc libssl.pc openssl.pc $(ENGINES) $(PROGRAMS) $(SCRIPTS) $(TESTPROGS) link-utils all: build_libs build_engines build_apps link-utils
test tests: $(TESTPROGS) rehash # The pkg-config files depend on the libraries as well as Makefile
build_libs: libcrypto.pc libssl.pc openssl.pc
build_engines: $(ENGINES)
build_apps: $(PROGRAMS) $(SCRIPTS)
build_tests: $(TESTPROGS)
test tests: build_tests rehash
( cd test; \ ( cd test; \
SRCTOP=../$(SRCDIR) \ SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \ BLDTOP=../$(BLDDIR) \

7
Makefile.in
View File

@@ -224,7 +224,7 @@ INSTALLDIRS= \
$(DESTDIR)$(OPENSSLDIR)/certs \ $(DESTDIR)$(OPENSSLDIR)/certs \
$(DESTDIR)$(OPENSSLDIR)/private $(DESTDIR)$(OPENSSLDIR)/private
all: Makefile build_all all: Makefile build_all_but_tests
# as we stick to -e, CLEARENV ensures that local variables in lower # as we stick to -e, CLEARENV ensures that local variables in lower
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -311,7 +311,8 @@ reflect:
sub_all: build_all sub_all: build_all
build_all: build_libs build_apps build_tests build_tools build_all_but_tests: build_libs build_apps build_tools
build_all: build_all_but_tests build_tests
build_libs: build_libcrypto build_libssl openssl.pc build_libs: build_libcrypto build_libssl openssl.pc
@@ -477,7 +478,7 @@ rehash.time: certs build_apps build_tools
test: files tests test: files tests
tests: rehash tests: build_tests rehash
@(cd test && echo "testing..." && \ @(cd test && echo "testing..." && \
$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
@if [ -z "$(CROSS_COMPILE)" ]; then \ @if [ -z "$(CROSS_COMPILE)" ]; then \