Explicit specification of tests per driver, driver-specific flags.

Author: jblueh

tests/Makefile

@@ -78,10 +78,16 @@ TESTS ?= $(patsubst $(TEST_DIR)/Test%.hpp,%,$(TEST_FILES))
 DRIVER_FILES = $(wildcard $(DRIVER_DIR)/Driver**.hpp)
 DRIVERS ?= $(patsubst $(DRIVER_DIR)/Driver%.hpp,%,$(DRIVER_FILES))
 
-# without surrounding parallel directives, privatized variables are not recognized as shared and sections are considered orphaned; hence, they need to be filtered out
-getDriverTests = $(if $(filter FirstOrderReverseNoParallel, $1), $(filter-out ParallelSections ForReduction ForReductionNowait ForReductionMultiple ForFirstprivate ForLastprivate OrderedReduction SectionsReduction SectionsReductionMultiple SectionsFirstprivate SectionsLastprivate ReductionNested SingleFirstprivate, $(TESTS)), $(TESTS))
+# exclude specific tests on a per-driver basis
+DRIVERS_USING_ALL_TESTS = FirstOrderReverse FirstOrderReverseNestedParallel FirstOrderReverseNoOpenMP FirstOrderReversePassive FirstOrderReverseSingleThread SecondOrderReverseForward
+$(DRIVERS_USING_ALL_TESTS) $(patsubst %,run%,$(DRIVERS_USING_ALL_TESTS)): DRIVER_TESTS = $(TESTS)
 
-DRIVER_TESTS =
+# without surrounding parallel constructs, privatized variables are not recognized as shared and sections are considered orphaned; hence, they need to be filtered out
+FirstOrderReverseNoParallel runFirstOrderReverseNoParallel: DRIVER_TESTS = $(filter-out ParallelSections ForReduction ForReductionNowait ForReductionMultiple ForFirstprivate ForLastprivate OrderedReduction SectionsReduction SectionsReductionMultiple SectionsFirstprivate SectionsLastprivate ReductionNested SingleFirstprivate, $(TESTS))
+
+# driver-specific compilation flags
+REVERSE_DRIVERS = FirstOrderReverse FirstOrderReverseNestedParallel FirstOrderReverseNoOpenMP FirstOrderReverseNoParallel FirstOrderReversePassive FirstOrderReverseSingleThread SecondOrderReverseForward
+$(REVERSE_DRIVERS): DRIVER_FLAGS = -DREVERSE_DRIVER
 
 # export directories for usage in shell scripts
 export DRIVER_DIR
@@ -98,14 +104,12 @@ export MODE
 # default target
 all:
 
-
 prepareGenerate:
 	@ mkdir -p build; \
 	rm -r -f tempmakefile; \
 	printf "# auto generated by OpDiLib\n" >> tempmakefile;
 
 # process each driver with its associated tests
-$(DRIVERS): DRIVER_TESTS = $(call getDriverTests, $@)
 $(DRIVERS):
 	@ echo $@": "${DRIVER_TESTS}; \
 	BUILD_CASES=; \
@@ -118,17 +122,17 @@ $(DRIVERS):
 		LINK_CASES=$$LINK_CASES" "$$driver$$test; \
 		printf "$$driver$$test.o:\n" >> tempmakefile; \
 		if [ $(EXPLICIT_PREPROCESSOR) = "no" ] ; then \
-			printf "\t$(CXX) $(BUILD_DIR)/$$driver$$test.cpp -c -o $(BUILD_DIR)/$$driver$$test.o $(FLAGS) -I $(CODI_DIR) -I $(OPDI_DIR)\n" >> tempmakefile; \
+      printf "\t$(CXX) $(BUILD_DIR)/$$driver$$test.cpp -c -o $(BUILD_DIR)/$$driver$$test.o $(FLAGS) $(DRIVER_FLAGS) -I $(CODI_DIR) -I $(OPDI_DIR)\n" >> tempmakefile; \
 		else \
-			printf "\t$(CXX) -E $(BUILD_DIR)/$$driver$$test.cpp -o $(BUILD_DIR)/$$driver$$test.temp $(FLAGS) -I $(CODI_DIR) -I $(OPDI_DIR)\n" >> tempmakefile; \
+      printf "\t$(CXX) -E $(BUILD_DIR)/$$driver$$test.cpp -o $(BUILD_DIR)/$$driver$$test.temp $(FLAGS) $(DRIVER_FLAGS) -I $(CODI_DIR) -I $(OPDI_DIR)\n" >> tempmakefile; \
 			printf "\tcat $(BUILD_DIR)/$$driver$$test.temp | grep -v \"# \" > $(BUILD_DIR)/$$driver$$(test)Pre.cpp\n" >> tempmakefile; \
 			printf "\t"$(CXX)" "$(BUILD_DIR)"/"$$driver$$test"Pre.cpp -c -o "$(BUILD_DIR)"/"$$driver$$test"Pre.o "$(FLAGS)" -I "$(CODI_DIR)" -I "$(OPDI_DIR)"\n" >> tempmakefile; \
 		fi; \
 		printf "$$driver$$test: $$driver$$test.o\n" >> tempmakefile; \
 		if [ $(EXPLICIT_PREPROCESSOR) = "no" ] ; then \
-			printf "\t$(CXX) $(BUILD_DIR)/$$driver$$test.o -o $(BUILD_DIR)/$$driver$$test $(FLAGS) $(LDFLAGS)\n" >> tempmakefile; \
+      printf "\t$(CXX) $(BUILD_DIR)/$$driver$$test.o -o $(BUILD_DIR)/$$driver$$test $(FLAGS) $(DRIVER_FLAGS) $(LDFLAGS)\n" >> tempmakefile; \
 		else \
-			printf "\t$(CXX) $(BUILD_DIR)/$$driver$$(test)Pre.o -o $(BUILD_DIR)/$$driver$$(test)Pre $(FLAGS) $(LDFLAGS)\n" >> tempmakefile; \
+      printf "\t$(CXX) $(BUILD_DIR)/$$driver$$(test)Pre.o -o $(BUILD_DIR)/$$driver$$(test)Pre $(FLAGS) $(DRIVER_FLAGS) $(LDFLAGS)\n" >> tempmakefile; \
 		fi \
 	done; \
 	printf "build_all:$$BUILD_CASES\n" >> tempmakefile; \
@@ -148,7 +152,6 @@ compile:
 link:
 	$(MAKE) -f tempmakefile link_all -j12
 
-$(patsubst %,run%,$(DRIVERS)): DRIVER_TESTS = $(call getDriverTests, $(subst run,,$@))
 $(patsubst %,run%,$(DRIVERS)): DRIVER = $(subst run,,$@)
 $(patsubst %,run%,$(DRIVERS)):
 	@rm -f testresults; \