X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F40_script.bash;h=8cb904894b547a7950912940d1ec4b0a1565a04b;hb=9736be652a2d4ce442c222c17ba5d47fff28bbed;hp=0ad3961427f9b59f2e282019ebdeb6a7b46ddec9;hpb=f207111d67e64351cbae6f9c8c092735c681df1d;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/maint/travis-ci_scripts/40_script.bash b/maint/travis-ci_scripts/40_script.bash
index 0ad3961..8cb9048 100755
--- a/maint/travis-ci_scripts/40_script.bash
+++ b/maint/travis-ci_scripts/40_script.bash
@@ -4,7 +4,6 @@ source maint/travis-ci_scripts/common.bash
 if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 
 run_harness_tests() {
-  local -x HARNESS_TIMER=1
   local -x HARNESS_OPTIONS=c:j$NUMTHREADS
   make test 2> >(tee "$TEST_STDERR_LOG")
 }
@@ -15,7 +14,7 @@ if [[ "$CLEANTEST" = "true" ]] ; then
   run_or_err "Prepare blib" "make pure_all"
   run_harness_tests
 else
-  PROVECMD="prove --timer -lrswj$NUMTHREADS t xt"
+  PROVECMD="prove -lrswj$NUMTHREADS xt t"
 
   # FIXME - temporary, until Package::Stash is fixed
   if perl -M5.010 -e 1 &>/dev/null ; then
@@ -30,21 +29,24 @@ TEST_T1=$SECONDS
 if [[ -z "$DBICTRACE" ]] && [[ -z "$POISON_ENV" ]] && [[ -s "$TEST_STDERR_LOG" ]] ; then
   STDERR_LOG_SIZE=$(wc -l < "$TEST_STDERR_LOG")
 
-  echo
-  echo "Test run produced $STDERR_LOG_SIZE lines of output on STDERR:"
-  echo "============================================================="
-  cat "$TEST_STDERR_LOG"
-  echo "============================================================="
-  echo "End of test run STDERR output ($STDERR_LOG_SIZE lines)"
-  echo
-
-  if [[ -n "$INSTALLDEPS_SKIPPED_TESTLIST" ]] ; then
-    echo "The following non-essential tests were skipped during deps installation"
+  # prepend STDERR log
+  POSTMORTEM="$(
+    echo
+    echo "Test run produced $STDERR_LOG_SIZE lines of output on STDERR:"
     echo "============================================================="
-    echo "$INSTALLDEPS_SKIPPED_TESTLIST"
+    cat "$TEST_STDERR_LOG"
     echo "============================================================="
+    echo "End of test run STDERR output ($STDERR_LOG_SIZE lines)"
     echo
-  fi
+    echo
+  )$POSTMORTEM"
 fi
 
+echo
+echo "${POSTMORTEM:- \o/ No notable smoke run issues \o/ }"
+echo
 echo "$(tstamp) Testing took a total of $(( $TEST_T1 - $TEST_T0 ))s"
+if [[ -n "$INSTALLDEPS_OUT" ]] ; then
+  echo "$(tstamp) Full dep install log at $(/usr/bin/nopaste -q -s Shadowcat -d DepInstall <<< "$INSTALLDEPS_OUT")"
+fi
+echo