Commit 41f82393 authored by Kevin Stroeher's avatar Kevin Stroeher Committed by Curtis Adam

Change check for server enviroment in runTests.sh

parent a8762108
......@@ -29,11 +29,6 @@ failedTestsArray=()
checkDirectory
#######################################
if [ $NODE_ENV -n ] ; then
SERVER_PREFIX='xvfb-run --server-args="-screen 0 1920x1080x16" '
fi
# step through any subdirectory of tests/features and
# - restore meteor database
# - run chimp
......@@ -58,7 +53,11 @@ for testDir in $searchDir; do
# Run chimp
echo -e $GREEN"Running chimp ..." $NC
$SERVER_PREFIX chimp --ddp=http://localhost:3000 --path=$testDir $1
if [ $DISPLAY -n ] ; then
xvfb-run --server-args="-screen 0 1920x1080x16" chimp --ddp=http://localhost:3000 --path=$testDir $1
else
chimp --ddp=http://localhost:3000 --path=$testDir $1
fi
if [ $? -ne 0 ]; then
failedTests=$((failedTests+1))
failedTestsArray+=("$testDir")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment