Run tests only when doing "make test"

diff --git a/Makefile b/Makefile
index dbe16e6f670e5c581a8f87fda846528b7986cf96..defab5dc9c9ec730115ffc187c02c3b7b3b49859 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ export DESTDIR := $(R)
 # And over-ride all of the other magic.
 include scripts/boiler.mk
 
-test: build.raddb ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient
+test: build.raddb ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywords
        @$(MAKE) -C raddb/certs
        @./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -n debug -D ./share
        @$(MAKE) -C src/tests tests

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 4a82e24e805843eb9a3a4c9f8a721b949640f6c1..0b5aea6602d52cbfcf877ee9830409da78a7df06 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -96,12 +96,6 @@ TESTS.KEYWORDS_FILES := $(addprefix $(BUILD_DIR)/tests/keywords/,$(FILES))
 #
 tests.keywords: $(TESTS.KEYWORDS_FILES)
 
-#
-#  And be a BASTARD about it.  If the unit tests fail,
-#  then we can't run radiusd.
-#
-$(BUILD_DIR)/bin/radiusd: $(TESTS.KEYWORDS_FILES)
-
 .PHONY: clean.tests.keywords
 clean.tests.keywords:
        @rm -rf $(BUILD_DIR)/tests/keywords/

diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk
index 60f481993d9d9db7db752d32b0a7e19d65592783..026877a56b4c5ccd0017a509b48d8e2b625e0ba3 100644 (file)
--- a/src/tests/unit/all.mk
+++ b/src/tests/unit/all.mk
@@ -33,9 +33,3 @@ TESTS.UNIT_FILES := $(addprefix $(BUILD_DIR)/tests/unit/,$(FILES))
 #  Depend on the output files, and create the directory first.
 #
 tests.unit: $(TESTS.UNIT_FILES)
-
-#
-#  And be a BASTARD about it.  If the unit tests fail,
-#  then we can't run radiusd.
-#
-$(BUILD_DIR)/bin/radiusd: $(TESTS.UNIT_FILES)