From b657dd00f1ecf3567146375065e35f9c4884e4ac Mon Sep 17 00:00:00 2001
From: Dave McCowan <dmccowan@cisco.com>
Date: Sun, 20 Sep 2015 15:44:58 -0400
Subject: [PATCH] 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
---
 functionaltests/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functionaltests/run_tests.sh b/functionaltests/run_tests.sh
index da9f400cd..86752f61a 100755
--- a/functionaltests/run_tests.sh
+++ b/functionaltests/run_tests.sh
@@ -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