fix test_tools (patch 159)

This commit is contained in:
David Malcolm 2012-07-23 14:38:48 -04:00
parent 3b4dd24c42
commit 6616179565
2 changed files with 20 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -up Python-3.3.0b1/Lib/test/test_tools.py.fix-test_tools-directory Python-3.3.0b1/Lib/test/test_tools.py
--- Python-3.3.0b1/Lib/test/test_tools.py.fix-test_tools-directory 2012-07-23 14:29:51.317348183 -0400
+++ Python-3.3.0b1/Lib/test/test_tools.py 2012-07-23 14:30:09.883116080 -0400
@@ -19,7 +19,7 @@ if not sysconfig.is_python_build():
# and run the tests in that case too?
raise unittest.SkipTest('test irrelevant for an installed Python')
-srcdir = sysconfig.get_config_var('projectbase')
+srcdir = sysconfig.get_config_var('srcdir')
basepath = os.path.join(os.getcwd(), srcdir, 'Tools')
scriptsdir = os.path.join(basepath, 'scripts')
print('srcdir: %r' % srcdir)

View File

@ -466,6 +466,13 @@ Patch157: 00157-uid-gid-overflows.patch
# Not yet sent upstream
Patch158: 00158-disable-test_fs_holes-in-rpm-build.patch
# 00159 #
# http://bugs.python.org/issue13447 added tests for the Tools scripts, but
# these appear to assume that srcdir == builddir, which isn't the case for our
# builds.
# Not yet sent upstream
Patch159: 00159-fix-test_tools-directory.patch
# (New patches go here ^^^)
#
# When adding new patches to "python" and "python3" in Fedora 17 onwards,
@ -695,6 +702,7 @@ done
%patch156 -p1
%patch157 -p1
%patch158 -p1
%patch159 -p1
# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
# are many differences between 2.6 and the Python 3 library.