Fix cpyext test compiles for fixture files

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/__init__.py

@@ -96,8 +96,12 @@ def compile_module_from_string(c_source: str, name: str):
     return compile_module_from_file(name)
 
 
-def compile_module_from_file(module_name: str):
-    install_dir = ccompile(None, module_name)
+def compile_module_from_file(module_name: str, sibling_to=None):
+    if sibling_to:
+        compile_name = str(Path(sibling_to).absolute().parent / module_name)
+    else:
+        compile_name = module_name
+    install_dir = ccompile(None, compile_name)
     sys.path.insert(0, install_dir)
     try:
         cmodule = __import__(module_name)
@@ -113,6 +117,7 @@ def ccompile(self, name, check_duplicate_name=True):
     EXT_SUFFIX = sysconfig.get_config_var("EXT_SUFFIX")
 
     source_file = DIR / f'{name}.c'
+    filename = Path(name).name
     file_not_empty(source_file)
 
     # compute checksum of source file
@@ -123,18 +128,18 @@ def ccompile(self, name, check_duplicate_name=True):
             m.update(block)
     cur_checksum = m.hexdigest()
 
-    build_dir = DIR / 'build' / name
+    build_dir = DIR / 'build' / filename
 
     # see if there is already a checksum file
-    checksum_file = build_dir / f'{name}{EXT_SUFFIX}.sha256'
+    checksum_file = build_dir / f'{filename}{EXT_SUFFIX}.sha256'
     available_checksum = ""
     if checksum_file.exists():
         # read checksum file
         with open(checksum_file, "r") as f:
             available_checksum = f.readline()
 
     # note, the suffix is already a string like '.so'
-    lib_file = build_dir / f'{name}{EXT_SUFFIX}'
+    lib_file = build_dir / f'{filename}{EXT_SUFFIX}'
 
     if check_duplicate_name and available_checksum != cur_checksum and name in compiled_registry:
         raise RuntimeError(f"\n\nModule with name '{name}' was already compiled, but with different source code. "
@@ -154,7 +159,7 @@ def ccompile(self, name, check_duplicate_name=True):
         os.chdir(build_dir)
         try:
             shutil.copy(source_file, '.')
-            module = Extension(name, sources=[source_file.name])
+            module = Extension(filename, sources=[source_file.name])
             args = [
                 '--verbose' if sys.flags.verbose else '--quiet',
                 'build', '--build-temp=t', '--build-base=b', '--build-purelib=l', '--build-platlib=l',
@@ -163,7 +168,7 @@ def ccompile(self, name, check_duplicate_name=True):
             setup(
                 script_name='setup',
                 script_args=args,
-                name=name,
+                name=filename,
                 version='1.0',
                 description='',
                 ext_modules=[module]

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_simple.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -42,10 +42,10 @@
 
 class TestSimple(CPyExtTestCase):
     def test_demo(self):
-        demo = compile_module_from_file('demo')
+        demo = compile_module_from_file('demo', __file__)
         assert demo.system("echo 1") == 0
         assert demo.system("arrrr") != 0
 
     def test_demo2(self):
-        demo2 = compile_module_from_file('demo2')
+        demo2 = compile_module_from_file('demo2', __file__)
         assert demo2.system("Hello World") == "Hello World from C", demo2.system("Hello World")

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_tp_slots.py

@@ -917,7 +917,7 @@ class ManagedDummy(NbAddSqConcatStaticType):
     assert SlotsGetter.get_nb_add(ManagedDummy()) == SlotsGetter.get_nb_add(NbAddSqConcatStaticType())
 
 def test_sq_repeat_mul_without_rmul_inheritance():
-    mod = compile_module_from_file("fuzzer_test10")
+    mod = compile_module_from_file("fuzzer_test10", __file__)
     Native0 = mod.create_Native0((object, ))
     class Managed1(Native0):
         def __add__(self): return self

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_wiki.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -43,13 +43,13 @@
 class TestWiki(CPyExtTestCase):
 
     def test_noddy(self):
-        noddy = compile_module_from_file('noddy')
+        noddy = compile_module_from_file('noddy', __file__)
         assert type(noddy.Noddy) is type
         assert type(noddy.Noddy()) is noddy.Noddy, str(type(noddy.Noddy()))
         assert str(noddy.Noddy()).startswith("<noddy.Noddy object at"), str(noddy.Noddy())
 
     def test_noddy2(self):
-        noddy2 = compile_module_from_file('noddy2')
+        noddy2 = compile_module_from_file('noddy2', __file__)
         nd = noddy2.Noddy2("First", "Last", 42)
         assert nd.name() == "'First' 'Last' '42'"
         assert nd.first == "First", ("%s != First" % nd.first)
@@ -85,7 +85,7 @@ def test_noddy2(self):
         assert nd.n_ulong == 0xffffffffffffffff, ("%s != 0xffffffffffffffff" % nd.n_ulong)
 
     def test_noddy3(self):
-        noddy3 = compile_module_from_file('noddy3')
+        noddy3 = compile_module_from_file('noddy3', __file__)
         nd = noddy3.Noddy(b"First", b"Last", 42)
         assert nd.name() == "b'First' b'Last'", nd.name()
         assert nd.first == b"First", ("%s != First" % nd.first)