Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Convert IXIA latency statistics to integer"
[yardstick.git]
/
tools
/
run_tests.sh
diff --git
a/tools/run_tests.sh
b/tools/run_tests.sh
index
ddb5e55
..
49f628e
100755
(executable)
--- a/
tools/run_tests.sh
+++ b/
tools/run_tests.sh
@@
-28,10
+28,8
@@
run_tests() {
echo "Running unittest ... "
if [ $FILE_OPTION == "f" ]; then
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
+ python -m unittest discover -v -s yardstick/tests/unit > $logfile 2>&1
else
else
- python -m unittest discover -v -s tests/unit
python -m unittest discover -v -s yardstick/tests/unit
fi
python -m unittest discover -v -s yardstick/tests/unit
fi
@@
-56,7
+54,6
@@
run_functional_test() {
mkdir -p .testrepository
python -m subunit.run discover yardstick/tests/functional > .testrepository/subunit.log
mkdir -p .testrepository
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=$?
subunit2pyunit < .testrepository/subunit.log
EXIT_CODE=$?