Move nanobind test duplication into CMake

Signed-off-by: Aleksandr Motsjonov <soswow@gmail.com>

Author: soswow

src/cmake/testing.cmake

@@ -33,6 +33,7 @@ set(OIIO_TESTSUITE_IMAGEDIR "${PROJECT_BINARY_DIR}/testsuite" CACHE PATH
 #                    [ DISABLEVAR variable_name ... ]
 #                    [ SUFFIX suffix ]
 #                    [ ENVIRONMENT "VAR=value" ... ]
+#                    [ ENVIRONMENT_MODIFICATION "VAR=op:value" ... ]
 #                  )
 #
 # The optional argument IMAGEDIR is used to check whether external test images
@@ -55,8 +56,12 @@ set(OIIO_TESTSUITE_IMAGEDIR "${PROJECT_BINARY_DIR}/testsuite" CACHE PATH
 # The optional ENVIRONMENT is a list of environment variables to set for the
 # test.
 #
+# The optional ENVIRONMENT_MODIFICATION is a list of environment variable
+# modifications in the format accepted by the CTest ENVIRONMENT_MODIFICATION
+# property.
+#
 macro (oiio_add_tests)
-    cmake_parse_arguments (_ats "" "SUFFIX;TESTNAME" "URL;IMAGEDIR;LABEL;FOUNDVAR;ENABLEVAR;DISABLEVAR;ENVIRONMENT" ${ARGN})
+    cmake_parse_arguments (_ats "" "SUFFIX;TESTNAME" "URL;IMAGEDIR;LABEL;FOUNDVAR;ENABLEVAR;DISABLEVAR;ENVIRONMENT;ENVIRONMENT_MODIFICATION" ${ARGN})
        # Arguments: <prefix> <options> <one_value_keywords> <multi_value_keywords> args...
     set (_ats_testdir "${OIIO_TESTSUITE_IMAGEDIR}/${_ats_IMAGEDIR}")
     # If there was a FOUNDVAR param specified and that variable name is
@@ -131,6 +136,11 @@ macro (oiio_add_tests)
                              "OIIO_TESTSUITE_CUR=${_testdir}"
                              "Python_EXECUTABLE=${Python3_EXECUTABLE}"
                              ${_ats_ENVIRONMENT})
+            if (_ats_ENVIRONMENT_MODIFICATION)
+                set_property(TEST ${_testname} APPEND PROPERTY
+                             ENVIRONMENT_MODIFICATION
+                             ${_ats_ENVIRONMENT_MODIFICATION})
+            endif ()
             if (NOT ${_ats_testdir} STREQUAL "")
                 set_property(TEST ${_testname} APPEND PROPERTY ENVIRONMENT
                              "OIIO_TESTSUITE_IMAGEDIR=${_ats_testdir}")
@@ -228,25 +238,48 @@ macro (oiio_add_all_tests)
     # Python interpreter itself won't be linked with the right asan
     # libraries to run correctly.
     if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY AND NOT SANITIZE)
-        oiio_add_tests (
-            docs-examples-python
-            python-colorconfig
-            python-deep 
-            python-imagebuf
-            python-imagecache
-            python-imageoutput
-            python-imagespec
-            python-paramlist
-            python-roi
-            python-texturesys
-            python-typedesc
-            filters
-            )
-        # These Python tests also need access to oiio-images
-        oiio_add_tests (
-            python-imageinput python-imagebufalgo
-            IMAGEDIR oiio-images
-            )
+        set (pybind11_python_path_mod
+             "PYTHONPATH=path_list_prepend:${CMAKE_BINARY_DIR}/lib/python/site-packages")
+        set (nanobind_python_tests
+             python-imagespec
+             python-paramlist
+             python-roi
+             python-typedesc)
+        set (nanobind_python_test_suffix ".nanobind")
+        if (OIIO_BUILD_PYTHON_PYBIND11)
+            oiio_add_tests (
+                docs-examples-python
+                python-colorconfig
+                python-deep
+                python-imagebuf
+                python-imagecache
+                python-imageoutput
+                python-imagespec
+                python-paramlist
+                python-roi
+                python-texturesys
+                python-typedesc
+                filters
+                ENVIRONMENT_MODIFICATION ${pybind11_python_path_mod}
+                )
+            # These Python tests also need access to oiio-images
+            oiio_add_tests (
+                python-imageinput python-imagebufalgo
+                IMAGEDIR oiio-images
+                ENVIRONMENT_MODIFICATION ${pybind11_python_path_mod}
+                )
+        else ()
+            set (nanobind_python_test_suffix "")
+        endif ()
+
+        if (OIIO_BUILD_PYTHON_NANOBIND)
+            oiio_add_tests (
+                ${nanobind_python_tests}
+                SUFFIX ${nanobind_python_test_suffix}
+                ENVIRONMENT_MODIFICATION
+                    "PYTHONPATH=path_list_prepend:${CMAKE_BINARY_DIR}/lib/python/nanobind"
+                )
+        endif ()
     endif ()
 
     oiio_add_tests (oiiotool-color

testsuite/runtest.py

@@ -12,8 +12,6 @@
 import difflib
 import filecmp
 import shutil
-import shlex
-from typing import Optional
 
 from optparse import OptionParser
 
@@ -55,12 +53,6 @@ def make_relpath (path: str, start: str=os.curdir) -> str:
     p = os.path.relpath (path, start)
     return p if platform.system() != 'Windows' else p.replace ('\\', '/')
 
-
-def shell_quote(arg: str) -> str:
-    if platform.system() == 'Windows':
-        return subprocess.list2cmdline([arg])
-    return shlex.quote(arg)
-
 # Try to figure out where some key things are. Go by env variables set by
 # the cmake tests, but if those aren't set, assume somebody is running
 # this script by hand from inside build/testsuite/TEST and that
@@ -85,20 +77,11 @@ def shell_quote(arg: str) -> str:
 refdir = "ref/"
 refdirlist = [ refdir ]
 mytest = os.path.split(os.path.abspath(os.getcwd()))[-1]
-if str(mytest).endswith('.batch') :
-    mytest = mytest.split('.')[0]
+if str(mytest).endswith('.batch') or str(mytest).endswith('.nanobind') :
+    mytest = mytest.rsplit('.', 1)[0]
 test_source_dir = os.getenv('OIIO_TESTSUITE_SRC',
                             os.path.join(OIIO_TESTSUITE_ROOT, mytest))
 
-# Python tests listed here also run against the staged nanobind package when
-# it exists in the current build tree.
-nanobind_python_tests = {
-    "python-imagespec",
-    "python-paramlist",
-    "python-roi",
-    "python-typedesc",
-}
-
 def oiio_app (app: str) -> str:
     if (platform.system () != 'Windows' or options.devenv_config == ""):
         cmd = os.path.join(OIIO_BUILD_ROOT, "bin", app) + " "
@@ -118,7 +101,6 @@ def oiio_app (app: str) -> str:
 
 command = ""
 outputs = [ "out.txt" ]    # default
-ref_name_overrides = {}
 
 # The image comparison thresholds are tricky to remember. Here's the key:
 # A test fails if more than `failpercent` of pixel values differ by more
@@ -372,18 +354,16 @@ def oiiotool (args: str, silent: bool=False, concat: bool=True, failureok: bool=
 # the identical name, and if that fails, it will look for alternatives of
 # the form "basename-*.ext" (or ANY match in the ref directory, if anymatch
 # is True).
-def checkref (name: str, refdirlist: list[str], refname: Optional[str]=None) -> tuple[bool, str]:
+def checkref (name: str, refdirlist: list[str]) -> tuple[bool, str]:
     # Break the output into prefix+extension
-    if refname is None:
-        refname = name
-    (prefix, extension) = os.path.splitext(refname)
+    (prefix, extension) = os.path.splitext(name)
     ok = 0
     for ref in refdirlist :
         # We will first compare name to ref/name, and if that fails, we will
         # compare it to everything else that matches ref/prefix-*.extension.
         # That allows us to have multiple matching variants for different
         # platforms, etc.
-        defaulttest = os.path.join(ref,refname)
+        defaulttest = os.path.join(ref,name)
         if anymatch :
             pattern = "*.*"
         else :
@@ -420,9 +400,6 @@ def runtest (command: str, outputs: list[str], failureok: int=0) -> int :
     err = 0
 #    print ("working dir = " + tmpdir)
     os.chdir (srcdir)
-    for out in ("out.txt", "out.err.txt", "out-nanobind.txt"):
-        if os.path.exists(out):
-            os.remove(out)
     open ("out.txt", "w").close()    # truncate out.txt
     open ("out.err.txt", "w").close()    # truncate out.txt
     if os.path.isfile("debug.log") :
@@ -460,8 +437,7 @@ def runtest (command: str, outputs: list[str], failureok: int=0) -> int :
             if os.path.exists('crlf.txt') :
                 os.remove('crlf.txt')
 
-        refname = ref_name_overrides.get(out, out)
-        (ok, testfile) = checkref (out, refdirlist, refname=refname)
+        (ok, testfile) = checkref (out, refdirlist)
 
         if ok :
             if extension in image_extensions :
@@ -501,61 +477,13 @@ def runtest (command: str, outputs: list[str], failureok: int=0) -> int :
 
 
 #
-# Read the individual run.py file for this test, which will define
+# Read the individual run.py file for this test, which will define 
 # command and outputs.
 #
 with open(os.path.join(test_source_dir,"run.py")) as f:
     code = compile(f.read(), "run.py", 'exec')
     exec (code)
 
-# For tests that have a nanobind port, run the same canonical Python test
-# body a second time against the staged nanobind package from the current
-# build tree. Keep the output separate so failures still indicate which
-# backend mismatched the shared reference output.
-nanobind_package = os.path.join(
-    OIIO_BUILD_ROOT, "lib", "python", "nanobind", "OpenImageIO", "__init__.py"
-)
-if mytest in nanobind_python_tests and os.path.exists(nanobind_package):
-    nanobind_test_scripts = sorted(glob.glob(os.path.join(test_source_dir, "src", "*.py")))
-    if len(nanobind_test_scripts) != 1:
-        raise RuntimeError(
-            "Expected exactly one Python test script under "
-            + os.path.join(test_source_dir, "src")
-            + ", found "
-            + str(len(nanobind_test_scripts))
-        )
-    nanobind_test_script = make_relpath(nanobind_test_scripts[0], tmpdir)
-    nanobind_package_root = make_relpath(
-        os.path.join(OIIO_BUILD_ROOT, "lib", "python", "nanobind"),
-        tmpdir,
-    )
-    # Re-run the same canonical test script as a standalone program, but
-    # with the staged nanobind package inserted first on sys.path so
-    # `import OpenImageIO` resolves to the nanobind backend.
-    nanobind_code = (
-        "import runpy, sys\n"
-        + "sys.path.insert(0, "
-        + repr(nanobind_package_root)
-        + ")\n"
-        + "runpy.run_path("
-        + repr(nanobind_test_script)
-        + ", run_name='__main__')\n"
-    )
-    command += (
-        " ; "
-        + shell_quote(pythonbin)
-        + " -c "
-        + shell_quote(nanobind_code)
-        + " > out-nanobind.txt"
-    )
-    # Example of final command for `python-roi` would be:
-    # python src/test_roi.py > out.txt ; \
-    # python -c 'import runpy, sys
-    # sys.path.insert(0, "../../lib/python/nanobind")
-    # runpy.run_path("src/test_roi.py", run_name="__main__")' > out-nanobind.txt
-    outputs.append("out-nanobind.txt")
-    ref_name_overrides["out-nanobind.txt"] = "out.txt"
-
 # Allow a little more slop for slight pixel differences when in DEBUG
 # mode or when running on remote CI machines.
 if (os.getenv('CI') or os.getenv('DEBUG')) :