[python3/python3.3] fix test_tools (patch 159)

dmalcolm dmalcolm at fedoraproject.org
Mon Jul 23 18:44:38 UTC 2012


commit 66161795651949904dd556b2d1edc03d371c6751
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Mon Jul 23 14:38:48 2012 -0400

    fix test_tools (patch 159)

 00159-fix-test_tools-directory.patch |   12 ++++++++++++
 python3.spec                         |    8 ++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/00159-fix-test_tools-directory.patch b/00159-fix-test_tools-directory.patch
new file mode 100644
index 0000000..def63ca
--- /dev/null
+++ b/00159-fix-test_tools-directory.patch
@@ -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)
diff --git a/python3.spec b/python3.spec
index efba61f..b860076 100644
--- a/python3.spec
+++ b/python3.spec
@@ -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.


More information about the scm-commits mailing list