From: Peter Rabbitson <ribasushi@cpan.org>
Date: Thu, 29 Aug 2013 01:00:39 +0000 (+0200)
Subject: Do one poisoned env testrun with a threaded perl
X-Git-Tag: v0.08260~171
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=7c1a09fcbebf764c357dd74376dab0f9a880c92e

Do one poisoned env testrun with a threaded perl
---

diff --git a/.travis.yml b/.travis.yml
index 94f510b..b1fdcb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,10 +107,20 @@ matrix:
         - BREWVER=5.8.8
 
     # some permutations of tracing and envvar poisoning
+    - perl: 5.18.1_thr_mb
+      env:
+        - CLEANTEST=false
+        - POISON_ENV=true
+        - DBIC_TRACE=1
+        - DBIC_MULTICREATE_DEBUG=0
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=5.18.1
+
     - perl: 5.18
       env:
         - CLEANTEST=false
         - POISON_ENV=true
+        - DBIC_TRACE_PROFILE=console
 
     - perl: 5.18
       env:
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 42565c3..4cca4ab 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -7,7 +7,9 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 # ENVvars and set them to true and see if anything explodes
 if [[ "$POISON_ENV" = "true" ]] ; then
   for var in $(grep -P '\$ENV\{' -r lib/ | grep -oP 'DBIC_\w+' | sort -u | grep -v DBIC_TRACE) ; do
-    export $var=1
+    if [[ -z "${!var}" ]] ; then
+      export $var=1
+    fi
   done
 
   export DBI_DSN="dbi:ODBC:server=NonexistentServerAddress"