From 1c06a897aea7dc22ea5cdbb08300381bf1d46056 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Tue, 1 Apr 2014 07:18:07 -0400 Subject: [PATCH] Make run_tests.sh work with errexit Since the new 'which' commands return an error exit status when they don't find anything, the run_tests.sh would fail, as it sets errexit at the beginning. This patch ignores the error exit status from the which commands. Change-Id: I208f675acaa6b8f5536ce1f259ceeabaa841e1bc --- run_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index f0d3881b0..231462fa9 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -80,9 +80,9 @@ manage=0 # though using "python -m coverage" will fail in a # python 2.6 venv. Which is why we do what's below, # to make sure it works everywhere. -COVERAGE_CMD=`which coverage` +COVERAGE_CMD=`which coverage || true` if [ -z "${COVERAGE_CMD}" ] ; then - COVERAGE_CMD=`which python-coverage` + COVERAGE_CMD=`which python-coverage || true` fi if [ -z "${COVERAGE_CMD}" ] ; then COVERAGE_CMD="python -m coverage"