From 9dd9727bb8d38d45d7da2ef0f3ffe080f4a84c57 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Wed, 16 Jan 2013 14:52:54 -0500 Subject: [PATCH 1/2] Another minor tweak to limit these tests to the cms. --- jenkins/test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index 6dec341f10..b4befa6d5f 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -45,7 +45,9 @@ TESTS_FAILED=0 rake test_lms[false] || TESTS_FAILED=1 rake test_common/lib/capa || TESTS_FAILED=1 rake test_common/lib/xmodule || TESTS_FAILED=1 -rake phantomjs_jasmine_lms || true +if [[ "${JOB_NAME}" == "*cms*" ]]; then + rake phantomjs_jasmine_lms || true +fi # Don't run the studio tests until feature/cale/cms-master is merged in # rake phantomjs_jasmine_cms || true rake coverage:xml coverage:html From 0193cc597646ad4be1d0a3ca417acb0027c86591 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Wed, 16 Jan 2013 15:08:55 -0500 Subject: [PATCH 2/2] Remove this altogether. --- jenkins/test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index b4befa6d5f..7d946a24cd 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -45,9 +45,6 @@ TESTS_FAILED=0 rake test_lms[false] || TESTS_FAILED=1 rake test_common/lib/capa || TESTS_FAILED=1 rake test_common/lib/xmodule || TESTS_FAILED=1 -if [[ "${JOB_NAME}" == "*cms*" ]]; then - rake phantomjs_jasmine_lms || true -fi # Don't run the studio tests until feature/cale/cms-master is merged in # rake phantomjs_jasmine_cms || true rake coverage:xml coverage:html