X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F40_script.bash;h=21a1d8451233aa841b8b4294ca27d4f38026899f;hb=fd2c6658f74eda2831017727d3890dffd0eff06c;hp=189eae39eac99b1ec874130b8075a2fc82cb60fe;hpb=d8541ca37385f6d112bf251c0c8ea6a628abcc9b;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/40_script.bash b/maint/travis-ci_scripts/40_script.bash
index 189eae3..21a1d84 100755
--- a/maint/travis-ci_scripts/40_script.bash
+++ b/maint/travis-ci_scripts/40_script.bash
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# 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:j$NUMTHREADS
@@ -26,7 +28,7 @@ else
 fi
 TEST_T1=$SECONDS
 
-if [[ -z "$DBICTRACE" ]] && [[ -z "$POISON_ENV" ]] && [[ -s "$TEST_STDERR_LOG" ]] ; then
+if [[ -z "$DBIC_TRACE" ]] && [[ -z "$DBIC_MULTICREATE_DEBUG" ]] && [[ -s "$TEST_STDERR_LOG" ]] ; then
   STDERR_LOG_SIZE=$(wc -l < "$TEST_STDERR_LOG")
 
   # prepend STDERR log
@@ -38,6 +40,7 @@ if [[ -z "$DBICTRACE" ]] && [[ -z "$POISON_ENV" ]] && [[ -s "$TEST_STDERR_LOG" ]
     echo "============================================================="
     echo "End of test run STDERR output ($STDERR_LOG_SIZE lines)"
     echo
+    echo
   )$POSTMORTEM"
 fi