From 1c2bb4ace713ec860b10f30f9cbc6e82d01fe6d1 Mon Sep 17 00:00:00 2001
From: Kalervo Kujala <kkujala@com>
Date: Mon, 12 Dec 2011 22:12:33 +0200
Subject: [PATCH] Remove unit-test from 'make test' and add Aurora to the paths
 on mac.

---
 Makefile           | 6 +++---
 test/unit/Makefile | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7337444d0..f36e74130 100644
--- 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 02ca743b0..5a11568c3 100644
--- 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/' \
 `)