switch test to OCaml 5

ocsigen · Sep 28, 2023 · fcf1861 · fcf1861
1 parent 1df6057
commit fcf1861
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 164 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,6 +61,11 @@ jobs:
             skip-effects: false
             skip-test: false
             skip-doc: true
+          - os: ubuntu-latest
+            ocaml-compiler: ocaml-variants.5.2.0+trunk
+            skip-effects: false
+            skip-test: false
+            skip-doc: true
 
     runs-on: ${{ matrix.os }}
 
@@ -90,17 +95,23 @@ jobs:
             default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
             opam: https://github.com/ocaml/opam-repository.git
           dune-cache: true
-          opam-depext: ${{ !matrix.skip-test }}
-          opam-depext-flags: --with-test
+          opam-depext: false
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
         if: runner.os != 'Windows'
         uses: ocaml/setup-ocaml@v2
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: true
-          opam-depext: ${{ !matrix.skip-test }}
-          opam-depext-flags: --with-test
+          opam-depext: false
+
+      - run: opam pin add ppxlib git+https://github.com/panglesd/ppxlib.git#trunk-support-502 --no-action
+        if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.2.0+trunk' }}
+
+      - run: opam pin add ocaml-compiler-libs git+https://github.com/art-w/ocaml-compiler-libs.git#ocaml-5.2-trunk --no-action
+        if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.2.0+trunk' }}
+
+      - run: opam pin add ./ --no-action
 
       - run: opam install . --best-effort
         if: ${{ matrix.skip-test }}

diff --git a/compiler/tests-check-prim/unix-unix.output5 b/compiler/tests-check-prim/unix-unix.output5
@@ -99,6 +99,7 @@ caml_unix_outchannel_of_filedescr
 caml_unix_pipe
 caml_unix_putenv
 caml_unix_read
+caml_unix_read_bigarray
 caml_unix_realpath
 caml_unix_recv
 caml_unix_recvfrom
@@ -138,6 +139,7 @@ caml_unix_utimes
 caml_unix_wait
 caml_unix_waitpid
 caml_unix_write
+caml_unix_write_bigarray
 debugger
 is_digit_normalized
 

diff --git a/compiler/tests-toplevel/test_toplevel.reference b/compiler/tests-toplevel/test_toplevel.reference
@@ -2,4 +2,4 @@ hello
 Line 3, characters 2-4:
 Error: Syntax error
 Line 4, characters 0-16:
-Error: Unbound module Missing_module
+Error: Unbound module "Missing_module"