diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-08-22 20:06:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-22 20:06:33 (GMT) |
| commit | b539dd3073f9e37de25f73ad19d188cd56cc19b4 (patch) | |
| tree | 9d37f050c2092df66a694e1ad2968c340cbcdc79 | |
| parent | ca47a2183a35d4b71cc062c926b7f96112fdf5ce (diff) | |
| download | cpython-b539dd3073f9e37de25f73ad19d188cd56cc19b4.zip cpython-b539dd3073f9e37de25f73ad19d188cd56cc19b4.tar.gz cpython-b539dd3073f9e37de25f73ad19d188cd56cc19b4.tar.bz2 | |
[3.12] gh-108303: Add Lib/test/test_cppext/ sub-directory (GH-108325) (#108328)
gh-108303: Add Lib/test/test_cppext/ sub-directory (GH-108325)
* Move test_cppext to its own directory
* Rename setup_testcppext.py to setup.py
* Rename _testcppext.cpp to extension.cpp
* The source (extension.cpp) is now also copied by the test.
(cherry picked from commit 21dda09600848ac280481f7c64f8d9516dc69bb2)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Lib/test/test_cppext/__init__.py (renamed from Lib/test/test_cppext.py) | 8 | ||||
| -rw-r--r-- | Lib/test/test_cppext/extension.cpp (renamed from Lib/test/_testcppext.cpp) | 2 | ||||
| -rw-r--r-- | Lib/test/test_cppext/setup.py (renamed from Lib/test/setup_testcppext.py) | 3 | ||||
| -rw-r--r-- | Makefile.pre.in | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext/__init__.py index e2fedc9..f3d32a3 100644 --- a/Lib/test/test_cppext.py +++ b/Lib/test/test_cppext/__init__.py @@ -11,9 +11,8 @@ from test.support import os_helper MS_WINDOWS = (sys.platform == 'win32') - - -SETUP_TESTCPPEXT = support.findfile('setup_testcppext.py') +SOURCE = os.path.join(os.path.dirname(__file__), 'extension.cpp') +SETUP = os.path.join(os.path.dirname(__file__), 'setup.py') @support.requires_subprocess() @@ -42,7 +41,8 @@ class TestCPPExt(unittest.TestCase): def _check_build(self, std_cpp03, extension_name, python_exe): pkg_dir = 'pkg' os.mkdir(pkg_dir) - shutil.copy(SETUP_TESTCPPEXT, os.path.join(pkg_dir, "setup.py")) + shutil.copy(SETUP, os.path.join(pkg_dir, os.path.basename(SETUP))) + shutil.copy(SOURCE, os.path.join(pkg_dir, os.path.basename(SOURCE))) def run_cmd(operation, cmd): env = os.environ.copy() diff --git a/Lib/test/_testcppext.cpp b/Lib/test/test_cppext/extension.cpp index 82b4713..90669b1 100644 --- a/Lib/test/_testcppext.cpp +++ b/Lib/test/test_cppext/extension.cpp @@ -1,5 +1,7 @@ // gh-91321: Very basic C++ test extension to check that the Python C API is // compatible with C++ and does not emit C++ compiler warnings. +// +// The code is only built, not executed. // Always enable assertions #undef NDEBUG diff --git a/Lib/test/setup_testcppext.py b/Lib/test/test_cppext/setup.py index 22fe750..6867094 100644 --- a/Lib/test/setup_testcppext.py +++ b/Lib/test/test_cppext/setup.py @@ -2,7 +2,6 @@ # compatible with C++ and does not emit C++ compiler warnings. import os import sys -from test import support from setuptools import setup, Extension @@ -10,7 +9,7 @@ from setuptools import setup, Extension MS_WINDOWS = (sys.platform == 'win32') -SOURCE = support.findfile('_testcppext.cpp') +SOURCE = 'extension.cpp' if not MS_WINDOWS: # C++ compiler flags for GCC and clang CPPFLAGS = [ diff --git a/Makefile.pre.in b/Makefile.pre.in index d9d56bb..ae6a12c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2132,6 +2132,7 @@ TESTSUBDIRS= idlelib/idle_test \ test/support/_hypothesis_stubs \ test/test_asyncio \ test/test_capi \ + test/test_cppext \ test/test_ctypes \ test/test_email \ test/test_email/data \ |