From ed65bfca6e9df8bb0c0bf33862689942b191a1e2 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 10 Sep 2026 00:05:34 +0200
Subject: [PATCH 1/3] Bump requirement so with-test requires dune.3.22.0

---
 dune-project | 4 ++++
 mutaml.opam  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dune-project b/dune-project
index 1f534f4..8417d91 100644
--- a/dune-project
+++ b/dune-project
@@ -7,6 +7,8 @@
 
 (generate_opam_files)
 
+(warnings (duplicate_deps disabled))
+
 (package
  (name mutaml)
  (synopsis "A mutation tester for OCaml")
@@ -26,6 +28,8 @@
  (tags ("test" "mutation testing"))
  (depends
   (ocaml (>= 4.12.0))
+  (dune (>= 3.18))
+  (dune (and (>= 3.22.0) :with-test))
   (ppxlib (and (>= 0.28.0) (< 0.36.0)))
   (ppx_deriving_yojson (>= 3.7.0))
   stdlib-random
diff --git a/mutaml.opam b/mutaml.opam
index 4712747..4758bf7 100644
--- a/mutaml.opam
+++ b/mutaml.opam
@@ -19,7 +19,7 @@ bug-reports: "https://github.com/jmid/mutaml/issues"
 depends: [
   "ocaml" {>= "4.12.0"}
   "dune" {>= "3.18"}
-  "dune" {< "3.22.0" & with-test}
+  "dune" {>= "3.22.0" & with-test}
   "ppxlib" {>= "0.28.0" & < "0.36.0"}
   "ppx_deriving_yojson" {>= "3.7.0"}
   "stdlib-random"

From a793aa7b8fdb16580371493ca456c09219fa44a2 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 10 Sep 2026 00:08:43 +0200
Subject: [PATCH 2/3] Update cram tests to expect _build/trace.csexp rather
 than _build/log

---
 test/issue-attributes.t/run.t    | 2 +-
 test/issue-newlines.t/run.t      | 2 +-
 test/issue-pattern-match.t/run.t | 2 +-
 test/issue-stdlib-equal.t/run.t  | 2 +-
 test/testproj-1-module.t/run.t   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/issue-attributes.t/run.t b/test/issue-attributes.t/run.t
index f01a6b8..637c26a 100644
--- a/test/issue-attributes.t/run.t
+++ b/test/issue-attributes.t/run.t
@@ -42,7 +42,7 @@ Set seed and (full) mutation rate as environment variables, for repeatability
 
   $ ls _build
   default
-  log
+  trace.csexp
 
   $ ls _build/default
   mutaml-mut-files.txt
diff --git a/test/issue-newlines.t/run.t b/test/issue-newlines.t/run.t
index aa84ce6..4bf8ac6 100644
--- a/test/issue-newlines.t/run.t
+++ b/test/issue-newlines.t/run.t
@@ -53,7 +53,7 @@ Set seed and (full) mutation rate as environment variables, for repeatability
 
   $ ls _build
   default
-  log
+  trace.csexp
 
   $ ls _build/default
   mutaml-mut-files.txt
diff --git a/test/issue-pattern-match.t/run.t b/test/issue-pattern-match.t/run.t
index b47e514..10eb9f3 100644
--- a/test/issue-pattern-match.t/run.t
+++ b/test/issue-pattern-match.t/run.t
@@ -71,7 +71,7 @@ Set seed and (full) mutation rate as environment variables, for repeatability
 
   $ ls _build
   default
-  log
+  trace.csexp
 
   $ ls _build/default
   mutaml-mut-files.txt
diff --git a/test/issue-stdlib-equal.t/run.t b/test/issue-stdlib-equal.t/run.t
index 0393bdf..a671915 100644
--- a/test/issue-stdlib-equal.t/run.t
+++ b/test/issue-stdlib-equal.t/run.t
@@ -52,7 +52,7 @@ Set seed and (full) mutation rate as environment variables, for repeatability
 
   $ ls _build
   default
-  log
+  trace.csexp
 
   $ ls _build/default
   mutaml-mut-files.txt
diff --git a/test/testproj-1-module.t/run.t b/test/testproj-1-module.t/run.t
index d6bb955..929337f 100644
--- a/test/testproj-1-module.t/run.t
+++ b/test/testproj-1-module.t/run.t
@@ -471,8 +471,8 @@ Create a dune-workspace file with another build context:
   
   _build:
   default
-  log
   mutation
+  trace.csexp
   
   _mutations:
   lib.ml-mutant12

From 724319569b0d92acbb2f0c3c93fe33cf2d692a7b Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 10 Sep 2026 00:35:47 +0200
Subject: [PATCH 3/3] run dune build single threaded in test suite

---
 test/filter_dune_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/filter_dune_build.sh b/test/filter_dune_build.sh
index 470ca13..f51397e 100755
--- a/test/filter_dune_build.sh
+++ b/test/filter_dune_build.sh
@@ -3,7 +3,7 @@
 # breakdown:
 #   filter [@@@ocaml.ppx.context whitespace {  0-or-more not-close-brace-chars }]
 #   and normalize file system paths
-dune build $@ 2>&1 | \
+dune build -j1 $@ 2>&1 | \
     sed -E 'H;1h;$!d;x;s/\[@@@ocaml\.ppx\.context\n\ \ \{[^}]*\}\]//g' | \
     sed -E "/^\/usr\/bin\/ld/d" | \
     sed 's/home[^ ]*bin\//some\/path\/...\/bin\//' | \