[Python-checkins] cpython (merge 3.3 -> default): - Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
matthias.klose
python-checkins at python.org
Sat Aug 3 16:19:10 CEST 2013
http://hg.python.org/cpython/rev/9cc42abeae06
changeset: 84987:9cc42abeae06
parent: 84985:6fc71ed6a910
parent: 84986:c503cea0e8c2
user: doko at ubuntu.com
date: Sat Aug 03 16:18:55 2013 +0200
summary:
- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
files:
Lib/test/test_fcntl.py | 2 ++
Misc/NEWS | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -32,6 +32,8 @@
pid_t = 'l'
lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0,
fcntl.F_WRLCK, 0)
+ elif sys.platform.startswith('gnukfreebsd'):
+ lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
else:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -599,6 +599,8 @@
Tests
-----
+- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
+
- Issue #18396: Fix spurious test failure in test_signal on Windows when
faulthandler is enabled (Patch by Jeremy Kloth)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list