X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Frun_tests.sh;h=32c4f19e4d98c1cf386230df130a6f20d729cba5;hb=d2769a6197b3104d5ebaeb2e022e1d3dc7f353ea;hp=f253327e5dbeb9b9f68677502b22eb715e857902;hpb=23de47c859f84b7616d8345e96852bde83cd5ab5;p=yardstick.git

diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index f253327e5..32c4f19e4 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -29,8 +29,17 @@ run_tests() {
     echo "Running unittest ... "
     if [ $FILE_OPTION == "f" ]; then
         python -m unittest discover -v -s tests/unit > $logfile 2>&1
+        if [ $? -ne 0 ]; then
+            echo "FAILED, results in $logfile"
+            exit 1
+        fi
+        python -m unittest discover -v -s yardstick/tests/unit >> $logfile 2>&1
     else
         python -m unittest discover -v -s tests/unit
+        if [ $? -ne 0 ]; then
+            exit 1
+        fi
+        python -m unittest discover -v -s yardstick/tests/unit
     fi
 
     if [ $? -ne 0 ]; then
@@ -53,7 +62,7 @@ run_coverage() {
 run_functional_test() {
 
     mkdir -p .testrepository
-    python -m subunit.run discover tests/functional > .testrepository/subunit.log
+    python -m subunit.run discover yardstick/tests/functional > .testrepository/subunit.log
 
     subunit2pyunit < .testrepository/subunit.log
     EXIT_CODE=$?