Add shared sampling regression and tests

Add a new shared sampling regression tool (src/imiv/tools/imiv_sampling_regression.py) to perform nearest vs linear preview sampling in a single app run. Integrate it into the test suite by adding an imiv_sampling_regression CTest entry in src/imiv/CMakeLists.txt and wire it into the backend verifier (src/imiv/tools/imiv_backend_verify.py) via a new _sampling_checks helper. Update verifier logic to emit the sampling logs, consolidate some smoke/screenshot handling, and skip certain checks if smoke fails. Replace the old Metal-specific sampling script with a thin compatibility wrapper (imiv_metal_sampling_regression.py) that delegates to the shared script. Update imiv docs to reference the shared sampling regression and note backend-specific logs.

Author: ssh4net

src/imiv/CMakeLists.txt

@@ -1198,22 +1198,6 @@ if (TARGET imiv
                 TIMEOUT 180)
 
         if (TARGET oiiotool)
-            add_test (
-                NAME imiv_metal_sampling_regression
-                COMMAND
-                    "${Python3_EXECUTABLE}"
-                    "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_metal_sampling_regression.py"
-                    --bin "$<TARGET_FILE:imiv>"
-                    --cwd "$<TARGET_FILE_DIR:imiv>"
-                    --backend metal
-                    --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
-                    --oiiotool "$<TARGET_FILE:oiiotool>"
-                    --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/metal_sampling_regression")
-            set_tests_properties (
-                imiv_metal_sampling_regression PROPERTIES
-                    LABELS "imiv;imiv_metal;gui"
-                    TIMEOUT 180)
-
             add_test (
                 NAME imiv_metal_orientation_regression
                 COMMAND
@@ -1349,6 +1333,22 @@ if (TARGET imiv
             LABELS "imiv;imiv_rgb;gui"
             TIMEOUT 120)
 
+    add_test (
+        NAME imiv_sampling_regression
+        COMMAND
+            "${Python3_EXECUTABLE}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_sampling_regression.py"
+            --bin "$<TARGET_FILE:imiv>"
+            --cwd "$<TARGET_FILE_DIR:imiv>"
+            ${_imiv_ctest_default_backend_args}
+            --oiiotool "$<TARGET_FILE:oiiotool>"
+            --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+            --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/sampling_regression")
+    set_tests_properties (
+        imiv_sampling_regression PROPERTIES
+            LABELS "imiv;imiv_sampling;gui"
+            TIMEOUT 180)
+
     if (_imiv_enabled_backend_count GREATER 1)
         add_test (
             NAME imiv_backend_preferences_regression

src/imiv/README.md

@@ -119,10 +119,11 @@ Main output logs:
 - `verify_smoke.log`
 - `verify_rgb.log`
 - `verify_ux.log`
-- `verify_screenshot.log`
 - `verify_sampling.log`
-- `verify_orientation.log`
 - `verify_ocio_missing.log`
 - `verify_ocio_config_source.log`
 - `verify_ocio_live.log`
 - `verify_ocio_live_display.log`
+
+Backend-specific specialized regressions such as Metal orientation still write
+their own dedicated logs outside the shared verifier.

src/imiv/imiv_backends.md

@@ -209,6 +209,8 @@ Manual verification:
   - [imiv_backend_verify.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_backend_verify.py)
 - shared RGB-input regression:
   - [imiv_rgb_input_regression.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_rgb_input_regression.py)
+- shared nearest-vs-linear sampling regression:
+  - [imiv_sampling_regression.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_sampling_regression.py)
 - compatibility frontends:
   - [imiv_macos_backend_verify.sh](/mnt/f/gh/openimageio/src/imiv/tools/imiv_macos_backend_verify.sh)
   - [imiv_linux_backend_verify.sh](/mnt/f/gh/openimageio/src/imiv/tools/imiv_linux_backend_verify.sh)
@@ -217,8 +219,6 @@ Manual verification:
   - [imiv_metal_smoke_regression.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_metal_smoke_regression.py)
 - Metal screenshot smoke regression:
   - [imiv_metal_screenshot_regression.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_metal_screenshot_regression.py)
-- Metal nearest vs linear sampling regression:
-  - [imiv_metal_sampling_regression.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_metal_sampling_regression.py)
 - Metal orientation regression:
   - [imiv_metal_orientation_regression.py](/mnt/f/gh/openimageio/src/imiv/tools/imiv_metal_orientation_regression.py)
 

src/imiv/tools/imiv_backend_verify.py

@@ -279,23 +279,6 @@ def _smoke_checks(
         checks.append(
             (
                 "smoke",
-                _script_cmd(
-                    repo_root / "src" / "imiv" / "tools" / "imiv_metal_smoke_regression.py",
-                    backend=backend,
-                    exe=exe,
-                    run_cwd=run_cwd,
-                    out_dir=out_dir / "runtime",
-                    trace=trace,
-                    extra=["--open", str(image)],
-                    env_script=env_script,
-                ),
-                out_dir / "verify_smoke.log",
-                None,
-            )
-        )
-        checks.append(
-            (
-                "screenshot",
                 _script_cmd(
                     repo_root
                     / "src"
@@ -305,53 +288,12 @@ def _smoke_checks(
                     backend=backend,
                     exe=exe,
                     run_cwd=run_cwd,
-                    out_dir=out_dir / "runtime_screenshot",
-                    trace=trace,
-                    extra=["--open", str(image)],
-                    env_script=env_script,
-                ),
-                out_dir / "verify_screenshot.log",
-                None,
-            )
-        )
-        checks.append(
-            (
-                "sampling",
-                _script_cmd(
-                    repo_root
-                    / "src"
-                    / "imiv"
-                    / "tools"
-                    / "imiv_metal_sampling_regression.py",
-                    backend=backend,
-                    exe=exe,
-                    run_cwd=run_cwd,
-                    out_dir=out_dir / "runtime_sampling",
-                    trace=trace,
-                    env_script=env_script,
-                ),
-                out_dir / "verify_sampling.log",
-                None,
-            )
-        )
-        checks.append(
-            (
-                "orientation",
-                _script_cmd(
-                    repo_root
-                    / "src"
-                    / "imiv"
-                    / "tools"
-                    / "imiv_metal_orientation_regression.py",
-                    backend=backend,
-                    exe=exe,
-                    run_cwd=run_cwd,
-                    out_dir=out_dir / "runtime_orientation",
+                    out_dir=out_dir / "runtime",
                     trace=trace,
                     extra=["--open", str(image)],
                     env_script=env_script,
                 ),
-                out_dir / "verify_orientation.log",
+                out_dir / "verify_smoke.log",
                 None,
             )
         )
@@ -422,6 +364,30 @@ def _ux_checks(
     return [("ux", cmd, out_dir / "verify_ux.log", None)]
 
 
+def _sampling_checks(
+    repo_root: Path,
+    backend: str,
+    exe: Path,
+    run_cwd: Path,
+    oiiotool: Path,
+    out_dir: Path,
+    env_script: Path | None,
+    trace: bool,
+) -> list[tuple[str, list[str], Path, dict[str, str] | None]]:
+    script = repo_root / "src" / "imiv" / "tools" / "imiv_sampling_regression.py"
+    cmd = _script_cmd(
+        script,
+        backend=backend,
+        exe=exe,
+        run_cwd=run_cwd,
+        out_dir=out_dir / "runtime_sampling",
+        trace=trace,
+        extra=["--oiiotool", str(oiiotool)],
+        env_script=env_script,
+    )
+    return [("sampling", cmd, out_dir / "verify_sampling.log", None)]
+
+
 def _rgb_checks(
     repo_root: Path,
     backend: str,
@@ -831,6 +797,18 @@ def main() -> int:
             args.trace,
         )
     )
+    checks.extend(
+        _sampling_checks(
+            repo_root,
+            args.backend,
+            imiv,
+            run_cwd,
+            oiiotool,
+            out_dir,
+            env_script,
+            args.trace,
+        )
+    )
     checks.extend(
         _ocio_checks(
             repo_root,
@@ -848,7 +826,20 @@ def main() -> int:
     )
 
     failures: list[str] = []
+    smoke_failed = False
+    skip_after_smoke = {
+        "ocio_missing",
+        "ocio_config_source",
+        "ocio_live",
+        "ocio_live_display",
+    }
     for name, cmd, log_path, env_override in checks:
+        if smoke_failed and name in skip_after_smoke:
+            message = "skip: skipped because smoke failed\n"
+            _write_text(log_path, message)
+            sys.stdout.write(f"==> {name}: skipped because smoke failed\n")
+            timings.append((f"{name}(skipped)", 0.0))
+            continue
         env = dict(base_env)
         if env_override:
             env.update(env_override)
@@ -862,6 +853,8 @@ def main() -> int:
         timings.append((name, elapsed))
         if rc != 0:
             failures.append(name)
+            if name == "smoke":
+                smoke_failed = True
 
     print("")
     print(f"Verification logs written to: {out_dir}")
@@ -874,13 +867,8 @@ def main() -> int:
     print(f"  runtime+rgb: {out_dir / 'runtime_rgb'}")
     print(f"  ux:          {out_dir / 'verify_ux.log'}")
     print(f"  runtime+ux:  {out_dir / 'runtime_ux'}")
-    if args.backend == "metal":
-        print(f"  screenshot:  {out_dir / 'verify_screenshot.log'}")
-        print(f"  runtime+ss:  {out_dir / 'runtime_screenshot'}")
-        print(f"  sampling:    {out_dir / 'verify_sampling.log'}")
-        print(f"  runtime+sa:  {out_dir / 'runtime_sampling'}")
-        print(f"  orient:      {out_dir / 'verify_orientation.log'}")
-        print(f"  runtime+or:  {out_dir / 'runtime_orientation'}")
+    print(f"  sampling:    {out_dir / 'verify_sampling.log'}")
+    print(f"  runtime+sa:  {out_dir / 'runtime_sampling'}")
     print(f"  ocio-miss:   {out_dir / 'verify_ocio_missing.log'}")
     print(f"  runtime+om:  {out_dir / 'runtime_ocio_missing'}")
     print(f"  ocio-src:    {out_dir / 'verify_ocio_config_source.log'}")