Merge pull request #24542 from mseri/fix-ubs

mseri · web-flow · commit 3e024f8a426d · 2023-10-06T19:42:38.000+02:00
Fix upper bounds on tests using mdx
diff --git a/packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam b/packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam
@@ -41,7 +41,6 @@ build: [
     jobs
     "--promote-install-files=false"
     "@install"
-    "@cohttp-eio/runtest" {with-test}
     "@doc" {with-doc}
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
diff --git a/packages/containers-data/containers-data.3.11/opam b/packages/containers-data/containers-data.3.11/opam
@@ -5,7 +5,7 @@ license: "BSD-2-Clause"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "@doc" "-p" name ] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "x86_32" & arch != "arm32"}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "x86_32" & arch != "arm32" & ocaml:version < "5.1.0"}
 ]
 depends: [
   "ocaml" { >= "4.03.0" }
diff --git a/packages/eio_main/eio_main.0.6/opam b/packages/eio_main/eio_main.0.6/opam
@@ -10,7 +10,7 @@ bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
   "dune" {>= "2.9"}
   "eio_linux" {= version & os = "linux"}
-  "mdx" {>= "1.10.0" & with-test}
+  "mdx" {>= "1.10.0" & < "2.3.1" & with-test}
   "eio_luv" {= version}
   "odoc" {with-doc}
 ]
diff --git a/packages/eio_main/eio_main.0.7/opam b/packages/eio_main/eio_main.0.7/opam
@@ -10,7 +10,7 @@ bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
   "dune" {>= "2.9"}
   "eio_linux" {= version & os = "linux"}
-  "mdx" {>= "1.10.0" & with-test}
+  "mdx" {>= "1.10.0" & < "2.3.1" & with-test}
   "eio_luv" {= version}
   "odoc" {with-doc}
 ]
diff --git a/packages/eio_main/eio_main.0.8.1/opam b/packages/eio_main/eio_main.0.8.1/opam
@@ -10,7 +10,7 @@ bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
   "dune" {>= "3.0"}
   "eio_linux" {= version & os = "linux"}
-  "mdx" {>= "1.10.0" & with-test}
+  "mdx" {>= "1.10.0" & < "2.3.1" & with-test}
   "eio_luv" {= version}
   "odoc" {with-doc}
 ]
diff --git a/packages/eio_main/eio_main.0.9/opam b/packages/eio_main/eio_main.0.9/opam
@@ -9,7 +9,7 @@ doc: "https://ocaml-multicore.github.io/eio/"
 bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
   "dune" {>= "3.7"}
-  "mdx" {>= "2.2.0" & with-test}
+  "mdx" {>= "2.2.0" & < "2.3.1" & with-test}
   "eio_linux" {= version & os = "linux"}
   "eio_posix" {= version & os != "win32"}
   "eio_luv" {= version & (os = "win32" | with-test)}
diff --git a/packages/lwt_eio/lwt_eio.0.2/opam b/packages/lwt_eio/lwt_eio.0.2/opam
@@ -12,7 +12,7 @@ depends: [
   "dune" {>= "2.9"}
   "eio" {>= "0.2" & < "0.11"}
   "lwt"
-  "mdx" {>= "1.10.0" & with-test}
+  "mdx" {>= "1.10.0" & < "2.3.1" & with-test}
   "eio_main" {with-test}
   "odoc" {with-doc}
 ]
diff --git a/packages/lwt_eio/lwt_eio.0.3/opam b/packages/lwt_eio/lwt_eio.0.3/opam
@@ -12,7 +12,7 @@ depends: [
   "dune" {>= "2.9"}
   "eio" {>= "0.7" & < "0.11"}
   "lwt"
-  "mdx" {>= "1.10.0" & with-test}
+  "mdx" {>= "1.10.0" & < "2.3.1" & with-test}
   "eio_main" {with-test}
   "odoc" {with-doc}
 ]
diff --git a/packages/par_incr/par_incr.0.1/opam b/packages/par_incr/par_incr.0.1/opam
@@ -30,7 +30,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & ocaml:version < "5.1"}
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/uring/uring.0.4/opam b/packages/uring/uring.0.4/opam
@@ -31,7 +31,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & ocaml:version < "5.1"}
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/uring/uring.0.5/opam b/packages/uring/uring.0.5/opam
@@ -31,7 +31,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & ocaml:version < "5.1"}
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/uring/uring.0.6/opam b/packages/uring/uring.0.6/opam
@@ -31,7 +31,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & ocaml:version < "5.1.0"}
     "@doc" {with-doc}
   ]
 ]

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ build: [`
`41`	`41`	`jobs`
`42`	`42`	`"--promote-install-files=false"`
`43`	`43`	`"@install"`
`44`		`- "@cohttp-eio/runtest" {with-test}`
`45`	`44`	`"@doc" {with-doc}`
`46`	`45`	`]`
`47`	`46`	`["dune" "install" "-p" name "--create-install-files" name]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ license: "BSD-2-Clause"`
`5`	`5`	`build: [`
`6`	`6`	`["dune" "build" "-p" name "-j" jobs]`
`7`	`7`	`["dune" "build" "@doc" "-p" name ] {with-doc}`
`8`		`- ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "x86_32" & arch != "arm32"}`
	`8`	`+ ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "x86_32" & arch != "arm32" & ocaml:version < "5.1.0"}`
`9`	`9`	`]`
`10`	`10`	`depends: [`
`11`	`11`	`"ocaml" { >= "4.03.0" }`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ bug-reports: "https://github.com/ocaml-multicore/eio/issues"`
`10`	`10`	`depends: [`
`11`	`11`	`"dune" {>= "2.9"}`
`12`	`12`	`"eio_linux" {= version & os = "linux"}`
`13`		`- "mdx" {>= "1.10.0" & with-test}`
	`13`	`+ "mdx" {>= "1.10.0" & < "2.3.1" & with-test}`
`14`	`14`	`"eio_luv" {= version}`
`15`	`15`	`"odoc" {with-doc}`
`16`	`16`	`]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ depends: [`
`12`	`12`	`"dune" {>= "2.9"}`
`13`	`13`	`"eio" {>= "0.2" & < "0.11"}`
`14`	`14`	`"lwt"`
`15`		`- "mdx" {>= "1.10.0" & with-test}`
	`15`	`+ "mdx" {>= "1.10.0" & < "2.3.1" & with-test}`
`16`	`16`	`"eio_main" {with-test}`
`17`	`17`	`"odoc" {with-doc}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ build: [`
`30`	`30`	`"-j"`
`31`	`31`	`jobs`
`32`	`32`	`"@install"`
`33`		`- "@runtest" {with-test}`
	`33`	`+ "@runtest" {with-test & ocaml:version < "5.1"}`
`34`	`34`	`"@doc" {with-doc}`
`35`	`35`	`]`
`36`	`36`	`]`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ build: [`
`31`	`31`	`"-j"`
`32`	`32`	`jobs`
`33`	`33`	`"@install"`
`34`		`- "@runtest" {with-test}`
	`34`	`+ "@runtest" {with-test & ocaml:version < "5.1"}`
`35`	`35`	`"@doc" {with-doc}`
`36`	`36`	`]`
`37`	`37`	`]`