From: H.Merijn Brand - Tux <h.m.brand@xs4all.nl>
Date: Sat, 17 Aug 2013 16:16:02 +0000 (+0200)
Subject: sv_dump () changed in 5.19.3
X-Git-Tag: v0.39~1
X-Git-Url: https://repo.or.cz/w/Data-Peek.git/commitdiff_plain/b547cce0e63cccecf1b616bdc1f304f89db178bd

sv_dump () changed in 5.19.3

We now have Is_COW / COW_REFCNT
The PV part is not always there for numerics
---

diff --git a/ChangeLog b/ChangeLog
index 698518b..44ed473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.39	- 2013-01-21, H.Merijn Brand   <h.m.brand@xs4all.nl>
+0.39	- 2013-08-17, H.Merijn Brand   <h.m.brand@xs4all.nl>
     * Upped copyright to 2013
+    * Add alternative test results for 5.19.3 and up (COW and no PV for IV)
 
 0.38	- 2012-05-29, H.Merijn Brand   <h.m.brand@xs4all.nl>
     * Backslashed { in regex in test to satisfy perl-5.17
diff --git a/t/30_DDump-s.t b/t/30_DDump-s.t
index 2844740..c9a13d0 100644
--- a/t/30_DDump-s.t
+++ b/t/30_DDump-s.t
@@ -24,7 +24,7 @@ my @nl = ("\\n") x 2;
 my $var = "";
 
 foreach my $test (@tests) {
-    my ($in, $out) = split m/\n--\n/ => $test;
+    my ($in, $expect) = split m/\n--\n/ => $test;
     $in eq "" and next;
     SKIP: {
 	eval "\$var = $in;";
@@ -38,23 +38,33 @@ foreach my $test (@tests) {
 		@nl = ($dump =~ m/PV = 0x\w+ "([^"]+)".*"([^"]+)"/);
 		diag "# This perl dumps \\n as (@nl)";
 		# Catch differences in \n
-		$dump =~ s/"ab\Q$nl[0]\E(.*?)"ab\Q$nl[1]\E/"ab\\n$1"ab\\n/;
+		$dump =~ s/"ab\Q$nl[0]\E(.*?)"ab\Q$nl[1]\E/"ab\\n$1"ab\\n/g;
 		}
 	    }
 
 	$dump =~ s/\b0x[0-9a-f]+\b/0x****/g;
 	$dump =~ s/\b(REFCNT =) [0-9]{4,}/$1 -1/g;
 
-	$dump =~ s/\bLEN = (?:[1-9]|1[0-6])\b/LEN = 8/;	# aligned at long long?
+	$dump =~ s/\bLEN = (?:[1-9]|1[0-6])\b/LEN = 8/g; # aligned at long long?
 
 	$dump =~ s/\bPADBUSY\b,?//g	if $] < 5.010;
 
 	$dump =~ s/\bUV = /IV = /g	if $] < 5.008;
 	$dump =~ s/,?\bIsUV\b//g	if $] < 5.008;
 
-	$in =~ s/[\s\n]+/ /g;
+	my @expect = split m/(?<=\n)\|\n+/ => $expect;
 
-	is ($dump, $out, "DDump ($in)");
+	$in   =~ s/[\s\n]+/ /g;
+
+	my @match = grep { $dump eq $_ } @expect;
+	if (@match == 1) {
+	    is ($dump, $match[0], "DDump ($in)");
+	    }
+	else {
+	    my $match = shift @expect;
+	    is ($dump, $match, "DDump ($in)");
+	    diag ("DDump ($in) neither matches\n$_") for @expect;
+	    }
 	}
     }
 
@@ -69,6 +79,11 @@ SV = PV(0x****) at 0x****
   PV = 0x**** ""\0
   CUR = 0
   LEN = 8
+|
+SV = PV(0x****) at 0x****
+  REFCNT = 1
+  FLAGS = (PADMY)
+  PV = 0
 ==
 0
 --
@@ -79,6 +94,12 @@ SV = PVIV(0x****) at 0x****
   PV = 0x**** ""\0
   CUR = 0
   LEN = 8
+|
+SV = PVIV(0x****) at 0x****
+  REFCNT = 1
+  FLAGS = (PADMY,IOK,pIOK)
+  IV = 0
+  PV = 0
 ==
 1
 --
@@ -89,6 +110,12 @@ SV = PVIV(0x****) at 0x****
   PV = 0x**** ""\0
   CUR = 0
   LEN = 8
+|
+SV = PVIV(0x****) at 0x****
+  REFCNT = 1
+  FLAGS = (PADMY,IOK,pIOK)
+  IV = 1
+  PV = 0
 ==
 ""
 --
@@ -99,3 +126,12 @@ SV = PVIV(0x****) at 0x****
   PV = 0x**** ""\0
   CUR = 0
   LEN = 8
+|
+SV = PVIV(0x****) at 0x****
+  REFCNT = 1
+  FLAGS = (PADMY,POK,IsCOW,pPOK)
+  IV = 1
+  PV = 0x**** ""\0
+  CUR = 0
+  LEN = 8
+  COW_REFCNT = 0