summaryrefslogtreecommitdiffstats
path: root/tools/run_tests.sh
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-01-11 16:00:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-11 16:00:31 +0000
commit94d3b53e1e079a6f0b2ec1e5106e19067a0c00a9 (patch)
treec9923ac1f26974fb255dc1f775d67786e5a651e1 /tools/run_tests.sh
parent80dc9034edeb05f66bfa6264ae0adf0f6aea60da (diff)
parent5fcde48fcbac8840e128ebadb8acc563e4f3dc7b (diff)
Merge "Run tests in yardstick/tests/"
Diffstat (limited to 'tools/run_tests.sh')
-rwxr-xr-xtools/run_tests.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index f253327e5..ddb5e55af 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -29,8 +29,10 @@ run_tests() {
echo "Running unittest ... "
if [ $FILE_OPTION == "f" ]; then
python -m unittest discover -v -s tests/unit > $logfile 2>&1
+ python -m unittest discover -v -s yardstick/tests/unit >> $logfile 2>&1
else
python -m unittest discover -v -s tests/unit
+ python -m unittest discover -v -s yardstick/tests/unit
fi
if [ $? -ne 0 ]; then
@@ -53,7 +55,8 @@ 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
+ python -m subunit.run discover tests/functional >> .testrepository/subunit.log
subunit2pyunit < .testrepository/subunit.log
EXIT_CODE=$?