From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 22 Jul 2025 12:18:23 +0000 (+0200) Subject: [3.14] gh-133742: Fix test_sysconfig and test_build_details for relocated directories... X-Git-Tag: v3.14.0rc1~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e3c3b5bbc8cf34673b19cb35c706699184e1d6d;p=thirdparty%2FPython%2Fcpython.git [3.14] gh-133742: Fix test_sysconfig and test_build_details for relocated directories (GH-136987) (#136990) gh-133742: Fix test_sysconfig and test_build_details for relocated directories (GH-136987) (cherry picked from commit aafbdb5df5439adc1106ced068cf87683ae68b9e) Co-authored-by: Pablo Galindo Salgado --- diff --git a/Lib/test/test_build_details.py b/Lib/test/test_build_details.py index ba4b8c5aa9b5..691fd0bb98c0 100644 --- a/Lib/test/test_build_details.py +++ b/Lib/test/test_build_details.py @@ -124,6 +124,10 @@ class CPythonBuildDetailsTests(unittest.TestCase, FormatTestsBase): def test_base_interpreter(self): value = self.key('base_interpreter') + # Skip check if installation is relocated + if sysconfig._installation_is_relocated(): + self.skipTest("Installation is relocated") + self.assertEqual(os.path.realpath(value), os.path.realpath(sys.executable)) @needs_installed_python @@ -133,6 +137,11 @@ class CPythonBuildDetailsTests(unittest.TestCase, FormatTestsBase): ) def test_c_api(self): value = self.key('c_api') + + # Skip check if installation is relocated + if sysconfig._installation_is_relocated(): + self.skipTest("Installation is relocated") + self.assertTrue(os.path.exists(os.path.join(value['headers'], 'Python.h'))) version = sysconfig.get_config_var('VERSION') self.assertTrue(os.path.exists(os.path.join(value['pkgconfig_path'], f'python-{version}.pc'))) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 7af3144d6919..9faabc2e2544 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -709,7 +709,7 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): ignore_keys |= {'prefix', 'exec_prefix', 'base', 'platbase'} # Keys dependent on Python being run from the prefix targetted when building (different on relocatable installs) if sysconfig._installation_is_relocated(): - ignore_keys |= {'prefix', 'exec_prefix', 'base', 'platbase', 'installed_base', 'installed_platbase'} + ignore_keys |= {'prefix', 'exec_prefix', 'base', 'platbase', 'installed_base', 'installed_platbase', 'srcdir'} for key in ignore_keys: json_config_vars.pop(key, None)