From e335f51dbc196c851db3f738d52d59a3c0555a15 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 16 Sep 2015 23:18:38 +0200
Subject: [PATCH] Makefile getting tests with find command

---
 Makefile | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 5ca7973a..98454b25 100644
--- a/Makefile
+++ b/Makefile
@@ -18,35 +18,26 @@ config.status--test:
 config/environments/test.js: config.status--test
 	./config.status--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: config/environments/test.js
 	@echo "***tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/unit/cartodb/*.js \
-		test/unit/cartodb/ported/*.js \
-		test/unit/cartodb/cache/model/*.js \
-		test/integration/*.js \
-		test/acceptance/*.js \
-		test/acceptance/cache/*.js \
-		test/acceptance/ported/*.js \
-		test/unit/cartodb/ported/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE)
 
 test-unit: config/environments/test.js
 	@echo "***tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/unit/cartodb/*.js \
-		test/unit/cartodb/ported/*.js \
-		test/unit/cartodb/cache/model/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_UNIT)
 
 test-integration: config/environments/test.js
 	@echo "***tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/integration/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_INTEGRATION)
 
 test-acceptance: config/environments/test.js
 	@echo "***tests***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/acceptance/*.js \
-		test/acceptance/cache/*.js
+	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_ACCEPTANCE)
 
 jshint:
 	@echo "***jshint***"