summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2013-08-03 14:12:33 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2013-08-03 14:12:33 (GMT)
commit1dfb9180a736c9033730ce05db696ee32c5a3d1c (patch)
tree62059f482216594fcb604b6dbe595419e8e05e4c
parent60b3ac7482aa7ca4e6f0f66792160d38b48d1914 (diff)
downloadcpython-1dfb9180a736c9033730ce05db696ee32c5a3d1c.zip
cpython-1dfb9180a736c9033730ce05db696ee32c5a3d1c.tar.gz
cpython-1dfb9180a736c9033730ce05db696ee32c5a3d1c.tar.bz2
- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
-rw-r--r--Lib/test/test_fcntl.py2
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index 09cb047..e2a1b37 100644
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -35,6 +35,8 @@ def get_lockdata():
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)
elif sys.platform in ['os2emx']:
diff --git a/Misc/NEWS b/Misc/NEWS
index bd85696..27f97b0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -230,6 +230,8 @@ IDLE
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)