make unit tests run in series again

which means that they actually run.  We'll need to track down why
the current rules sometimes fail to run.

This reverts commit b10d283d34c and commit 4908edb115

diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk
index 94978f27835b7369957a0648b91c0eca2b6f9ffb..fbb8dc3ef3e7a080a990e4bf7692155394094677 100644 (file)
--- a/src/tests/unit/all.mk
+++ b/src/tests/unit/all.mk
@@ -24,9 +24,6 @@ endif
 #
 FILES := $(subst $(DIR)/,,$(FILES))
 
-FILES_PURIFY := $(filter purify/%,$(FILES))
-FILES_NORMAL := $(filter-out purify/%,$(FILES))
-
 # dict.txt - removed because the unit tests don't allow for protocol namespaces
 
 # command.txt - removed because commands like ":sql" are not parsed properly any more
@@ -87,16 +84,6 @@ $(filter $(BUILD_DIR)/tests/unit/purify/%,$(FILES.$(TEST))): PURIFY=-p
 #
 #REWRITE_FLAGS = -w $(BUILD_DIR)/tmp
 
-$(addprefix $(OUTPUT)/,$(FILES_NORMAL)) &: $(addprefix src/tests/unit/,$(FILES_NORMAL))
-       $(eval DIR:=${top_srcdir}/src/tests/unit)
-       $(eval export UNIT_TEST_ATTRIBUTE:=TZ=GMT $(TEST_BIN_NO_TIMEOUT)/unit_test_attribute $(PURIFY) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/)
-       ${Q}$(TEST_BIN)/unit_test_attribute $(REWRITE_FLAGS) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/ $(filter src/tests/unit/%,$(filter-out build/%,$?))
-
-$(addprefix $(OUTPUT)/,$(FILES_PURIFY)) &: $(addprefix src/tests/unit/,$(FILES_PURIFY))
-       $(eval DIR:=${top_srcdir}/src/tests/unit)
-       $(eval export UNIT_TEST_ATTRIBUTE:=TZ=GMT $(TEST_BIN_NO_TIMEOUT)/unit_test_attribute $(PURIFY) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -p -r build/tests/unit/)
-       ${Q}$(TEST_BIN)/unit_test_attribute $(REWRITE_FLAGS) -p -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/ $(filter src/tests/unit/%,$(filter-out build/%,$?))
-
 #
 #  And the actual script to run each test.
 #