From 635627309ffea1d044745fc4719b7866a0cba768 Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Sat, 4 Jul 2026 23:35:59 +0200
Subject: [PATCH 1/2] test: upgrade output-comparison tooling to odr_core_test
 2.0.0

Bump the CI public/private output comparisons' `--max-workers` from 1 to 2.
Update `compare_output_server.sh` to the 2.0.0 image and reorder its flags, and
add `compare_output_cli.sh` for running the CLI comparison locally against
`cmake-build-relwithdebinfo` output.

The CLI entry point is `compare-html` in both htmlcmp 1.2.4 (installed in CI)
and 2.0.0 (the module it now points at is `compare_output_cli`, but the console
script stays `compare-html`); there is no `compare-html-cli` executable.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .github/workflows/build_test.yml      |  4 ++--
 test/scripts/compare_output_cli.sh    | 21 +++++++++++++++++++++
 test/scripts/compare_output_server.sh |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100755 test/scripts/compare_output_cli.sh

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 3868b7f6..75dc8846 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -250,7 +250,7 @@ jobs:
         run: |
           compare-html \
             --driver firefox \
-            --max-workers 1 \
+            --max-workers 2 \
             test/data/reference-output/odr-public/output \
             build/test/output/odr-public/output
 
@@ -261,7 +261,7 @@ jobs:
         run: |
           compare-html \
             --driver firefox \
-            --max-workers 1 \
+            --max-workers 2 \
             test/data/reference-output/odr-private/output \
             build/test/output/odr-private/output
 
diff --git a/test/scripts/compare_output_cli.sh b/test/scripts/compare_output_cli.sh
new file mode 100755
index 00000000..936523bd
--- /dev/null
+++ b/test/scripts/compare_output_cli.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+REF="test/data/reference-output/"
+OBS="cmake-build-relwithdebinfo/test/output/"
+DRIVER="firefox"
+
+if [ ! -d "$REF" ]; then
+  echo "Reference output directory does not exist: $REF"
+  exit 1
+fi
+if [ ! -d "$OBS" ]; then
+  echo "Observed output directory does not exist: $OBS"
+  exit 1
+fi
+
+docker run -ti \
+  -v $(pwd):/repo \
+  -p 8000:8000 \
+  --platform linux/amd64 \
+  ghcr.io/opendocument-app/odr_core_test:2.0.0 \
+  compare-html /repo/$REF /repo/$OBS --driver $DRIVER --max-workers 4 -vv
diff --git a/test/scripts/compare_output_server.sh b/test/scripts/compare_output_server.sh
index ce4a6207..5e870ecf 100755
--- a/test/scripts/compare_output_server.sh
+++ b/test/scripts/compare_output_server.sh
@@ -17,5 +17,5 @@ docker run -ti \
   -v $(pwd):/repo \
   -p 8000:8000 \
   --platform linux/amd64 \
-  ghcr.io/opendocument-app/odr_core_test:1.3.0 \
-  compare-html-server /repo/$REF /repo/$OBS --compare --max-workers 4 --driver $DRIVER --port 8000 -vv
+  ghcr.io/opendocument-app/odr_core_test:2.0.0 \
+  compare-html-server /repo/$REF /repo/$OBS --driver $DRIVER --max-workers 4 --compare --port 8000 -vv

From ed0ed70b986cc80d59a30445652ec3a8da8062ba Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Sun, 5 Jul 2026 09:45:02 +0200
Subject: [PATCH 2/2] fix

---
 .github/workflows/build_test.yml                          | 2 +-
 test/scripts/{compare_output_cli.sh => compare_output.sh} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/scripts/{compare_output_cli.sh => compare_output.sh} (100%)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 75dc8846..a78f70f9 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -219,7 +219,7 @@ jobs:
         with:
           python-version: 3.14
       - name: install python dependencies
-        run: pip install htmlcmp==1.2.4
+        run: pip install htmlcmp==2.0.0
 
       - name: download binaries
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
diff --git a/test/scripts/compare_output_cli.sh b/test/scripts/compare_output.sh
similarity index 100%
rename from test/scripts/compare_output_cli.sh
rename to test/scripts/compare_output.sh