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

…g to pyphantomjs
larrymyers · Mar 9, 2012 · 616fd05 · 616fd05
1 parent afa837c
commit 616fd05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/ext/phantomjs b/ext/phantomjs
diff --git a/test/phantomjs.runner.sh b/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