From: Guido van Rossum <guido@python.org>
Date: Fri, 3 Jan 1997 19:00:37 +0000 (+0000)
Subject: Change the ``calcsize*3'' test to be portable to 64-bit machines.
X-Git-Tag: v1.5a1~603
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04ebf5ca5d45a7e40326226c4ce07afdc17e521f;p=python

Change the ``calcsize*3'' test to be portable to 64-bit machines.
---

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 954a3f26e9..c1e7b9ea3b 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -18,9 +18,13 @@ sz = struct.calcsize('i')
 if sz * 3 <> struct.calcsize('iii'):
     raise TestFailed, 'inconsistent sizes'
 
-sz = struct.calcsize('cbhilfd')
-if sz * 3 <> struct.calcsize('3c3b3h3i3l3f3d'):
-    raise TestFailed, 'inconsistent sizes'
+fmt = 'cbxxxxxxhhhhiillffd'
+fmt3 = '3c3b18x12h6i6l6f3d'
+sz = struct.calcsize(fmt)
+sz3 = struct.calcsize(fmt3)
+if sz * 3 <> sz3:
+    raise TestFailed, 'inconsistent sizes (3*%s -> 3*%d = %d, %s -> %d)' % (
+	`fmt`, sz, 3*sz, `fmt3`, sz3)
 
 simple_err(struct.pack, 'iii', 3)
 simple_err(struct.pack, 'i', 3, 3, 3)