diff --git a/src/test/Makefile b/src/test/Makefile index e03d6e043ed..107d273fa37 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -50,7 +50,6 @@ BLK_TESTS = \ blk_recovery\ blk_rw\ blk_rw_mt - LOG_TESTS = \ log_basic\ log_pool\ @@ -242,9 +241,9 @@ TESTS += $(CHRONO_TESTS) endif TESTS_BUILD = \ - $(TESTS)\ $(TEST_DEPS)\ - $(OBJ_DEPS) + $(OBJ_DEPS)\ + $(TESTS) all : TARGET = all clean : TARGET = clean @@ -269,11 +268,9 @@ all test cstyle: $(TESTS_BUILD) clean clobber: $(TESTS_BUILD) -$(OBJ_DEPS) $(OBJ_TESTS) $(OBJ_CPP_TESTS) $(BLK_TESTS) $(LOG_TESTS) $(OTHER_TESTS) $(PMEM_TESTS) $(PMEMPOOL_TESTS) $(VMEM_TESTS) $(VMMALLOC_TESTS): unittest - -$(TESTS): tools - +$(TESTS): $(TEST_DEPS) $(OBJ_TESTS): $(OBJ_DEPS) +$(OBJ_DEPS): $(TEST_DEPS) $(TESTS_BUILD): $(MAKE) -C $@ $(TARGET) @@ -328,4 +325,4 @@ pcheck_vmmalloc: $(VMMALLOC_TESTS) .PHONY: all check clean clobber cstyle pcheck pcheck_blk pcheck_log pcheck_obj\ pcheck_other pcheck_pmem pcheck_pmempool pcheck_vmem pcheck_vmmalloc\ - test unittest $(TESTS_BUILD) + test unittest tools $(TESTS_BUILD) diff --git a/utils/build-dpkg.sh b/utils/build-dpkg.sh index 87dcd321728..5fdfc1145d4 100755 --- a/utils/build-dpkg.sh +++ b/utils/build-dpkg.sh @@ -234,7 +234,7 @@ override_dh_auto_test: else\ cp src/test/testconfig.sh.example src/test/testconfig.sh;\ fi - make -s pcheck + make check EOF chmod +x debian/rules diff --git a/utils/build-rpm.sh b/utils/build-rpm.sh index da6f84f3dfd..dbb12aca874 100755 --- a/utils/build-rpm.sh +++ b/utils/build-rpm.sh @@ -347,7 +347,8 @@ if [ -f $TEST_CONFIG_FILE ]; then else cp src/test/testconfig.sh.example src/test/testconfig.sh fi -make -s pcheck + +make check %clean make clobber