Change 23895 by [EMAIL PROTECTED] on 2005/01/28 20:28:38

        (Just the tests from)
        Integrate:
        [ 22663]
        Make the ! suffix handle n/N/v/V as signed integers
        within pack templates.
        
        [ 22734]
        Subject: [PATCH for testing/review] byte-order modifiers for (un)pack 
templates
        From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
        Date: Wed, 21 Apr 2004 21:09:20 +0200
        Message-Id: <[EMAIL PROTECTED]>
        
        [ 22780]
        Add byte-order group modifiers to (un)pack templates.
        Follow-up on: #22734, #22745, #22753, #22754.
        
        Subject: Group modifiers in (un)pack templates
        From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
        Date: Mon, 3 May 2004 20:14:41 +0200
        Message-Id: <[EMAIL PROTECTED]>
        
        [ 23850]
        Name another pack test
        
        [ 23884]
        Make the tests for the endianness modifiers < and >, and the
        signnedness modifier ! conditional on perl version. Surprisingly
        little change needed.
        
        [ 23886]
        Check that the warning behaviour on the modifiers !, < and > is as we
        expect it for this perl.
        
        [ 23888]
        Oops. Was forgetting to test n! N! v! V! in pack

Affected files ...

... //depot/maint-5.8/perl/t/op/pack.t#18 integrate

Differences ...

==== //depot/maint-5.8/perl/t/op/pack.t#18 (xtext) ====
Index: perl/t/op/pack.t
--- perl/t/op/pack.t#17~23885~  Thu Jan 27 05:24:09 2005
+++ perl/t/op/pack.t    Fri Jan 28 12:28:38 2005
@@ -6,7 +6,13 @@
     require './test.pl';
 }
 
-plan tests => 5852;
+# This is truth in an if statement, and could be a skip message
+my $no_endianness = $] > 5.009 ? '' :
+  "Endianness pack modifiers not available on this perl";
+my $no_signedness = $] > 5.009 ? '' :
+  "Signed/unsigned pack modifiers not available on this perl";
+
+plan tests => 13855;
 
 use strict;
 use warnings;
@@ -14,6 +20,47 @@
 
 my $Is_EBCDIC = (defined $Config{ebcdic} && $Config{ebcdic} eq 'define');
 my $Perl = which_perl();
+my @valid_errors = (qr/^Invalid type '\w'/);
+
+my $ByteOrder = 'unknown';
+my $maybe_not_avail = '(?:hto[bl]e|[bl]etoh)';
+if ($no_endianness) {
+  push @valid_errors, qr/^Invalid type '[<>]'/;
+} elsif ($Config{byteorder} =~ /^1234(?:5678)?$/) {
+  $ByteOrder = 'little';
+  $maybe_not_avail = '(?:htobe|betoh)';
+}
+elsif ($Config{byteorder} =~ /^(?:8765)?4321$/) {
+  $ByteOrder = 'big';
+  $maybe_not_avail = '(?:htole|letoh)';
+}
+else {
+  push @valid_errors, qr/^Can't (?:un)?pack (?:big|little)-endian .*? on this 
platform/;
+}
+
+if ($no_signedness) {
+  push @valid_errors, qr/^'!' allowed only after types sSiIlLxX in 
(?:un)?pack/;
+}
+
+for my $size ( 16, 32, 64 ) {
+  if (exists $Config{"u${size}size"} and $Config{"u${size}size"} != ($size >> 
3)) {
+    push @valid_errors, qr/^Perl_my_$maybe_not_avail$size\(\) not available/;
+  }
+}
+
+my $IsTwosComplement = pack('i', -1) eq "\xFF" x $Config{intsize};
+print "# \$IsTwosComplement = $IsTwosComplement\n";
+
+sub is_valid_error
+{
+  my $err = shift;
+
+  for my $e (@valid_errors) {
+    $err =~ $e and return 1;
+  }
+
+  return 0;
+}
 
 sub encode_list {
   my @result = map {_qq($_)} @_;
@@ -177,6 +224,73 @@
   eval { $x = pack 'w', '1'x(1 + length ~0) . 'e0' };
   like ($@, qr/^Can only compress unsigned integers/);
 
+  # Check that the warning behaviour on the modifiers !, < and > is as we
+  # expect it for this perl.
+  my $can_endian = $no_endianness ? '' : 'sSiIlLqQjJfFdDpP';
+  my $can_shriek = 'sSiIlL';
+  $can_shriek .= 'nNvV' unless $no_signedness;
+  # h and H can't do either, so act as sanity checks in blead
+  foreach my $base (split '', 'hHsSiIlLqQjJfFdDpPnNvV') {
+    foreach my $mod ('', '<', '>', '!', '<!', '>!', '!<', '!>') {
+    SKIP: {
+       # Avoid void context warnings.
+       my $a = eval {pack "$base$mod"};
+       skip "pack can't $base", 1 if $@ =~ /^Invalid type '\w'/;
+       # Which error you get when 2 would be possible seems to be emergent
+       # behaviour of pack's format parser.
+
+       my $fails_shriek = $mod =~ /!/ && index ($can_shriek, $base) == -1;
+       my $fails_endian = $mod =~ /[<>]/ && index ($can_endian, $base) == -1;
+       my $shriek_first = $mod =~ /^!/;
+
+       if ($no_endianness and ($mod eq '<!' or $mod eq '>!')) {
+         # The ! isn't seem as part of $base. Instead it's seen as a modifier
+         # on > or <
+         $fails_shriek = 1;
+         undef $fails_endian;
+       } elsif ($fails_shriek and $fails_endian) {
+         if ($shriek_first) {
+           undef $fails_endian;
+         }
+       }
+
+       if ($fails_endian) {
+         if ($no_endianness) {
+           # < and > are seen as pattern letters, not modifiers
+           like ($@, qr/^Invalid type '[<>]'/, "pack can't $base$mod");
+         } else {
+           like ($@, qr/^'[<>]' allowed only after types/,
+                 "pack can't $base$mod");
+         }
+       } elsif ($fails_shriek) {
+         like ($@, qr/^'!' allowed only after types/,
+               "pack can't $base$mod");
+       } else {
+         is ($@, '', "pack can $base$mod");
+       }
+      }
+    }
+  }
+
+ SKIP: {
+    skip $no_endianness, 2*3 + 2*8 if $no_endianness;
+    for my $mod (qw( ! < > )) {
+      eval { $x = pack "a$mod", 42 };
+      like ($@, qr/^'$mod' allowed only after types \S+ in pack/);
+
+      eval { $x = unpack "a$mod", 'x'x8 };
+      like ($@, qr/^'$mod' allowed only after types \S+ in unpack/);
+    }
+
+    for my $mod (qw( <> >< !<> !>< <!> >!< <>! ><! )) {
+      eval { $x = pack "sI${mod}s", 42, 47, 11 };
+      like ($@, qr/^Can't use both '<' and '>' after type 'I' in pack/);
+
+      eval { $x = unpack "sI${mod}s", 'x'x16 };
+      like ($@, qr/^Can't use both '<' and '>' after type 'I' in unpack/);
+    }
+  }
+
  SKIP: {
     # Is this a stupid thing to do on VMS, VOS and other unusual platforms?
 
@@ -192,7 +306,7 @@
           ($^O =~ /^svr4/ && -f "/etc/issue" && -f "/etc/.relid") # NCR MP-RAS
           );
 
-    my $inf = eval '2**10000';
+    my $inf = eval '2**1000000';
 
     skip("Couldn't generate infinity - got error '$@'", 1)
       unless defined $inf and $inf == $inf / 2 and $inf + 1 == $inf;
@@ -229,7 +343,7 @@
     # I'm getting about 1e-16 on FreeBSD
     my $quotient = int (100 * ($y - $big) / $big);
     ok($quotient < 2 && $quotient > -2,
-       "Round trip pack, unpack 'w' of $big is withing 1% ($quotient%)");
+       "Round trip pack, unpack 'w' of $big is within 1% ($quotient%)");
   }
 
 }
@@ -238,9 +352,18 @@
 
 # literals
 is(unpack("p",pack("p","foo")), "foo");
-
+SKIP: {
+  skip $no_endianness, 2 if $no_endianness;
+  is(unpack("p<",pack("p<","foo")), "foo");
+  is(unpack("p>",pack("p>","foo")), "foo");
+}
 # scalars
 is(unpack("p",pack("p",239)), 239);
+SKIP: {
+  skip $no_endianness, 2 if $no_endianness;
+  is(unpack("p<",pack("p<",239)), 239);
+  is(unpack("p>",pack("p>",239)), 239);
+}
 
 # temps
 sub foo { my $a = "a"; return $a . $a++ . $a++ }
@@ -256,24 +379,43 @@
 }
 
 # undef should give null pointer
-like(pack("p", undef), qr/^\0+/);
+like(pack("p", undef), qr/^\0+$/);
+SKIP: {
+  skip $no_endianness, 2 if $no_endianness;
+  like(pack("p<", undef), qr/^\0+$/);
+  like(pack("p>", undef), qr/^\0+$/);
+}
 
 # Check for optimizer bug (e.g.  Digital Unix GEM cc with -O4 on DU V4.0B gives
 #                                4294967295 instead of -1)
 #                               see #ifdef __osf__ in pp.c pp_unpack
 is((unpack("i",pack("i",-1))), -1);
 
-print "# test the pack lengths of s S i I l L n N v V\n";
+print "# test the pack lengths of s S i I l L n N v V + modifiers\n";
 
-my @lengths = qw(s 2 S 2 i -4 I -4 l 4 L 4 n 2 N 4 v 2 V 4);
-while (my ($format, $expect) = splice @lengths, 0, 2) {
-  my $len = length(pack($format, 0));
-  if ($expect > 0) {
-    is($expect, $len, "format '$format'");
-  } else {
-    $expect = -$expect;
-    ok ($len >= $expect, "format '$format'") ||
-      print "# format '$format' has length $len, expected >= $expect\n";
+my @lengths = (
+  qw(s 2 S 2 i -4 I -4 l 4 L 4 n 2 N 4 v 2 V 4 n! 2 N! 4 v! 2 V! 4),
+  's!'  => $Config{shortsize}, 'S!'  => $Config{shortsize},
+  'i!'  => $Config{intsize},   'I!'  => $Config{intsize},
+  'l!'  => $Config{longsize},  'L!'  => $Config{longsize},
+);
+
+while (my ($base, $expect) = splice @lengths, 0, 2) {
+  my @formats = ($base);
+  $base =~ /^[nv]/i or push @formats, "$base>", "$base<";
+  for my $format (@formats) {
+  SKIP: {
+      skip $no_endianness, 1 if $no_endianness && $format =~ m/[<>]/;
+      skip $no_signedness, 1 if $no_signedness && $format =~ /[nNvV]!/;
+      my $len = length(pack($format, 0));
+      if ($expect > 0) {
+       is($expect, $len, "format '$format'");
+      } else {
+       $expect = -$expect;
+       ok ($len >= $expect, "format '$format'") ||
+         print "# format '$format' has length $len, expected >= $expect\n";
+      }
+    }
   }
 }
 
@@ -282,18 +424,18 @@
 
 my @templates = qw(c C i I s S l L n N v V f d q Q);
 
-foreach my $t (@templates) {
-    SKIP: {
-        my @t = eval { unpack("$t*", pack("$t*", 12, 34)) };
+foreach my $base (@templates) {
+    my @tmpl = ($base);
+    $base =~ /^[cnv]/i or push @tmpl, "$base>", "$base<";
+    foreach my $t (@tmpl) {
+        SKIP: {
+            my @t = eval { unpack("$t*", pack("$t*", 12, 34)) };
 
-        # quads not supported everywhere
-        skip "Quads not supported", 4 if $@ =~ /Invalid type/;
-        is( $@, '' );
+            skip "cannot pack '$t' on this perl", 4
+              if is_valid_error($@);
 
-        is(scalar @t, 2);
-
-        SKIP: {
-            skip "$t not expected to work for some reason", 2 if $t =~ /[nv]/i;
+            is( $@, '', "Template $t works");
+            is(scalar @t, 2);
 
             is($t[0], 12);
             is($t[1], 34);
@@ -386,8 +528,12 @@
 is(length(pack("i!", 0)), length(pack("i", 0)));
 
 sub numbers {
-  my $format = shift;
-  return numbers_with_total ($format, undef, @_);
+  my $base = shift;
+  my @formats = ($base);
+  $base =~ /^[silqjfdp]/i and push @formats, "$base>", "$base<";
+  for my $format (@formats) {
+    numbers_with_total ($format, undef, @_);
+  }
 }
 
 sub numbers_with_total {
@@ -402,8 +548,8 @@
   foreach (@_) {
     SKIP: {
         my $out = eval {unpack($format, pack($format, $_))};
-        skip "cannot pack '$format' on this perl", 2 if
-          $@ =~ /Invalid type '$format'/;
+        skip "cannot pack '$format' on this perl", 2
+          if is_valid_error($@);
 
         is($@, '', "no error");
         is($out, $_, "unpack pack $format $_");
@@ -423,7 +569,7 @@
     SKIP: {
       my $sum = eval {unpack "%$_$format*", pack "$format*", @_};
       skip "cannot pack '$format' on this perl", 3
-        if $@ =~ /Invalid type '$format'/;
+        if is_valid_error($@);
 
       is($@, '', "no error");
       ok(defined $sum, "sum bits $_, format $format defined");
@@ -510,6 +656,10 @@
 numbers ('v', 0, 1, 32767, 32768, 65535);
 numbers ('N', 0, 1, 2147483647, 2147483648, 4294967295);
 numbers ('V', 0, 1, 2147483647, 2147483648, 4294967295);
+numbers ('n!', -32768, -1, 0, 1, 32767);
+numbers ('v!', -32768, -1, 0, 1, 32767);
+numbers ('N!', -2147483648, -1, 0, 1, 2147483647);
+numbers ('V!', -2147483648, -1, 0, 1, 2147483647);
 # All these should have exact binary representations:
 numbers ('f', -1, 0, 0.5, 42, 2**34);
 numbers ('d', -(2**34), -1, 0, 1, 2**34);
@@ -539,6 +689,125 @@
 is(pack("N", 0xdeadbeef), "\xde\xad\xbe\xef");
 is(pack("V", 0xdeadbeef), "\xef\xbe\xad\xde");
 
+SKIP: {
+  skip $no_signedness, 4 if $no_signedness;
+  is(pack("n!", 0xdead), "\xde\xad");
+  is(pack("v!", 0xdead), "\xad\xde");
+  is(pack("N!", 0xdeadbeef), "\xde\xad\xbe\xef");
+  is(pack("V!", 0xdeadbeef), "\xef\xbe\xad\xde");
+}
+
+print "# test big-/little-endian conversion\n";
+
+sub byteorder
+{
+  my $format = shift;
+  print "# byteorder test for $format\n";
+  for my $value (@_) {
+    SKIP: {
+      my($nat,$be,$le) = eval { map { pack $format.$_, $value } '', '>', '<' };
+      skip "cannot pack '$format' on this perl", 5
+        if is_valid_error($@);
+
+      print "# [EMAIL PROTECTED]";
+
+      SKIP: {
+        skip "cannot compare native byteorder with big-/little-endian", 1
+            if $ByteOrder eq 'unknown';
+
+        is($nat, $ByteOrder eq 'big' ? $be : $le);
+      }
+      is($be, reverse($le));
+      my @x = eval { unpack "$format$format>$format<", $nat.$be.$le };
+
+      print "# [$value][", join('][', @x), "[EMAIL PROTECTED]";
+
+      is($@, '');
+      is($x[0], $x[1]);
+      is($x[0], $x[2]);
+    }
+  }
+}
+
+byteorder('s', -32768, -1, 0, 1, 32767);
+byteorder('S', 0, 1, 32767, 32768, 65535);
+byteorder('i', -2147483648, -1, 0, 1, 2147483647);
+byteorder('I', 0, 1, 2147483647, 2147483648, 4294967295);
+byteorder('l', -2147483648, -1, 0, 1, 2147483647);
+byteorder('L', 0, 1, 2147483647, 2147483648, 4294967295);
+byteorder('j', -2147483648, -1, 0, 1, 2147483647);
+byteorder('J', 0, 1, 2147483647, 2147483648, 4294967295);
+byteorder('s!', -32768, -1, 0, 1, 32767);
+byteorder('S!', 0, 1, 32767, 32768, 65535);
+byteorder('i!', -2147483648, -1, 0, 1, 2147483647);
+byteorder('I!', 0, 1, 2147483647, 2147483648, 4294967295);
+byteorder('l!', -2147483648, -1, 0, 1, 2147483647);
+byteorder('L!', 0, 1, 2147483647, 2147483648, 4294967295);
+byteorder('q', -9223372036854775808, -1, 0, 1, 9223372036854775807);
+byteorder('Q', 0, 1, 9223372036854775807, 9223372036854775808, 
18446744073709551615);
+byteorder('f', -1, 0, 0.5, 42, 2**34);
+byteorder('F', -1, 0, 0.5, 42, 2**34);
+byteorder('d', -(2**34), -1, 0, 1, 2**34);
+byteorder('D', -(2**34), -1, 0, 1, 2**34);
+
+print "# test negative numbers\n";
+
+SKIP: {
+  skip "platform is not using two's complement for negative integers", 120
+    unless $IsTwosComplement;
+
+  for my $format (qw(s i l j s! i! l! q)) {
+    SKIP: {
+      my($nat,$be,$le) = eval { map { pack $format.$_, -1 } '', '>', '<' };
+      skip "cannot pack '$format' on this perl", 15
+        if is_valid_error($@);
+
+      my $len = length $nat;
+      is($_, "\xFF"x$len) for $nat, $be, $le;
+
+      my(@val,@ref);
+      if ($len >= 8) {
+        @val = (-2, -81985529216486896, -9223372036854775808);
+        @ref = ("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE",
+                "\xFE\xDC\xBA\x98\x76\x54\x32\x10",
+                "\x80\x00\x00\x00\x00\x00\x00\x00");
+      }
+      elsif ($len >= 4) {
+        @val = (-2, -19088744, -2147483648);
+        @ref = ("\xFF\xFF\xFF\xFE",
+                "\xFE\xDC\xBA\x98",
+                "\x80\x00\x00\x00");
+      }
+      else {
+        @val = (-2, -292, -32768);
+        @ref = ("\xFF\xFE",
+                "\xFE\xDC",
+                "\x80\x00");
+      }
+      for my $x (@ref) {
+        if ($len > length $x) {
+          $x = $x . "\xFF" x ($len - length $x);
+        }
+      }
+
+      for my $i (0 .. $#val) {
+        my($nat,$be,$le) = eval { map { pack $format.$_, $val[$i] } '', '>', 
'<' };
+        is($@, '');
+
+        SKIP: {
+          skip "cannot compare native byteorder with big-/little-endian", 1
+              if $ByteOrder eq 'unknown';
+
+          is($nat, $ByteOrder eq 'big' ? $be : $le);
+        }
+
+        is($be, $ref[$i]);
+        is($be, reverse($le));
+      }
+    }
+  }
+}
+
 {
   # /
 
@@ -675,7 +944,7 @@
     {
         local $SIG{__WARN__} = sub { $@ = "@_" };
         my @null = unpack('U0U', chr(255));
-        like($@, /^Malformed UTF-8 character /);
+        like($@, qr/^Malformed UTF-8 character /);
     }
 }
 
@@ -784,6 +1053,78 @@
     is(scalar unpack("w/a*", "\x02abc"), "ab");
 }
 
+SKIP: {
+  print "# group modifiers\n";
+
+  skip $no_endianness, 3 * 2 + 3 * 2 + 1 if $no_endianness;
+
+  for my $t (qw{ (s<)< (sl>s)> (s(l(sl)<l)s)< }) {
+    print "# testing pattern '$t'\n";
+    eval { ($_) = unpack($t, 'x'x18); };
+    is($@, '');
+    eval { $_ = pack($t, (0)x6); };
+    is($@, '');
+  }
+
+  for my $t (qw{ (s<)> (sl>s)< (s(l(sl)<l)s)> }) {
+    print "# testing pattern '$t'\n";
+    eval { ($_) = unpack($t, 'x'x18); };
+    like($@, qr/Can't use '[<>]' in a group with different byte-order in 
unpack/);
+    eval { $_ = pack($t, (0)x6); };
+    like($@, qr/Can't use '[<>]' in a group with different byte-order in 
pack/);
+  }
+
+  is(pack('L<L>', (0x12345678)x2),
+     pack('(((L1)1)<)(((L)1)1)>1', (0x12345678)x2));
+}
+
+{
+  sub compress_template {
+    my $t = shift;
+    for my $mod (qw( < > )) {
+      $t =~ 
s/((?:(?:[SILQJFDP]!?$mod|[^SILQJFDP\W]!?)(?:\d+|\*|\[(?:[^]]+)\])?\/?){2,})/
+              my $x = $1; $x =~ s!$mod!!g ? "($x)$mod" : $x /ieg;
+    }
+    return $t;
+  }
+
+  my %templates = (
+    's<'                  => [-42],
+    's<c2x![S]S<'         => [-42, -11, 12, 4711],
+    '(i<j<[s]l<)3'        => [-11, -22, -33, 1000000, 1100, 2201, 3302,
+                              -1000000, 32767, -32768, 1, -123456789 ],
+    '(I!<4(J<2L<)3)5'     => [1 .. 65],
+    'q<Q<'                => [-50000000005, 60000000006],
+    'f<F<d<'              => [3.14159, 111.11, 2222.22],
+    'D<cCD<'              => [1e42, -128, 255, 1e-42],
+    'n/a*'                => ['/usr/bin/perl'],
+    'C/a*S</A*L</Z*I</a*' => [qw(Just another Perl hacker)],
+  );
+
+  for my $tle (sort keys %templates) {
+    my @d = @{$templates{$tle}};
+    my $tbe = $tle;
+    $tbe =~ y/</>/;
+    for my $t ($tbe, $tle) {
+      my $c = compress_template($t);
+      print "# '$t' -> '$c'\n";
+      SKIP: {
+        my $p1 = eval { pack $t, @d };
+        skip "cannot pack '$t' on this perl", 5 if is_valid_error($@);
+        my $p2 = eval { pack $c, @d };
+        is($@, '');
+        is($p1, $p2);
+        s!(/[aAZ])\*!$1!g for $t, $c;
+        my @u1 = eval { unpack $t, $p1 };
+        is($@, '');
+        my @u2 = eval { unpack $c, $p2 };
+        is($@, '');
+        is(join('!', @u1), join('!', @u2));
+      }
+    }
+  }
+}
+
 {
     # from Wolfgang Laun: fix in change #13163
 
@@ -944,6 +1285,20 @@
   eval { my @a = unpack( "C/", "\3" ); };
   like( $@, qr{Code missing after '/'} );
 
+ SKIP: {
+    skip $no_endianness, 6 if $no_endianness;
+
+    # modifier warnings
+    @warning = ();
+    $x = pack "I>>s!!", 47, 11;
+    ($x) = unpack "I<<l!>!>", 'x'x20;
+    is(scalar @warning, 5);
+    like($warning[0], qr/Duplicate modifier '>' after 'I' in pack/);
+    like($warning[1], qr/Duplicate modifier '!' after 's' in pack/);
+    like($warning[2], qr/Duplicate modifier '<' after 'I' in unpack/);
+    like($warning[3], qr/Duplicate modifier '!' after 'l' in unpack/);
+    like($warning[4], qr/Duplicate modifier '>' after 'l' in unpack/);
+  }
 }
 
 {  # Repeat count [SUBEXPR]
@@ -953,7 +1308,7 @@
    if (eval { pack 'q', 1 } ) {
      push @codes, qw(q Q);
    } else {
-     push @codes, qw(c C);     # Keep the count the same
+     push @codes, qw(s S);     # Keep the count the same
    }
    if (eval { pack 'D', 1 } ) {
      push @codes, 'D';
@@ -961,6 +1316,8 @@
      push @codes, 'd'; # Keep the count the same
    }
 
+   push @codes, map { /^[silqjfdp]/i ? ("$_<", "$_>") : () } @codes;
+
    my %val;
    @[EMAIL PROTECTED] = map { / [Xx]  (?{ undef })
                        | [AZa] (?{ 'something' })
@@ -989,18 +1346,23 @@
           $c = $1 if $groupend =~ /(\d+)/;
           my @list2 = (@list1) x $c;
 
-          my $junk1 = "$groupbegin $type$count $groupend";
-          # print "# junk1=$junk1\n";
-          my $p = pack $junk1, @list2;
-          my $half = int( (length $p)/2 );
-          for my $move ('', "X$half", "X!$half", 'x1', 'x!8', "x$half") {
-            my $junk = "$junk1 $move";
-            # print "# junk='$junk', list=(@list2)\n";
-            $p = pack "$junk $end", @list2, @end;
-            my @l = unpack "x[$junk] $end", $p;
-            is(scalar @l, scalar @end);
-            is("@l", "@end", "skipping x[$junk]");
-          }
+           SKIP: {
+            my $junk1 = "$groupbegin $type$count $groupend";
+            # print "# junk1=$junk1\n";
+            my $p = eval { pack $junk1, @list2 };
+             skip "cannot pack '$type' on this perl", 12
+               if is_valid_error($@);
+
+            my $half = int( (length $p)/2 );
+            for my $move ('', "X$half", "X!$half", 'x1', 'x!8', "x$half") {
+              my $junk = "$junk1 $move";
+              # print "# junk='$junk', list=(@list2)\n";
+              $p = pack "$junk $end", @list2, @end;
+              my @l = unpack "x[$junk] $end", $p;
+              is(scalar @l, scalar @end);
+              is("@l", "@end", "skipping x[$junk]");
+            }
+           }
        }
      }
    }
@@ -1063,7 +1425,7 @@
 SKIP: {
     my $t = eval { unpack("D*", pack("D", 12.34)) };
 
-    skip "Long doubles not in use", 56 if $@ =~ /Invalid type/;
+    skip "Long doubles not in use", 166 if $@ =~ /Invalid type/;
 
     is(length(pack("D", 0)), $Config{longdblsize});
     numbers ('D', -(2**34), -1, 0, 1, 2**34);
End of Patch.

Reply via email to