summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-01-03 19:00:37 (GMT)
committerGuido van Rossum <guido@python.org>1997-01-03 19:00:37 (GMT)
commit04ebf5ca5d45a7e40326226c4ce07afdc17e521f (patch)
tree94b30b9bbc90038d47e44230c86a307f81cb65df /Lib
parent5b0eba3ced0f9d6c0469da4a6141ea688821fb63 (diff)
downloadcpython-04ebf5ca5d45a7e40326226c4ce07afdc17e521f.zip
cpython-04ebf5ca5d45a7e40326226c4ce07afdc17e521f.tar.gz
cpython-04ebf5ca5d45a7e40326226c4ce07afdc17e521f.tar.bz2
Change the ``calcsize*3'' test to be portable to 64-bit machines.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_struct.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 954a3f2..c1e7b9e 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)