From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 26 Aug 2009 17:42:29 +0000 (+0100)
Subject: Ensure $ENV{PERL_CORE} is always set, but correctly tainted.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e447daf9e3940e576dd6b0451030ca27007189d9;p=p5sagit%2Fp5-mst-13.2.git

Ensure $ENV{PERL_CORE} is always set, but correctly tainted.

Hopefully a better solution than a19106168e3a7e2a. (change 19964)
---

diff --git a/t/TestInit.pm b/t/TestInit.pm
index 09097ef..15af57a 100644
--- a/t/TestInit.pm
+++ b/t/TestInit.pm
@@ -23,8 +23,10 @@ $VERSION = 1.01;
 chdir 't' if -d 't';
 @INC = '../lib';
 
-# Don't interfere with the taintedness of %ENV, this could perturbate tests
-$ENV{PERL_CORE} = 1 unless ${^TAINT};
+# Don't interfere with the taintedness of %ENV, this could perturbate tests.
+# This feels like a better solution than the original, from
+# http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2003-07/msg00154.html
+$ENV{PERL_CORE} = $^X;
 
 $0 =~ s/\.dp$//; # for the test.deparse make target
 1;