From 08f50daf26cd31b79eeb14eb05790ee92b1d8e21 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 28 Sep 2023 11:31:42 +0200 Subject: [PATCH 1/7] cohttp-eio alpha0: tests are broken in the sandbox Fatal error: exception Eio__Net.Connection_failure(_) Signed-off-by: Marcello Seri --- packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam b/packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam index 4ce32052356..4676f9c1b77 100644 --- 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,7 @@ build: [ jobs "--promote-install-files=false" "@install" - "@cohttp-eio/runtest" {with-test} + "@cohttp-eio/runtest" "@doc" {with-doc} ] ["dune" "install" "-p" name "--create-install-files" name] From 6349fd5a5b87e8a828c526a1ec0bace530b9f141 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 28 Sep 2023 11:33:07 +0200 Subject: [PATCH 2/7] containers-data 3.11 tests are broken on ocaml 5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` \#=== ERROR while compiling containers-data.3.11 ===============================# \# context 2.2.0~alpha3~dev | linux/x86_64 | ocaml-base-compiler.5.1.0 | file:///home/opam/opam-repository \# path ~/.opam/5.1/.opam-switch/build/containers-data.3.11 \# command ~/.opam/opam-init/hooks/sandbox.sh build dune runtest -p containers-data -j 127 \# exit-code 1 \# env-file ~/.opam/log/containers-data-7-36628e.env \# output-file ~/.opam/log/containers-data-7-36628e.out \### output ### \# (cd _build/default && /home/opam/.opam/5.1/bin/ocamlc.opt -w -40 -strict-sequence -warn-error -a+8 -open CCShims_ -g -bin-annot -I tests/data/.t.eobjs/byte -I /home/opam/.opam/5.1/lib/bytes -I /home/opam/.opam/5.1/lib/containers -I /home/opam/.opam/5.1/lib/containers/monomorphic -I /home/opam/.opam/5.1/lib/either -I /home/opam/.opam/5.1/lib/gen -I /home/opam/.opam/5.1/lib/iter -I /home/opam/.opam/5.1/lib/ocaml/unix -I /home/opam/.opam/5.1/lib/qcheck-core -I /home/opam/.opam/5.1/lib/seq -I src/data/.containers_data.objs/byte -I src/testlib/.containers_testlib.objs/byte -no-alias-deps -open Dune__exe -o tests/data/.t.eobjs/byte/dune__exe__T_bitfield.cmo -c -impl tests/data/t_bitfield.ml) \# File "tests/data/t_bitfield.ml", line 6, characters 15-33: \# 6 | let module B = CCBitField.Make () in \# ^^^^^^^^^^^^^^^^^^ \# Error: The functor was expected to be applicative at this position \# (cd _build/default && src/mdx_runner.exe) \# ocaml-mdx returned 0 ✔ ``` Signed-off-by: Marcello Seri --- packages/containers-data/containers-data.3.11/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/containers-data/containers-data.3.11/opam b/packages/containers-data/containers-data.3.11/opam index 37dcda1fe3d..879de05b80b 100644 --- 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" } From 0f8c9267a1bb323f9fc398fec81b6027d1f3d002 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 28 Sep 2023 11:40:22 +0200 Subject: [PATCH 3/7] eio_main tests are not compatible with mdx 2.3.1 Fail with extra verbose output: ``` \#=== ERROR while compiling eio_main.0.6 =======================================# \# context 2.2.0~alpha3~dev | linux/x86_64 | ocaml-base-compiler.5.1.0 | file:///home/opam/opam-repository \# path ~/.opam/5.1/.opam-switch/build/eio_main.0.6 \# command ~/.opam/opam-init/hooks/sandbox.sh build dune build -p eio_main -j 255 --promote-install-files=false @install @runtest \# exit-code 1 \# env-file ~/.opam/log/eio_main-7-67a807.env \# output-file ~/.opam/log/eio_main-7-67a807.out \### output ### \# File "tests/stream.md", line 1, characters 0-0: \# /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/tests/stream.md _build/default/tests/.mdx/stream.md.corrected \# diff --git a/_build/default/tests/stream.md b/_build/default/tests/.mdx/stream.md.corrected \# index ab34c10..fcb1c92 100644 \# --- a/_build/default/tests/stream.md \# +++ b/_build/default/tests/.mdx/stream.md.corrected \# @@ -48,6 +48,7 @@ Simple non-blocking case \# +Got 1 from stream \# +Reading from stream \# +Got 2 from stream \# + \# - : unit = () [...] ``` Signed-off-by: Marcello Seri --- packages/eio_main/eio_main.0.6/opam | 2 +- packages/eio_main/eio_main.0.7/opam | 2 +- packages/eio_main/eio_main.0.8.1/opam | 2 +- packages/eio_main/eio_main.0.9/opam | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/eio_main/eio_main.0.6/opam b/packages/eio_main/eio_main.0.6/opam index 83956313d80..7078dbd0138 100644 --- 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 index a6c279f40d7..e7a0394d377 100644 --- 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 index 04e514ae63c..9afa24b0bf8 100644 --- 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 index 5601f6792bf..b6bb3d45f2b 100644 --- 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)} From da0bfd1ec96f1bf25f6c83c17a9053e7538eabca Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 28 Sep 2023 11:42:46 +0200 Subject: [PATCH 4/7] lwt_eio <= 0.3 tests fail with recent mdx Due to the extra verbose output ``` \# File "test/test.md", line 1, characters 0-0: \# /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/test/test.md _build/default/test/.mdx/test.md.corrected \# diff --git a/_build/default/test/test.md b/_build/default/test/.mdx/test.md.corrected \# index 1245303..88fb312 100644 \# --- a/_build/default/test/test.md \# +++ b/_build/default/test/.mdx/test.md.corrected \# @@ -42,19 +42,19 @@ during each iteration of the main loop, so the Lwt thread runs twice as often. \# );; \# +eio: i = 1 \# + lwt: i = 1 \# -+eio: i = 2 \# + lwt: i = 2 \# ++eio: i = 2 \# + lwt: i = 3 \# +eio: i = 3 \# + lwt: i = 4 \# -+ lwt: i = 5 \# +eio: i = 4 \# -+ lwt: i = 6 \# -+ lwt: i = 7 \# ++ lwt: i = 5 \# +eio: i = 5 \# -+ lwt: i = 8 \# ++ lwt: i = 6 \# +eio: i = 6 \# ++ lwt: i = 7 \# +eio: i = 7 \# ++ lwt: i = 8 \# +eio: i = 8 ``` Signed-off-by: Marcello Seri --- packages/lwt_eio/lwt_eio.0.2/opam | 2 +- packages/lwt_eio/lwt_eio.0.3/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lwt_eio/lwt_eio.0.2/opam b/packages/lwt_eio/lwt_eio.0.2/opam index a0bf7b8a561..d68f9a04747 100644 --- 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 index d057f804845..30685667009 100644 --- 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} ] From 3f19c1bb754f0cb60b72ddffc8d4b3b51115e503 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 28 Sep 2023 11:44:25 +0200 Subject: [PATCH 5/7] pa_incr tests are not compatible with ocaml 5.1 ``` File "README.md", line 1, characters 0-0: \# /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/README.md _build/default/.mdx/README.md.corrected \# diff --git a/_build/default/README.md b/_build/default/.mdx/README.md.corrected \# index 484ed8d..510b599 100644 \# --- a/_build/default/README.md \# +++ b/_build/default/.mdx/README.md.corrected \# @@ -404,10 +404,11 @@ We can see `filter` does indeed work as expected. \# \# ```ocaml \# # let var_list = to_var_list [2;3;5] \# -val var_list : _[> `Cons of int * 'a | `Nil ] Var.t as 'a = \# +val var_list : ([> `Cons of int * 'a | `Nil ] as '_weak1) Var.t as 'a = \# + \# \# # let incr_list = to_incr_list var_list \# -val incr_list : _[> `Cons of int * 'a | `Nil ] t as 'a = \# +val incr_list : ([> `Cons of int * 'a | `Nil ] as '_weak2) t as 'a = \# \# # let res_list = filter (fun x -> x mod 2 = 1) ``` Signed-off-by: Marcello Seri --- packages/par_incr/par_incr.0.1/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/par_incr/par_incr.0.1/opam b/packages/par_incr/par_incr.0.1/opam index 83d6fc17651..75d046418e4 100644 --- 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} ] ] From f7b2076e903001782c5697fbceda1b6e4b88aaca Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 28 Sep 2023 11:45:55 +0200 Subject: [PATCH 6/7] uring <= 0.6 tests are not compatible with ocaml 5.1 ``` \# /usr/bin/git --no-pager diff --no-index --color=always -u _build/default/README.md _build/default/.mdx/README.md.corrected \# diff --git a/_build/default/README.md b/_build/default/.mdx/README.md.corrected \# index 0bb1311..2888173 100644 \# --- a/_build/default/README.md \# +++ b/_build/default/.mdx/README.md.corrected \# @@ -39,7 +39,7 @@ To start, we'll open a file using `Uring.openat2`, which works much like the reg \# ~resolve:Uring.Resolve.beneath \# "test.log" \# `Open_log;; \# -val open_file : _[> `Open_log ] Uring.job option = Some \# +val open_file : ([> `Open_log ] as '_weak2) Uring.job option = Some \# ``` \# \# `submit` returns `None` if the submission queue is full. \# @@ -117,13 +117,15 @@ Finally, we close the file: \# \# ```ocaml \# # Uring.close uring fd `Close_log;; \# -- : _[> `Close_log | `Open_log | `Write_all ] Uring.job option = Some \# +- : ([> `Close_log | `Open_log | `Write_all ] as '_weak3) Uring.job option = \# +Some \# \# # Uring.submit uring;; \# - : int = 1 \# \# # wait_with_retry uring;; \# -- : int * _[> `Close_log | `Open_log | `Write_all ] = (0, `Close_log) \# +- : int * ([> `Close_log | `Open_log | `Write_all ] as '_weak3) = \# +(0, `Close_log) [...] ``` Signed-off-by: Marcello Seri --- packages/uring/uring.0.4/opam | 2 +- packages/uring/uring.0.5/opam | 2 +- packages/uring/uring.0.6/opam | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/uring/uring.0.4/opam b/packages/uring/uring.0.4/opam index 36100a67b44..09b2202716a 100644 --- 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 index ddc4e033e9e..a3bbcf0bc29 100644 --- 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 index c86f606c4ba..d3dd6c9d116 100644 --- 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} ] ] From ec8bac9387324d637968865396eb165f4a874b1d Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Fri, 6 Oct 2023 18:31:37 +0200 Subject: [PATCH 7/7] Update packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam --- packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam b/packages/cohttp-eio/cohttp-eio.6.0.0~alpha0/opam index 4676f9c1b77..c6b5f1516cc 100644 --- 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" "@doc" {with-doc} ] ["dune" "install" "-p" name "--create-install-files" name]