From 2e89c2ef259b2df88dbf19e71dfd64b049b28ae1 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 10 Aug 2013 21:29:57 -0500 Subject: [PATCH] * provide way to skip karama tests --- build | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/build b/build index 5512ec110..5bd909b64 100755 --- a/build +++ b/build @@ -45,20 +45,22 @@ if [ -z $SKIP_TESTS ]; then fi - echo "running karma tests" - #http://shortforgilbert.com/blog/2011/03/25/headless-jasmine-ci - # TODO starting Xvfb here because we don't do this on start of build server - # If you run it once, it will background/nohup itself, so this is 'lazy' - Xvfb :99 -screen 0 1440x900x16 > /dev/null 2>&1 & - # run jasmine using the virtual screen, and in the test environment to use the jam_web_test db - DISPLAY=":99" karma start spec/javascripts/karma.ci.conf.js + if [ -z $SKIP_KARMA ]; then + echo "running karma tests" + #http://shortforgilbert.com/blog/2011/03/25/headless-jasmine-ci + # TODO starting Xvfb here because we don't do this on start of build server + # If you run it once, it will background/nohup itself, so this is 'lazy' + Xvfb :99 -screen 0 1440x900x16 > /dev/null 2>&1 & + # run jasmine using the virtual screen, and in the test environment to use the jam_web_test db + DISPLAY=":99" karma start spec/javascripts/karma.ci.conf.js - if [ "$?" = "0" ]; then - echo "success: karma tests completed" - else - echo "running karma tests failed" - exit 1 - fi + if [ "$?" = "0" ]; then + echo "success: karma tests completed" + else + echo "running karma tests failed" + exit 1 + fi + fi if [ -z "$SKIP_CUCUMBER_TESTS" ]; then echo "running cucumber tests"