Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix upper bounds on tests using mdx #24542

Merged
merged 7 commits into from
Oct 6, 2023
Merged

Fix upper bounds on tests using mdx #24542

merged 7 commits into from
Oct 6, 2023

Conversation

mseri
Copy link
Member

@mseri mseri commented Sep 28, 2023

Seen on: #24535

Ping @jonahbeckford: are the errors in diskuvbox and dkml-install-runner actual errors – incompatibility with ocaml 5.1 – or it is all right to just prevent the tests in this case?

@mseri
Copy link
Member Author

mseri commented Oct 6, 2023

The dkml issues are dealt with in #24577

Fatal error: exception Eio__Net.Connection_failure(_)

Signed-off-by: Marcello Seri <[email protected]>
```

\#=== 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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
```
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 = <abstr>
\# +val var_list : ([> `Cons of int * 'a | `Nil ] as '_weak1) Var.t as 'a =
\# +  <abstr>
\#
\#  # let incr_list = to_incr_list var_list
\# -val incr_list : _[> `Cons of int * 'a | `Nil ] t as 'a = <abstr>
\# +val incr_list : ([> `Cons of int * 'a | `Nil ] as '_weak2) t as 'a = <abstr>
\#
\#  # let res_list = filter (fun x -> x mod 2 = 1)
```
Signed-off-by: Marcello Seri <[email protected]>
```
\# /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 <abstr>
\# +val open_file : ([> `Open_log ] as '_weak2) Uring.job option = Some <abstr>
\#  ```
\#
\#  `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 <abstr>
\# +- : ([> `Close_log | `Open_log | `Write_all ] as '_weak3) Uring.job option =
\# +Some <abstr>
\#
\#  # 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 <[email protected]>
@mseri mseri merged commit 3e024f8 into ocaml:master Oct 6, 2023
1 of 2 checks passed
@mseri mseri deleted the fix-ubs branch October 6, 2023 17:42
@mseri
Copy link
Member Author

mseri commented Oct 6, 2023

Lint successful. The PR was already tested. This was just a rebase to remove the dkml commits

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant