Commit 68a5f1a2 authored by Richard Levitte's avatar Richard Levitte
Browse files

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



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

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent dde10ab4

Configurations/descrip.mms.tmpl

+7 −2
Original line number Diff line number Diff line
@@ -200,9 +200,14 @@ NODEBUG=@ 


# 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") -}

        DEFINE SRCTOP {- sourcedir() -}

        DEFINE BLDTOP {- builddir() -}

Configurations/unix-Makefile.tmpl

+8 −2
Original line number Diff line number Diff line
@@ -143,9 +143,15 @@ PROCESSOR= {- $config{processor} -} 


# 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; \

	  SRCTOP=../$(SRCDIR) \

	  BLDTOP=../$(BLDDIR) \

Makefile.in

+4 −3
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ INSTALLDIRS= \ 
		$(DESTDIR)$(OPENSSLDIR)/certs \

		$(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

# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -311,7 +311,8 @@ reflect: 


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
@@ -477,7 +478,7 @@ rehash.time: certs build_apps build_tools 
test:   files tests





tests: rehash

tests:  build_tests rehash

	@(cd test && echo "testing..." && \

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );

	@if [ -z "$(CROSS_COMPILE)" ]; then \