Fix tests with cmdliner 2.0.0

jonludlam · jonludlam · commit 38e69049c126 · 2025-10-08T13:58:38.000Z
Cmdliner 2.0.0 fails with a slightly different error message than 1.3.0
diff --git a/test/bin/mdx-test/misc/no-such-file/dune b/test/bin/mdx-test/misc/no-such-file/dune
@@ -7,5 +7,12 @@
 
 (rule
  (alias runtest)
+ (enabled_if (< %{version:cmdliner} "2.0.0"))
  (action
   (diff test.expected test.output)))
+
+(rule
+ (alias runtest)
+ (enabled_if (>= %{version:cmdliner} "2.0.0"))
+ (action
+  (diff test.expected-cmdliner2 test.output)))
diff --git a/test/bin/mdx-test/misc/no-such-file/test.expected-cmdliner2 b/test/bin/mdx-test/misc/no-such-file/test.expected-cmdliner2
@@ -0,0 +1,2 @@
+Usage: [01mocaml-mdx test[m [[01m--help[m] [[04mOPTION[m]… [04mFILE[m
+ocaml-mdx: [04mFILE[m argument: no [01mfoo[m file
diff --git a/test/bin/mdx-test/misc/no-such-prelude/dune b/test/bin/mdx-test/misc/no-such-prelude/dune
@@ -7,5 +7,12 @@
 
 (rule
  (alias runtest)
+ (enabled_if (< %{version:cmdliner} "2.0.0"))
  (action
   (diff test.expected test.output)))
+
+(rule
+ (alias runtest)
+ (enabled_if (>= %{version:cmdliner} "2.0.0"))
+ (action
+  (diff test.expected-cmdliner2 test.output)))
diff --git a/test/bin/mdx-test/misc/no-such-prelude/test.expected-cmdliner2 b/test/bin/mdx-test/misc/no-such-prelude/test.expected-cmdliner2
@@ -0,0 +1,2 @@
+Usage: [01mocaml-mdx test[m [[01m--help[m] [[04mOPTION[m]… [04mFILE[m
+ocaml-mdx: option [01m--prelude[m: no [01mfoo[m file

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Usage: [01mocaml-mdx test[m [[01m--help[m] [[04mOPTION[m]… [04mFILE[m`
	`2`	`+ocaml-mdx: [04mFILE[m argument: no [01mfoo[m file`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Usage: [01mocaml-mdx test[m [[01m--help[m] [[04mOPTION[m]… [04mFILE[m`
	`2`	`+ocaml-mdx: option [01m--prelude[m: no [01mfoo[m file`