mirror of https://github.com/python/cpython.git
Fix testcase for 64bit BSD systems: long is 8 bytes for those systems
so there's no need to pad after off_t members. And a small typo fix.
This commit is contained in:
parent
99358df865
commit
ac89f6ef29
|
@ -24,7 +24,13 @@
|
||||||
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
|
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
|
||||||
'bsdos2', 'bsdos3', 'bsdos4',
|
'bsdos2', 'bsdos3', 'bsdos4',
|
||||||
'openbsd', 'openbsd2', 'openbsd3'):
|
'openbsd', 'openbsd2', 'openbsd3'):
|
||||||
lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
|
if struct.calcsize('l') == 8:
|
||||||
|
off_t = 'l'
|
||||||
|
pid_t = 'i'
|
||||||
|
else:
|
||||||
|
off_t = 'lxxxx'
|
||||||
|
pid_t = 'l'
|
||||||
|
lockdata = struct.pack(off_t+off_t+pid_t+'hh', 0, 0, 0, fcntl.F_WRLCK, 0)
|
||||||
elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
|
elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
|
||||||
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
|
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
|
||||||
elif sys.platform in ['os2emx']:
|
elif sys.platform in ['os2emx']:
|
||||||
|
@ -39,7 +45,7 @@
|
||||||
f = open(filename, 'w')
|
f = open(filename, 'w')
|
||||||
rv = fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
|
rv = fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
|
||||||
if verbose:
|
if verbose:
|
||||||
print 'Status from fnctl with O_NONBLOCK: ', rv
|
print 'Status from fcntl with O_NONBLOCK: ', rv
|
||||||
|
|
||||||
if sys.platform not in ['os2emx']:
|
if sys.platform not in ['os2emx']:
|
||||||
rv = fcntl.fcntl(f.fileno(), fcntl.F_SETLKW, lockdata)
|
rv = fcntl.fcntl(f.fileno(), fcntl.F_SETLKW, lockdata)
|
||||||
|
|
Loading…
Reference in New Issue