Do all coverage calculations in a single job

.travis.yml

@@ -37,17 +37,9 @@ matrix:
   fast_finish: true
   fast_finish: true
 
 
   include:
   include:
-    - node_js: "0.8"
-      env: COVERAGE=true DB=mysql DIALECT=mysql
-    - node_js: "0.8"
-      env: COVERAGE=true DB=mysql DIALECT=postgres
-    - node_js: "0.8"
-      env: COVERAGE=true DB=mysql DIALECT=sqlite
+    - node_js: "0.10"
+      env: COVERAGE=true
 
 
   allow_failures:
   allow_failures:
-    - node_js: "0.8"
-      env: COVERAGE=true DB=mysql DIALECT=mysql
-    - node_js: "0.8"
+    - node_js: "0.10"
+      env: COVERAGE=true
\ No newline at end of file
-      env: COVERAGE=true DB=mysql DIALECT=postgres
-    - node_js: "0.8"
-      env: COVERAGE=true DB=mysql DIALECT=sqlite
\ No newline at end of file

Makefile

@@ -11,14 +11,16 @@ teaser:
 	node -pe "Array(20 + '$(DIALECT)'.length + 3).join('#')" && \
 	node -pe "Array(20 + '$(DIALECT)'.length + 3).join('#')" && \
 	echo ''
 	echo ''
 
 
+ifeq (true,$(COVERAGE))
+test: coveralls
+else
 test:
 test:
-	@if [ -n "$$COVERAGE" ]; then \
-	    make cover && make coveralls-send; \
-	@elif [ "$$GREP" ]; \ then \
+	@if [ "$$GREP" ]; then \
 		make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
 		make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
 	else \
 	else \
 		make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
 		make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
 	fi
 	fi
+endif
 
 
 cover:
 cover:
 	rm -rf coverage \
 	rm -rf coverage \
@@ -40,18 +42,23 @@ binary:
 mariadb-cover:
 mariadb-cover:
 	rm -rf coverage
 	rm -rf coverage
 	@DIALECT=mariadb make cover
 	@DIALECT=mariadb make cover
+	mv coverage coverage-mariadb
 sqlite-cover:
 sqlite-cover:
 	rm -rf coverage
 	rm -rf coverage
 	@DIALECT=sqlite make cover
 	@DIALECT=sqlite make cover
+	mv coverage coverage-sqlite
 mysql-cover:
 mysql-cover:
 	rm -rf coverage
 	rm -rf coverage
 	@DIALECT=mysql make cover
 	@DIALECT=mysql make cover
+	mv coverage coverage-mysql
 postgres-cover:
 postgres-cover:
 	rm -rf coverage
 	rm -rf coverage
 	@DIALECT=postgres make cover
 	@DIALECT=postgres make cover
+	mv coverage coverage-postgres
 postgres-native-cover:
 postgres-native-cover:
 	rm -rf coverage
 	rm -rf coverage
 	@DIALECT=postgres-native make cover
 	@DIALECT=postgres-native make cover
+	mv coverage coverage-postgresnative
 binary-cover:
 binary-cover:
 	rm -rf coverage
 	rm -rf coverage
 	@./test/binary/sequelize.test.bats
 	@./test/binary/sequelize.test.bats
@@ -62,7 +69,7 @@ merge-coverage:
 	./node_modules/.bin/lcov-result-merger 'coverage-*/lcov.info' 'coverage/lcov.info'
 	./node_modules/.bin/lcov-result-merger 'coverage-*/lcov.info' 'coverage/lcov.info'
 
 
 coveralls-send:
 coveralls-send:
-	cat ./coverage/lcov.info | ./node_modules/.bin/coveralls && rm -rf ./coverage
+	cat ./coverage/lcov.info | ./node_modules/.bin/coveralls && rm -rf ./coverage*
 
 
 # test aliases
 # test aliases