pack/unpack better in (network-)short-non-16-bits and

(network-)long-non-32-bits systems such as Cray C90.

p4raw-id: //depot/cfgperl@2985

1 files changed, 20 insertions, 72 deletions

diff --git a/t/op/pack.t b/t/op/pack.t
index 3e31e361df..f1bb62f6b3 100755
--- a/t/op/pack.t
+++ b/t/op/pack.t
@@ -298,17 +298,8 @@ print "ok ", $test++, "\n";
 print "not " unless unpack("s", pack("s",  32767)) ==  32767;
 print "ok ", $test++, "\n";
 
-if ($Config{shortsize} == 2) {
-    print "not " unless unpack("s", pack("s", -32768)) == -32768;
-    print "ok ", $test++, "\n";
-} else {
-    if ($Config{shortsize} == 8 && $Config{byteorder} eq '87654321') {
-        print "not " unless unpack("s_", pack("s_", -32768)) == -32768;
-        print "ok ", $test++, "\n";
-    } else {
-        print "ok ", $test++, " # skipped\n";
-    }
-}
+print "not " unless unpack("s", pack("s", -32768)) == -32768;
+print "ok ", $test++, "\n";
 
 print "not " unless unpack("S", pack("S",  65535)) ==  65535;
 print "ok ", $test++, "\n";
@@ -325,18 +316,8 @@ print "ok ", $test++, "\n";
 print "not " unless unpack("l", pack("l",  2147483647)) ==  2147483647;
 print "ok ", $test++, "\n";
 
-if ($Config{longsize} == 4 || $Config{byteorder} eq '12345678') {
-    print "not " unless unpack("l", pack("l", -2147483648)) == -2147483648;
-    print "ok ", $test++, "\n";
-} else {
-    if ($Config{shortsize} == 8 && $Config{byteorder} eq '87654321') {
-        print "not "
-            unless unpack("l_", pack("l_", -2147483648)) == -2147483648;
-        print "ok ", $test++, "\n";
-    } else {
-        print "ok ", $test++, " # skipped\n";
-    }
-}
+print "not " unless unpack("l", pack("l", -2147483648)) == -2147483648;
+print "ok ", $test++, "\n";
 
 print "not " unless unpack("L", pack("L",  4294967295)) ==  4294967295;
 print "ok ", $test++, "\n";
@@ -344,66 +325,33 @@ print "ok ", $test++, "\n";
 print "not " unless unpack("n", pack("n",  65535)) == 65535;
 print "ok ", $test++, "\n";
 
-if ($Config{shortsize} == 2) {
-    print "not " unless unpack("v", pack("v",  65535)) == 65535;
-    print "ok ", $test++, "\n";
-} else {
-    print "ok ", $test++, " # skipped\n";
-}
+print "not " unless unpack("v", pack("v",  65535)) == 65535;
+print "ok ", $test++, "\n";
 
 print "not " unless unpack("N", pack("N",  4294967295)) ==  4294967295;
 print "ok ", $test++, "\n";
 
-if ($Config{longsize} == 4 || $Config{byteorder} eq '12345678') {
-    print "not " unless unpack("V", pack("V",  4294967295)) ==  4294967295;
-    print "ok ", $test++, "\n";
-} else {
-    print "ok ", $test++, " # skipped\n";
-}
+print "not " unless unpack("V", pack("V",  4294967295)) ==  4294967295;
+print "ok ", $test++, "\n";
 
 # 95..98 test the n/v/N/V byteorder
 
 if ($Config{byteorder} =~ /^1234(5678)?$/ ||
     $Config{byteorder} =~ /^(8765)?4321$/) {
 
-    if ($Config{shortsize} == 2 ||
-        $Config{byteorder} eq '87654321') {
-        print "not " unless pack("n", 0xdead) eq "\xde\xad";
-        print "ok ", $test++, "\n";
-
-        if ($Config{byteorder} ne '87654321') {
-            print "not " unless pack("v", 0xdead) eq "\xad\xde";
-            print "ok ", $test++, "\n";
-        } else {
-            print "ok ", $test++, " # skipped\n";
-        }
-    } else {
-        # shortsize != 2 systems require more thought
-        foreach (95..96) {
-            print "ok ", $test++, " # skipped\n";
-        }
-    }
-
-    if ($Config{longsize} == 4 ||
-        $Config{byteorder} eq '12345678' ||
-        $Config{byteorder} eq '87654321') {
-        print "not " unless pack("N", 0xdeadbeef) eq "\xde\xad\xbe\xef";
-        print "ok ", $test++, "\n";
-
-        if ($Config{byteorder} ne '87654321') {
-            print "not " unless pack("V", 0xdeadbeef) eq "\xef\xbe\xad\xde";
-            print "ok ", $test++, "\n";
-        } else {
-            print "ok ", $test++, " # skipped\n";
-        }
-    } else {
-        # exotic longsize != 2 systems require more thought
-        foreach (97..98) {
-            print "ok ", $test++, " # skipped\n";
-        }
-    }
+    print "not " unless pack("n", 0xdead) eq "\xde\xad";
+    print "ok ", $test++, "\n";
+
+    print "not " unless pack("v", 0xdead) eq "\xad\xde";
+    print "ok ", $test++, "\n";
+
+    print "not " unless pack("N", 0xdeadbeef) eq "\xde\xad\xbe\xef";
+    print "ok ", $test++, "\n";
+
+    print "not " unless pack("V", 0xdeadbeef) eq "\xef\xbe\xad\xde";
+    print "ok ", $test++, "\n";
 } else {
-   # exotic byteorder system require more thought 
+   # exotic byteorder systems require more thought 
    foreach (95..98) {
        print "ok ", $test++, " # skipped\n";
    }