From 540d8a4f000730c9da3ba91a5be2b9a490c3ab6d Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Sat, 12 Mar 2011 12:07:07 -0500
Subject: [PATCH] Altered Makefile to ensure the combine test is performed
 after all others

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b7c3192..c8cfbaf 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,14 @@ PERF_TESTS := $(shell find "$(PATH_PERF_TEST)" -name 'perf-*.js')
 
 COMBINE=${PATH_TOOLS}/combine
 
-TESTS := $(shell find "./test" -name 'test-*')
+TESTS := $(shell find "$(PATH_TEST)" \
+	-name 'test-*' \
+	-a ! -name 'test-combine.js'\
+)
+TEST_COMBINE := $(PATH_TEST)/test-combine.js
 
 
-.PHONY: test
+.PHONY: test test-combine
 
 
 default: combine
@@ -31,7 +35,8 @@ combine: mkbuild
 	cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
 
 # run tests
-test: default $(TESTS)
+test: default $(TESTS) test-combine
+test-combine: default $(TEST_COMBINE)
 test-%.js: default
 	node $@
 test-%: default