Remove unit-test from 'make test' and add Aurora to the paths on mac.

diff --git a/Makefile b/Makefile
index 7337444d03b2147938cafa76f3cb6cd653adb4ad..f36e74130b9d46874e002ec45e8cd8f8d55fccba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,9 @@ server:
 
 # make test
 #
-# This target runs all the tests. This can be used for testing all browsers.
-test: unit-test shell-test browser-test
+# This target runs all the tests excluding the unit-test. This can be used for
+# testing all browsers.
+test: shell-test browser-test
 
 #
 # Create production output (pdf.js, and corresponding changes to web files)
@@ -75,7 +76,6 @@ bundle: | $(BUILD_DIR)
 #
 # This target runs in-browser unit tests with js-test-driver and jasmine unit
 # test framework.
-
 unit-test:
        @cd test/unit/ ; make ;
 

diff --git a/test/unit/Makefile b/test/unit/Makefile
index 02ca743b0bb110d9c0ed12016b7879c648b74978..5a11568c383a8d0f7037d903098ce891454a271d 100644 (file)
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -2,6 +2,7 @@
 MANIFEST=../resources/browser_manifests/browser_manifest.json
 BROWSERS=$(shell echo `sed -n 's/.*"path":\(.*\)/\1,/p' $(MANIFEST) | tr -d '\n' | \
   sed 's/\(Google Chrome\.app\)/\1\/Contents\/MacOS\/Google Chrome/' | \
+  sed 's/\(Aurora\.app\)/\1\/Contents\/MacOS\/firefox-bin/' | \
   sed 's/\(Firefox[ Beta]*\.app\)/\1\/Contents\/MacOS\/firefox-bin/' \
 `)