Makefile getting tests with find command

CartoDB · Sep 17, 2015 · 1b5a02b · 1b5a02b
1 parent a93da95
commit 1b5a02b
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -11,29 +11,26 @@ clean:
 
 check: test
 
+TEST_SUITE := $(shell find test/{acceptance,integration,unit} -name "*.js")
+TEST_SUITE_UNIT := $(shell find test/unit -name "*.js")
+TEST_SUITE_INTEGRATION := $(shell find test/integration -name "*.js")
+TEST_SUITE_ACCEPTANCE := $(shell find test/acceptance -name "*.js")
+
 test:
 	@echo "***tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/unit/*.js \
-		test/unit/renderers/*.js \
-		test/integration/renderers/*.js \
-		test/acceptance/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE)
 
 test-acceptance:
 	@echo "***acceptance tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/acceptance/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_ACCEPTANCE)
 
 test-integration:
 	@echo "***integration tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/integration/renderers/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_INTEGRATION)
 
 test-unit:
 	@echo "***unit tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/unit/*.js \
-		test/unit/renderers/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_UNIT)
 
 jshint:
 	@echo "***jshint***"