ensure that the env var SV after C<{FOO}='x'> is PV only

3 files changed, 6 insertions, 2 deletions

diff --git a/ext/Devel-Peek/Changes b/ext/Devel-Peek/Changes
index 39bbf918da..0bd9583a7e 100644
--- a/ext/Devel-Peek/Changes
+++ b/ext/Devel-Peek/Changes
@@ -66,3 +66,5 @@
 1.02:
 	2004-10-22: Document "hash quality" output and update examples.
 
+1.09:
+	2012-07-23: Modify tests for 5.18's slightly different flags.
diff --git a/ext/Devel-Peek/Peek.pm b/ext/Devel-Peek/Peek.pm
index d066c9d8bc..7622efe3c2 100644
--- a/ext/Devel-Peek/Peek.pm
+++ b/ext/Devel-Peek/Peek.pm
@@ -3,7 +3,7 @@
 
 package Devel::Peek;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
diff --git a/ext/Devel-Peek/t/Peek.t b/ext/Devel-Peek/t/Peek.t
index dd9d102c3e..1d0de0d48b 100644
--- a/ext/Devel-Peek/t/Peek.t
+++ b/ext/Devel-Peek/t/Peek.t
@@ -542,6 +542,8 @@ do_test('scalar with pos magic',
 # TAINTEDDIR is not set on: OS2, AMIGAOS, WIN32, MSDOS
 # environment variables may be invisibly case-forced, hence the (?i:PATH)
 # C<scalar(@ARGV)> is turned into an IV on VMS hence the (?:IV)?
+# Perl 5.18 ensures all env vars end up as strings only, hence the (?:,pIOK)?
+# Perl 5.18 ensures even magic vars have public OK, hence the (?:,POK)?
 # VMS is setting FAKE and READONLY flags.  What VMS uses for storing
 # ENV hashes is also not always null terminated.
 #
@@ -549,7 +551,7 @@ do_test('tainted value in %ENV',
         $ENV{PATH}=@ARGV,  # scalar(@ARGV) is a handy known tainted value
 'SV = PVMG\\($ADDR\\) at $ADDR
   REFCNT = 1
-  FLAGS = \\(GMG,SMG,RMG,IOK,POK,pIOK,pPOK\\)
+  FLAGS = \\(GMG,SMG,RMG(?:,POK)?(?:,pIOK)?,pPOK\\)
   IV = 0
   NV = 0
   PV = $ADDR "0"\\\0