]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.15] gh-151096: Fix test_embed with split exec prefix (GH-151288) (#152590)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 29 Jun 2026 13:56:05 +0000 (15:56 +0200)
committerGitHub <noreply@github.com>
Mon, 29 Jun 2026 13:56:05 +0000 (13:56 +0000)
gh-151096: Fix test_embed with split exec prefix (GH-151288)
(cherry picked from commit b19839b40c771904b87ea35127f9fa1b8058597e)

Co-authored-by: Harjoth Khara <harjoth.khara@gmail.com>
Lib/test/test_embed.py
Misc/NEWS.d/next/Tests/2026-06-16-05-11-38.gh-issue-151096.Kq3Lp9.rst [new file with mode: 0644]

index c5ced3cc6134b960bf716a2fe500a96d07045616..6a464e6d8f9cac756cdc11a2888fc34e187b7c6f 100644 (file)
@@ -1429,7 +1429,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         if prefix is None:
             prefix = config['config']['prefix']
         if exec_prefix is None:
-            exec_prefix = config['config']['prefix']
+            exec_prefix = config['config']['exec_prefix']
         if MS_WINDOWS:
             return config['config']['module_search_paths']
         else:
@@ -1578,8 +1578,10 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
             expected_paths[1 if MS_WINDOWS else 2] = os.path.normpath(
                 os.path.join(exedir, f'{f.read()}\n$'.splitlines()[0]))
         if not MS_WINDOWS:
-            # PREFIX (default) is set when running in build directory
-            prefix = exec_prefix = sys.prefix
+            # PREFIX and EXEC_PREFIX (defaults) are set when running in the
+            # build directory and may differ with --exec-prefix (gh-151096).
+            prefix = sys.prefix
+            exec_prefix = sys.exec_prefix
             # stdlib calculation (/Lib) is not yet supported
             expected_paths[0] = self.module_search_paths(prefix=prefix)[0]
             config.update(prefix=prefix, base_prefix=prefix,
diff --git a/Misc/NEWS.d/next/Tests/2026-06-16-05-11-38.gh-issue-151096.Kq3Lp9.rst b/Misc/NEWS.d/next/Tests/2026-06-16-05-11-38.gh-issue-151096.Kq3Lp9.rst
new file mode 100644 (file)
index 0000000..3251c6f
--- /dev/null
@@ -0,0 +1,2 @@
+Fix ``test_embed`` failing when CPython is configured with a split exec prefix
+(``--exec-prefix`` differing from ``--prefix``).