From: Ned Deily <nad@acm.org>
Date: Tue, 5 Jul 2011 02:06:20 +0000 (-0700)
Subject: Issue #12497: Install test/data to prevent failures of the various codecmaps
X-Git-Tag: v3.2.2rc1~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2d519035f9d4702aff11cd8be68859c77a5feb2;p=thirdparty%2FPython%2Fcpython.git

Issue #12497: Install test/data to prevent failures of the various codecmaps
tests.
---

diff --git a/Lib/test/data/README b/Lib/test/data/README
index 8bf8c9b31e05..bd05984e4390 100644
--- a/Lib/test/data/README
+++ b/Lib/test/data/README
@@ -1,2 +1,2 @@
 This empty directory serves as destination for temporary files
-created by some tests.
+created by some tests, in particular, the test_codecmaps_* tests.
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 87aa4cf59428..dfa721996d0d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -910,7 +910,7 @@ MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
 LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 		tkinter/test/test_ttk site-packages test \
-		test/capath \
+		test/capath test/data \
 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
 		test/tracedmodules test/encoded_modules \
 		concurrent concurrent/futures encodings \
diff --git a/Misc/NEWS b/Misc/NEWS
index 117101cdb017..43392bcb56ef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,7 +38,10 @@ C-API
 Tests
 -----
 
-- Issue #12496:  Install test/capath directory to prevent test_connect_capath
+- Issue #12497: Install test/data to prevent failures of the various codecmaps
+  tests.
+
+- Issue #12496: Install test/capath directory to prevent test_connect_capath
   testcase failure in test_ssl.
 
 - Issue #12469: Run "wakeup" signal tests in subprocess to run the test in a