Merge branch 'tests4' into tests

jsha · jsha · commit 2d9923b37e71 · 2014-08-14T11:57:03.000-04:00
Conflicts:
	.travis.yml
	test.sh
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ language: python
 python:
   - "2.7"
 addons:
+  # Firefox 31 doesn't seem to be available on travis-ci.org yet.
   firefox: "30.0"
 before_install:
   - wget -q https://ftp.mozilla.org/pub/mozilla.org/labs/jetpack/addon-sdk-1.16.tar.gz
diff --git a/test.sh b/test.sh
@@ -39,7 +39,9 @@ fi
 if ! type cfx > /dev/null; then
   echo "Please activate the Firefox Addon SDK before running this script."
   echo "https://ftp.mozilla.org/pub/mozilla.org/labs/jetpack/addon-sdk-1.16.tar.gz"
-  echo "Unpack and run 'source addon-adk-1.16/bin/activate'"
+  echo "Unpack and run 'cd addon-adk-1.16; source bin/activate'"
+  exit 1
+fi
   exit 1
 fi
 
@@ -49,5 +51,11 @@ if ! cfx --version | grep -q "$LATEST_SDK_VERSION"; then
 fi
 
 cd $TEST_ADDON_PATH
-echo "running tests"
-cfx test --profiledir="$PROFILE_DIRECTORY" --verbose
+# If you just want to run Firefox with the latest code:
+if [ "$1" == "--justrun" ]; then
+  echo "running firefox"
+  firefox -profile "$PROFILE_DIRECTORY"
+else
+  echo "running tests"
+  cfx test --profiledir="$PROFILE_DIRECTORY" --verbose
+fi
