Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
TC042 bug fix
[yardstick.git]
/
tools
/
run_tests.sh
diff --git
a/tools/run_tests.sh
b/tools/run_tests.sh
index
f253327
..
32c4f19
100755
(executable)
--- 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
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
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
fi
if [ $? -ne 0 ]; then
@@
-53,7
+62,7
@@
run_coverage() {
run_functional_test() {
mkdir -p .testrepository
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=$?
subunit2pyunit < .testrepository/subunit.log
EXIT_CODE=$?