From 3b75bbdc6fb138b9997be59d7809417002880cd0 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 7 Dec 2012 11:18:38 -0500 Subject: [PATCH] Actually run cms tests on cms master --- jenkins/test.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index 8a96024785..5d33fd5612 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -32,14 +32,12 @@ yes w | pip install -q -r requirements.txt rake clobber TESTS_FAILED=0 -# Don't run the studio tests until feature/cale/cms-master is merged in -# rake test_cms[false] || TESTS_FAILED=1 +rake test_cms[false] || TESTS_FAILED=1 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 -# Don't run the studio tests until feature/cale/cms-master is merged in -# rake phantomjs_jasmine_cms || true +rake phantomjs_jasmine_cms || true rake coverage:xml coverage:html [ $TESTS_FAILED == '0' ]