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

This commit is contained in:
Kalervo Kujala 2011-12-12 22:12:33 +02:00
parent 0e46928f36
commit 1c2bb4ace7
2 changed files with 4 additions and 3 deletions

View File

@ -45,8 +45,9 @@ server:
# make test # make test
# #
# This target runs all the tests. This can be used for testing all browsers. # This target runs all the tests excluding the unit-test. This can be used for
test: unit-test shell-test browser-test # testing all browsers.
test: shell-test browser-test
# #
# Create production output (pdf.js, and corresponding changes to web files) # 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 # This target runs in-browser unit tests with js-test-driver and jasmine unit
# test framework. # test framework.
unit-test: unit-test:
@cd test/unit/ ; make ; @cd test/unit/ ; make ;

View File

@ -2,6 +2,7 @@
MANIFEST=../resources/browser_manifests/browser_manifest.json MANIFEST=../resources/browser_manifests/browser_manifest.json
BROWSERS=$(shell echo `sed -n 's/.*"path":\(.*\)/\1,/p' $(MANIFEST) | tr -d '\n' | \ 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/\(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/' \ sed 's/\(Firefox[ Beta]*\.app\)/\1\/Contents\/MacOS\/firefox-bin/' \
`) `)