[Python-checkins] r80119 - in python/branches/release31-maint: Lib/test/test_os.py Modules/posixmodule.c
mark.dickinson
python-checkins at python.org
Fri Apr 16 18:32:49 CEST 2010
Author: mark.dickinson
Date: Fri Apr 16 18:32:49 2010
New Revision: 80119
Log:
Merged revisions 80108,80111,80114-80115 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80108 | victor.stinner | 2010-04-16 13:23:43 +0100 (Fri, 16 Apr 2010) | 4 lines
Add CS_GNU_LIBC_VERSION and CS_GNU_LIBPTHREAD_VERSION constants for constr(),
and disable test_execvpe_with_bad_program() of test_os if the libc uses
linuxthreads to avoid the "unknown signal 32" bug (see issue #4970).
........
r80111 | mark.dickinson | 2010-04-16 13:47:52 +0100 (Fri, 16 Apr 2010) | 1 line
Keep confstr entries in alphabetical order.
........
r80114 | mark.dickinson | 2010-04-16 14:45:35 +0100 (Fri, 16 Apr 2010) | 1 line
Issue #4970: move linuxthreads check outside the affected test, and use skipIf
........
r80115 | mark.dickinson | 2010-04-16 14:51:27 +0100 (Fri, 16 Apr 2010) | 1 line
Don't assume that os.confstr_names exists.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_os.py
python/branches/release31-maint/Modules/posixmodule.c
Modified: python/branches/release31-maint/Lib/test/test_os.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_os.py (original)
+++ python/branches/release31-maint/Lib/test/test_os.py Fri Apr 16 18:32:49 2010
@@ -10,6 +10,17 @@
import shutil
from test import support
+# Detect whether we're on a Linux system that uses the (now outdated
+# and unmaintained) linuxthreads threading library. There's an issue
+# when combining linuxthreads with a failed execv call: see
+# http://bugs.python.org/issue4970.
+if (hasattr(os, "confstr_names") and
+ "CS_GNU_LIBPTHREAD_VERSION" in os.confstr_names):
+ libpthread = os.confstr("CS_GNU_LIBPTHREAD_VERSION")
+ USING_LINUXTHREADS= libpthread.startswith("linuxthreads")
+else:
+ USING_LINUXTHREADS= False
+
# Tests creating TESTFN
class FileTests(unittest.TestCase):
def setUp(self):
@@ -566,8 +577,11 @@
pass
class ExecTests(unittest.TestCase):
+ @unittest.skipIf(USING_LINUXTHREADS,
+ "avoid triggering a linuxthreads bug: see issue #4970")
def test_execvpe_with_bad_program(self):
- self.assertRaises(OSError, os.execvpe, 'no such app-', ['no such app-'], None)
+ self.assertRaises(OSError, os.execvpe, 'no such app-',
+ ['no such app-'], None)
def test_execvpe_with_bad_arglist(self):
self.assertRaises(ValueError, os.execvpe, 'notepad', [], None)
Modified: python/branches/release31-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/posixmodule.c (original)
+++ python/branches/release31-maint/Modules/posixmodule.c Fri Apr 16 18:32:49 2010
@@ -6028,6 +6028,12 @@
#ifdef _CS_ARCHITECTURE
{"CS_ARCHITECTURE", _CS_ARCHITECTURE},
#endif
+#ifdef _CS_GNU_LIBC_VERSION
+ {"CS_GNU_LIBC_VERSION", _CS_GNU_LIBC_VERSION},
+#endif
+#ifdef _CS_GNU_LIBPTHREAD_VERSION
+ {"CS_GNU_LIBPTHREAD_VERSION", _CS_GNU_LIBPTHREAD_VERSION},
+#endif
#ifdef _CS_HOSTNAME
{"CS_HOSTNAME", _CS_HOSTNAME},
#endif
More information about the Python-checkins
mailing list