From 4cdca9f246e22f9def98c33aef2ca1cbea145e23 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Jun 25 2019 16:56:38 +0000 Subject: Fix incorrect directive Signed-off-by: Stephen Gallagher --- diff --git a/run_tests.sh b/run_tests.sh index f4cf5b0..9b542af 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -34,9 +34,9 @@ if [ "$BRANCH_TO" != "None" -a "$BRANCH_TO" != "" ]; then # If this branch is atop the master, use its tests (possibly updated). # Otherwise, check out origin/master for the latest tests. - set +x + set +e git merge-base --is-ancestor -- origin/master HEAD - set -x + set -e if [ $? -ne 0 ]; then git checkout origin/master fi @@ -50,9 +50,9 @@ git reset --hard $MODULE_DEFAULTS_TEST_UPDATED # If this branch is atop the master, use its tests (possibly updated). # Otherwise, check out origin/master for the latest tests. TEMPDIR= -set +x +set +e git merge-base --is-ancestor -- origin/master HEAD -set -x +set -e if [ $? -ne 0 ]; then TEMPDIR=$(mktemp -d) git clone $ORIGIN_REPO $TEMPDIR