Merge branch '193-fix-variable-definitions-in-bin-tests-Makefile.in' into 'master'

Fix variable definitions in bin/tests/Makefile.in

Closes #193

See merge request isc-projects/bind9!183
This commit is contained in:
Evan Hunt
2018-04-10 23:03:36 -04:00
3 changed files with 4 additions and 3 deletions

View File

@@ -100,7 +100,8 @@ stages:
- rm -rf .ccache
- bash -x bin/tests/system/ifconfig.sh up
script:
- cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1
- ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
- test -s bin/tests/system/systests.output
artifacts:
untracked: true
expire_in: '1 week'

View File

@@ -33,7 +33,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
LIBS = @LIBS@
SUBDIRS = system @PKCS11_TOOLS@
TESTDIRS =
TESTDIRS = system
# Test programs that are built by default:
# cfg_test is needed for regenerating doc/misc/options

View File

@@ -81,7 +81,7 @@ install:: all
install uninstall clean distclean maintainer-clean doc docclean man manclean::
@for i in ${ALL_SUBDIRS} ${ALL_TESTDIRS}; do \
if [ "$$i" != "nulldir" -a -d $$i ]; then \
if [ "$$i" != "nulldir" -a -d $$i -a -f $$i/Makefile ]; then \
echo "making $@ in `pwd`/$$i"; \
(cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \
fi; \