CI: fix build

Author: Grok Compression

tests/nonregression/CMakeLists.txt

@@ -198,17 +198,37 @@ function(add_decoder_test EXE_NAME ARGS INPUT_FILENAME OUTPUT_FILENAME TEST_NUM
   else()
     if(NOT IS_CORE_DEC)
       # MD5 Check: Verify the decoded output against registered md5 checksums
-      # Build a platform key: e.g. "Linux", "Linux-static", "Darwin", "Windows"
+      # Build a platform key matching the CI matrix naming convention:
+      #   ubuntu-dynamic, ubuntu-static, macos-dynamic, macos-static,
+      #   windows-dynamic, windows-static
+      # The canonical md5refs.txt is ubuntu-dynamic, so that combo gets an
+      # empty key (no platform override file needed).
+      set(_os_key "")
+      if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+          set(_os_key "ubuntu")
+      elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+          set(_os_key "macos")
+      elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+          set(_os_key "windows")
+      else()
+          set(_os_key "${CMAKE_SYSTEM_NAME}")
+      endif()
       if(BUILD_SHARED_LIBS)
-          set(_md5_platform "${CMAKE_SYSTEM_NAME}")
+          set(_link_key "dynamic")
+      else()
+          set(_link_key "static")
+      endif()
+      # ubuntu-dynamic is canonical — no platform key needed
+      if(_os_key STREQUAL "ubuntu" AND _link_key STREQUAL "dynamic")
+          set(_md5_platform "")
       else()
-          set(_md5_platform "${CMAKE_SYSTEM_NAME}-static")
+          set(_md5_platform "${_os_key}-${_link_key}")
       endif()
       add_test(NAME NR-DEC-${INPUT_FILENAME_NAME}-${TEST_NUM}-decode-md5
                COMMAND ${CMAKE_COMMAND}
                        -DREFFILE:STRING=${CMAKE_CURRENT_SOURCE_DIR}/md5refs.txt
                        -DOUTFILENAME:STRING=${OUTPUT_FILENAME}
-                       -DSYSTEM_NAME:STRING=${_md5_platform}
+                       -DPLATFORM_KEY:STRING=${_md5_platform}
                        -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake)
       set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${TEST_NUM}-decode-md5
                            PROPERTIES DEPENDS NR-DEC-${INPUT_FILENAME_NAME}-${TEST_NUM}-decode)

tests/nonregression/checkmd5refs.cmake

@@ -35,19 +35,20 @@
 # This script expects:
 # REFFILE:      Path to the canonical md5refs.txt file
 # OUTFILENAME:  The name of the generated file to check
-# SYSTEM_NAME:  (optional) CMAKE_SYSTEM_NAME — used to select a platform-specific
-#               md5refs-<SYSTEM_NAME>.txt that overrides REFFILE when it exists.
-#               This lets Linux/macOS/Windows carry different checksums for
-#               floating-point-sensitive codecs (e.g. 9/7 wavelet) without
+# PLATFORM_KEY: (optional) Platform key string (e.g. "ubuntu-dynamic",
+#               "macos-static") used to select a platform-specific
+#               md5refs-<PLATFORM_KEY>.txt that overrides REFFILE when it exists.
+#               This lets each OS ⨉ linkage combination carry its own checksums
+#               for floating-point-sensitive codecs (e.g. 9/7 wavelet) without
 #               requiring separate branches.
 
 # Resolve the active reference file: prefer platform-specific override.
 set(ACTIVE_REFFILE "${REFFILE}")
-if(SYSTEM_NAME)
+if(PLATFORM_KEY)
     get_filename_component(_refdir  "${REFFILE}" DIRECTORY)
     get_filename_component(_refname "${REFFILE}" NAME_WE)
     get_filename_component(_refext  "${REFFILE}" EXT)
-    set(_platform_reffile "${_refdir}/${_refname}-${SYSTEM_NAME}${_refext}")
+    set(_platform_reffile "${_refdir}/${_refname}-${PLATFORM_KEY}${_refext}")
     if(EXISTS "${_platform_reffile}")
         set(ACTIVE_REFFILE "${_platform_reffile}")
         message(STATUS "Using platform-specific MD5 refs: ${_platform_reffile}")

tests/nonregression/collect_ci_md5refs.py

@@ -23,13 +23,15 @@
 
 # Maps artifact name pattern -> platform key for update_md5refs.py
 # Artifact names: test-results-<os>-shared_<ON|OFF>
+# Platform keys follow CI matrix naming: <os>-<dynamic|static>
+# ubuntu-dynamic is canonical (md5refs.txt) — no platform override needed.
 ARTIFACT_PLATFORM_MAP = {
-    ("macos-latest",  "ON"):  "Darwin",
-    ("macos-latest",  "OFF"): "Darwin-static",
-    ("windows-latest","ON"):  "Windows",
-    ("windows-latest","OFF"): "Windows-static",
+    ("macos-latest",  "ON"):  "macos-dynamic",
+    ("macos-latest",  "OFF"): "macos-static",
+    ("windows-latest","ON"):  "windows-dynamic",
+    ("windows-latest","OFF"): "windows-static",
     ("ubuntu-latest", "ON"):  None,   # canonical md5refs.txt — skip
-    ("ubuntu-latest", "OFF"): "Linux-static",
+    ("ubuntu-latest", "OFF"): "ubuntu-static",
 }
 
 
@@ -69,6 +71,10 @@ def main():
     parser.add_argument("--repo", default=REPO)
     parser.add_argument("--dry-run", action="store_true",
                         help="Show what would be done without modifying md5refs files")
+    parser.add_argument("--data-dir", metavar="DIR", action="append",
+                        help="Pass --data-dir to update_md5refs.py for lossy verification")
+    parser.add_argument("--no-verify", action="store_true",
+                        help="Pass --no-verify to update_md5refs.py to skip lossy check")
     args = parser.parse_args()
 
     # Check gh is available
@@ -131,6 +137,11 @@ def main():
             print(f"\n--- {name} -> platform key: {platform_key} ---")
             cmd = [sys.executable, str(SCRIPT_DIR / "update_md5refs.py"),
                    "--platform", platform_key, str(log_path)]
+            if args.data_dir:
+                for d in args.data_dir:
+                    cmd.extend(["--data-dir", d])
+            if args.no_verify:
+                cmd.append("--no-verify")
             if args.dry_run:
                 print(f"  [dry-run] would run: {' '.join(cmd)}")
             else: