Refactor test_wheel

Author: msimacek

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

@@ -46,37 +46,26 @@
 import unittest
 from pathlib import Path
 
+from tests.testlib_helper import build_testlib
+
 
 class TestWheelBuildAndRun(unittest.TestCase):
     def test_build_install_and_run(self):
         # Build a C library and a wheel that depends on it. Then run it through repair_wheel to vendor the library in and verify that it can be imported
-        orig_root = (Path(__file__).parent / "example_wheel").resolve()
-        orig_testwheel = orig_root / "testwheel"
-        orig_answerlib = orig_root / "answerlib"
+        orig_root = Path(__file__).parent.resolve()
+        orig_test_wheel = orig_root / "testwheel"
+        orig_testlib = orig_root / "testlib"
 
         with tempfile.TemporaryDirectory(prefix="testwheel_tmp_") as tmpdir:
             tmpdir = Path(tmpdir)
-            tmp_testwheel = tmpdir / "testwheel"
-            tmp_answerlib = tmpdir / "answerlib"
+            tmp_test_wheel = tmpdir / "testwheel"
             venv_dir = tmpdir / "venv"
             repair_venv_dir = tmpdir / "repair_venv"
             wheel_dir = tmpdir / "wheels"
             repaired_dir = tmpdir / "repaired"
 
-            shutil.copytree(orig_testwheel, tmp_testwheel)
-            shutil.copytree(orig_answerlib, tmp_answerlib)
-
-            answerlib_build = tmp_answerlib / "build"
-            if answerlib_build.exists():
-                shutil.rmtree(answerlib_build)
-            answerlib_build.mkdir(parents=True, exist_ok=True)
-
-            cmd = ["cmake", "-DCMAKE_BUILD_TYPE=Release", ".."]
-            print("Running:", shlex.join(cmd))
-            subprocess.check_call(cmd, cwd=str(answerlib_build))
-            cmd = ["cmake", "--build", ".", "--config", "Release"]
-            print("Running:", shlex.join(cmd))
-            subprocess.check_call(cmd, cwd=str(answerlib_build))
+            shutil.copytree(orig_test_wheel, tmp_test_wheel)
+            testlib_build = build_testlib(tmpdir, orig_testlib)
 
             cmd = [sys.executable, "-m", "venv", str(venv_dir)]
             print("Running:", shlex.join(cmd))
@@ -96,7 +85,7 @@ def test_build_install_and_run(self):
             wheel_dir.mkdir(parents=True, exist_ok=True)
             cmd = [str(python), "-m", "build", "--wheel", "--outdir", str(wheel_dir)]
             print("Running:", shlex.join(cmd))
-            subprocess.check_call(cmd, cwd=str(tmp_testwheel))
+            subprocess.check_call(cmd, cwd=str(tmp_test_wheel))
 
             built_wheels = list(wheel_dir.glob("testwheel-*.whl"))
             self.assertTrue(built_wheels, "Wheel was not built!")
@@ -117,11 +106,11 @@ def test_build_install_and_run(self):
 
             repair_env = os.environ.copy()
             if sys.platform.startswith("linux"):
-                repair_env["LD_LIBRARY_PATH"] = str(answerlib_build)
+                repair_env["LD_LIBRARY_PATH"] = str(testlib_build)
             elif sys.platform == "darwin":
-                repair_env["DYLD_LIBRARY_PATH"] = str(answerlib_build)
+                repair_env["DYLD_LIBRARY_PATH"] = str(testlib_build)
             elif sys.platform == "win32":
-                repair_env["PATH"] = str(answerlib_build) + os.pathsep + repair_env.get("PATH", "")
+                repair_env["PATH"] = str(testlib_build) + os.pathsep + repair_env.get("PATH", "")
             cmd = [
                 str(python_repair),
                 str((Path(

…s/example_wheel/answerlib/CMakeLists.txt …on.test/src/tests/testlib/CMakeLists.txtgraalpython/com.oracle.graal.python.test/src/tests/example_wheel/answerlib/CMakeLists.txt renamed to graalpython/com.oracle.graal.python.test/src/tests/testlib/CMakeLists.txt graalpython/com.oracle.graal.python.test/src/tests/example_wheel/answerlib/CMakeLists.txt renamed to graalpython/com.oracle.graal.python.test/src/tests/testlib/CMakeLists.txt

@@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 3.5)
-project(answerlib C)
+project(testlib C)
 add_library(answer SHARED answer.c)
 set_target_properties(answer PROPERTIES PUBLIC_HEADER "answer.h")

…c/tests/example_wheel/answerlib/answer.c …l.python.test/src/tests/testlib/answer.cgraalpython/com.oracle.graal.python.test/src/tests/example_wheel/answerlib/answer.c renamed to graalpython/com.oracle.graal.python.test/src/tests/testlib/answer.c graalpython/com.oracle.graal.python.test/src/tests/example_wheel/answerlib/answer.c renamed to graalpython/com.oracle.graal.python.test/src/tests/testlib/answer.c

@@ -0,0 +1,59 @@
+# Copyright (c) 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import shlex
+import shutil
+import subprocess
+
+
+def build_testlib(tmpdir, orig_testlib):
+    tmp_testlib = tmpdir / "testlib"
+    shutil.copytree(orig_testlib, tmp_testlib)
+    testlib_build = tmp_testlib / "build"
+    if testlib_build.exists():
+        shutil.rmtree(testlib_build)
+    testlib_build.mkdir(parents=True, exist_ok=True)
+
+    cmd = ["cmake", "-DCMAKE_BUILD_TYPE=Release", ".."]
+    print("Running:", shlex.join(cmd))
+    subprocess.check_call(cmd, cwd=str(testlib_build))
+    cmd = ["cmake", "--build", ".", "--config", "Release"]
+    print("Running:", shlex.join(cmd))
+    subprocess.check_call(cmd, cwd=str(testlib_build))
+    return testlib_build

…c/tests/example_wheel/answerlib/answer.h …l.python.test/src/tests/testlib/answer.hgraalpython/com.oracle.graal.python.test/src/tests/example_wheel/answerlib/answer.h renamed to graalpython/com.oracle.graal.python.test/src/tests/testlib/answer.h graalpython/com.oracle.graal.python.test/src/tests/example_wheel/answerlib/answer.h renamed to graalpython/com.oracle.graal.python.test/src/tests/testlib/answer.h

@@ -43,9 +43,9 @@
     Extension(
         "testwheel.answer",
         sources=["testwheel/module.c"],
-        include_dirs=["../answerlib"],
+        include_dirs=["../testlib"],
         libraries=["answer"],
-        library_dirs=["../answerlib/build"],
+        library_dirs=["../testlib/build"],
     )
 ]