Actually run cms tests on cms master

3b75bbdc · Calen Pennington · c917725f · 3b75bbdc
Commit 3b75bbdc authored Dec 07, 2012 by Calen Pennington
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

jenkins/test.sh
+2 -4

No files found.
--- 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' ]