Merge pull request #21 from jpwhite4/unit_tests

Added existing unit tests to the travis build.
ubccr · Jan 10, 2017 · 2ac5ce1 · 2ac5ce1
2 parents 602505d + d53de8a
commit 2ac5ce1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 55 deletions.
diff --git a/.travis.build.sh b/.travis.build.sh
@@ -75,7 +75,7 @@ elif [ "$TEST_SUITE" = "style" ]; then
         fi
     done
 elif [ "$TEST_SUITE" = "unit" ]; then
-    open_xdmod/modules/xdmod/tests/runtests.sh
+    open_xdmod/modules/xdmod/tests/runtests.sh && classes/UnitTesting/RunTests.sh
     if [ $? != 0 ]; then
         build_exit_value=2
     fi

diff --git a/classes/UnitTesting/Regression/NumberOfJobsByResourceTest.php b/classes/UnitTesting/Regression/NumberOfJobsByResourceTest.php
diff --git a/classes/UnitTesting/RunTests.sh b/classes/UnitTesting/RunTests.sh
@@ -13,4 +13,5 @@ then
     PHPUNITARGS="${PHPUNITARGS} --coverage-html ../../html/phpunit"
 fi
 
+cd $(dirname $0)
 phpunit ${PHPUNITARGS} .