From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Date: Tue, 28 Apr 2015 12:16:41 +0000 (+0100)
Subject: (travis) Fix short-circuiting logic
X-Git-Tag: 0.07043~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f05f6b69889a40f4d882b4e93d1c443105609229;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

(travis) Fix short-circuiting logic
---

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 374ed6e..3db9fc2 100755
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -16,7 +16,7 @@ $(free -m -t)
 
 CI_VM_MIN_FREE_MB=2000
 if [[ "$(free -m | grep 'buffers/cache:' | perl -p -e '$_ = (split /\s+/, $_)[3]')" -lt "$CI_VM_MIN_FREE_MB" ]]; then
-  SHORT_CIRCUIT_SMOKE=1
+  export SHORT_CIRCUIT_SMOKE=1
   echo_err "
 =============================================================================
 
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index d533b75..bfb8350 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -3,7 +3,7 @@
 # this file is executed in a subshell - set up the common stuff
 source maint/travis-ci_scripts/common.bash
 
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
 
 # poison the environment
 if [[ "$POISON_ENV" = "true" ]] ; then
diff --git a/maint/travis-ci_scripts/40_script.bash b/maint/travis-ci_scripts/40_script.bash
index f7488d5..5fbe85f 100755
--- a/maint/travis-ci_scripts/40_script.bash
+++ b/maint/travis-ci_scripts/40_script.bash
@@ -3,7 +3,7 @@
 # this file is executed in a subshell - set up the common stuff
 source maint/travis-ci_scripts/common.bash
 
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
 
 run_harness_tests() {
   local -x HARNESS_OPTIONS=c
diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index 3c0e4bd..0272590 100755
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -6,7 +6,7 @@
 # this file is executed in a subshell - set up the common stuff
 source maint/travis-ci_scripts/common.bash
 
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
 
 echo_err "Nothing to do"
 
diff --git a/maint/travis-ci_scripts/60_after_script.bash b/maint/travis-ci_scripts/60_after_script.bash
index 4935763..78e7c51 100755
--- a/maint/travis-ci_scripts/60_after_script.bash
+++ b/maint/travis-ci_scripts/60_after_script.bash
@@ -4,7 +4,7 @@
 # The source-line calling this script is commented out in .travis.yml
 
 source maint/travis-ci_scripts/common.bash
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
 
 echo_err "Nothing to do"