Combine exit codes of the two functional test runs

The script was only returning the exit code of the second of the
two test runs.  With this change, a failure of either either run
will correctly be reported as an error.

Change-Id: I81766dee2ac141ceddf683b50a2aef11a79f968b
Closes-bug: #1488693
This commit is contained in:
Dave McCowan 2015-09-20 15:44:58 -04:00
parent dc1b842dd9
commit b657dd00f1

View File

@ -32,7 +32,7 @@ testr slowest
SKIP=^\(\?\!\.\*\(ProjectQuotasPagingTestCase\|QuotaEnforcementTestCase\|ListingCAsTestCase\)\)
testr init
testr run $SKIP --parallel --subunit | subunit-trace --no-failure-debug -f
retval=$?
retval=$(($retval || $?))
testr slowest
exit $retval