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 954a3f26e97495dd5638c0f90a86f35868bf6e97..c1e7b9ea3b86cb0229cafb3230d49a506e37645b 100644 (file)
--- 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)