Issue #12141: Install a copy of template C module file so that

test_build_ext of test_distutils is no longer silently skipped when
run outside of a build directory.
This commit is contained in:
Ned Deily 2011-06-28 00:39:19 -07:00
parent 43e1054e38
commit 63144c6444
3 changed files with 14 additions and 1 deletions

View File

@ -19,6 +19,11 @@ from test import test_support
ALREADY_TESTED = False ALREADY_TESTED = False
def _get_source_filename(): def _get_source_filename():
# use installed copy if available
tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
if os.path.exists(tests_f):
return tests_f
# otherwise try using copy from build directory
srcdir = sysconfig.get_config_var('srcdir') srcdir = sysconfig.get_config_var('srcdir')
if srcdir is None: if srcdir is None:
return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c') return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')

View File

@ -869,7 +869,7 @@ LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \
unittest unittest/test \ unittest unittest/test \
lib-old \ lib-old \
curses pydoc_data $(MACHDEPS) curses pydoc_data $(MACHDEPS)
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
if test ! -d $(DESTDIR)$$i; then \ if test ! -d $(DESTDIR)$$i; then \
@ -925,6 +925,10 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
done; \ done; \
done done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \ -d $(LIBDEST) -f \

View File

@ -64,6 +64,10 @@ Build
Tests Tests
----- -----
- Issue #12141: Install a copy of template C module file so that
test_build_ext of test_distutils is no longer silently skipped when
run outside of a build directory.
- Issue #8746: Add additional tests for os.chflags() and os.lchflags(). - Issue #8746: Add additional tests for os.chflags() and os.lchflags().
Patch by Garrett Cooper. Patch by Garrett Cooper.