Skip to content
Browse files

use vanilla phantomjs, and remove submodule we kept around for gettin…

…g to pyphantomjs
  • Loading branch information...
1 parent afa837c commit 616fd05aac3f3e50c329112d707afb1e116deb8c @bloveridge bloveridge committed Mar 8, 2012
Showing with 9 additions and 5 deletions.
  1. +0 −3 .gitmodules
  2. +0 −1 ext/phantomjs
  3. +9 −1 test/phantomjs.runner.sh
View
3 .gitmodules
@@ -1,3 +0,0 @@
-[submodule "ext/phantomjs"]
- path = ext/phantomjs
- url = git://github.com/ariya/phantomjs.git
1 ext/phantomjs
@@ -1 +0,0 @@
-Subproject commit 11a5e952816d001fb228d51abc092a52af10ca57
View
10 test/phantomjs.runner.sh
@@ -1,5 +1,13 @@
#!/bin/bash
+# sanity check to make sure phantomjs exists in the PATH
+hash /usr/bin/env phantomjs &> /dev/null
+if [ $? -eq 1 ]; then
+ echo "ERROR: phantomjs is not installed"
+ echo "Please visit http://www.phantomjs.org/"
+ exit 1
+fi
+
# sanity check number of args
if [ $# -lt 1 ]
then
@@ -25,4 +33,4 @@ git submodule update --init
# fire up the phantomjs environment and run the test
cd $SCRIPTDIR
-/usr/bin/env python ../ext/phantomjs/python/pyphantomjs/pyphantomjs.py $SCRIPTDIR/phantomjs-testrunner.js $TESTFILE
+/usr/bin/env phantomjs $SCRIPTDIR/phantomjs-testrunner.js $TESTFILE

0 comments on commit 616fd05

Please sign in to comment.
Something went wrong with that request. Please try again.