Skip to content

Commit

Permalink
Update the makefile to build the unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
stcarrez committed Feb 6, 2018
1 parent 2710bfe commit ba85292
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SECURITY_LIBRARY_TYPE=static
# target names defined.
MODE=distrib
GNATMAKE=@GNATMAKE@
GNATCLEAN=gnatclean
GNATCLEAN=@GNATCLEAN@
GPRINSTALL=@GPRINSTALL@
INSTALL=@INSTALL@
DYNAMO=dynamo
Expand Down Expand Up @@ -63,18 +63,19 @@ alidir=${prefix}/${infix_ali}
libname=libada_security

PROCESSORS=@NR_CPUS@
MAKE_ARGS=-XMODE=${MODE} -XSECURITY_LIBRARY_TYPE=${SECURITY_LIBRARY_TYPE} -XPROCESSORS=${PROCESSORS}
COVERAGE=no
MAKE_ARGS=-XMODE=${MODE} -XCOVERAGE=${COVERAGE} -XSECURITY_LIBRARY_TYPE=${SECURITY_LIBRARY_TYPE} -XPROCESSORS=${PROCESSORS}
ifeq ($(SECURITY_LIBRARY_TYPE),relocatable)
MAKE_ARGS += -XUTIL_BUILD=relocatable -XUTIL_LIBRARY_TYPE=relocatable
MAKE_ARGS += -XXMLADA_BUILD=relocatable
MAKE_ARGS += -XLIBRARY_TYPE=relocatable
endif

ifeq (${BUILDS_SHARED},yes)
all: static shared
all: static shared build-test
install: uninstall install_static install_shared install-info
else
all: static
all: static build-test
install: uninstall install_static install-info
endif

Expand All @@ -88,6 +89,9 @@ static:
shared:
$(MAKE) SECURITY_LIBRARY_TYPE=relocatable build

build-test: build
$(GNATMAKE) $(MAKE_ARGS) -p -Psecurity_tests

setup: obj/security/static lib/security/static

obj/security/static lib/security/static:
Expand Down Expand Up @@ -117,8 +121,7 @@ analyze:
rebuild: clean build

# Build and run the unit tests
check test: build
$(GNATMAKE) $(MAKE_ARGS) -p -Psecurity_tests
check test: build-test
bin/security_harness -xml security-aunit.xml

doc:
Expand Down

0 comments on commit ba85292

Please sign in to comment.