[GR-23340] Make test_sysconfig pass

PullRequest: graalpython/1432

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sysconfig.txt

@@ -1,15 +1,21 @@
+*graalpython.lib-python.3.test.test_sysconfig.MakefileTests.test_get_makefile_filename
 *graalpython.lib-python.3.test.test_sysconfig.MakefileTests.test_parse_makefile
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_SO_deprecation
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_SO_in_vars
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_SO_value
+*graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_config_h_filename
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_config_vars
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_path
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_path_names
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_paths
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_platform
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_get_scheme_names
+*graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_ldshared_value
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_main
+*graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_osx_ext_suffix
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_platform_in_subprocess
+*graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_srcdir
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_srcdir_independent_of_cwd
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_symlink
+*graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_triplet_in_ext_suffix
 *graalpython.lib-python.3.test.test_sysconfig.TestSysConfig.test_user_similar

graalpython/lib-graalpython/_sysconfig.py

@@ -85,6 +85,7 @@ def _get_posix_vars():
     g['CONFINCLUDEPY'] = get_python_inc()
     g['CPPFLAGS'] = '-I. -I' + get_python_inc()
     g['CFLAGS'] = "-Wno-unused-command-line-argument -stdlib=libc++ -DNDEBUG -O1 -DHPY_UNIVERSAL_ABI"
+    g['LDFLAGS'] = ""
     g['CCSHARED'] = "-fPIC"
     g['LDSHARED_LINUX'] = "%s -shared -fPIC" % __graalpython__.get_toolchain_path('CC')
     if darwin_native:

graalpython/lib-python/3/sysconfig.py

@@ -20,6 +20,17 @@
 ]
 
 _INSTALL_SCHEMES = {
+    # Graalpython change: custom scheme
+    'graalpython': {
+        'stdlib': '{base}/lib-python/3',
+        'platstdlib': '{base}/lib-python/3',
+        'purelib': '{base}/lib-python/3/site-packages',
+        'platlib': '{base}/lib-python/3/site-packages',
+        'include': '{base}/include',
+        'platinclude': '{base}/include',
+        'scripts': '{base}/bin',
+        'data': '{base}',
+    },
     'posix_prefix': {
         'stdlib': '{installed_base}/lib/python{py_version_short}',
         'platstdlib': '{platbase}/lib/python{py_version_short}',
@@ -180,10 +191,12 @@ def _expand_vars(scheme, vars):
 
 
 def _get_default_scheme():
-    if os.name == 'posix':
-        # the default scheme for posix is posix_prefix
-        return 'posix_prefix'
-    return os.name
+    # XXX Graalpython change
+    return 'graalpython'
+    # if os.name == 'posix':
+    #     # the default scheme for posix is posix_prefix
+    #     return 'posix_prefix'
+    # return os.name
 
 
 # NOTE: site.py has copy of this function.

graalpython/lib-python/3/test/test_sysconfig.py

@@ -5,7 +5,7 @@
 import shutil
 from copy import copy
 
-from test.support import (import_module, TESTFN, unlink, check_warnings,
+from test.support import (import_module, TESTFN, unlink, check_warnings, impl_detail,
                           captured_stdout, skip_unless_symlink, change_cwd,
                           PythonSymlink)
 
@@ -228,7 +228,8 @@ def test_get_config_h_filename(self):
         self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_scheme_names(self):
-        wanted = ('nt', 'nt_user', 'osx_framework_user',
+        # XXX Graalpython change: add our scheme
+        wanted = ('graalpython', 'nt', 'nt_user', 'osx_framework_user',
                   'posix_home', 'posix_prefix', 'posix_user')
         self.assertEqual(get_scheme_names(), wanted)
 
@@ -316,6 +317,7 @@ def test_platform_in_subprocess(self):
         self.assertEqual(status, 0)
         self.assertEqual(my_platform, test_platform)
 
+    @impl_detail("no srcdir", graalvm=False)
     def test_srcdir(self):
         # See Issues #15322, #15364.
         srcdir = sysconfig.get_config_var('srcdir')
@@ -363,6 +365,8 @@ def test_SO_in_vars(self):
         self.assertIsNotNone(vars['SO'])
         self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
 
+    # We intentionally have a different suffix to avoid clashes with CPython
+    @impl_detail("different suffix", graalvm=False)
     @unittest.skipUnless(sys.platform == 'linux' and
                          hasattr(sys.implementation, '_multiarch'),
                          'multiarch-specific test')
@@ -381,13 +385,15 @@ def test_triplet_in_ext_suffix(self):
             else: # 8 byte pointer size
                 self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix)
 
+    @impl_detail("different suffix", graalvm=False)
     @unittest.skipUnless(sys.platform == 'darwin', 'OS X-specific test')
     def test_osx_ext_suffix(self):
         suffix = sysconfig.get_config_var('EXT_SUFFIX')
         self.assertTrue(suffix.endswith('-darwin.so'), suffix)
 
 class MakefileTests(unittest.TestCase):
 
+    @impl_detail("no Makefile", graalvm=False)
     @unittest.skipIf(sys.platform.startswith('win'),
                      'Test is not Windows compatible')
     def test_get_makefile_filename(self):