Skip to content

Commit 8f11175

Browse files
committed
Switch tests to OCaml 5.4
1 parent 483a3c5 commit 8f11175

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

.github/workflows/js_of_ocaml.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- "5.0"
2626
- "5.1"
2727
- "5.2"
28+
- "5.3"
2829
skip-test:
2930
- true
3031
skip-doc:
@@ -59,7 +60,7 @@ jobs:
5960
skip-doc: true
6061
- os: ubuntu-latest
6162
os-name: Ubuntu
62-
ocaml-compiler: "5.3"
63+
ocaml-compiler: "5.4"
6364
skip-effects: false
6465
skip-test: false
6566
skip-doc: false
@@ -72,31 +73,24 @@ jobs:
7273
# Note this OCaml compiler is bytecode only
7374
- os: ubuntu-latest
7475
os-name: Ubuntu
75-
ocaml-name: "5.3.0+32bit"
76-
ocaml-compiler: "ocaml-variants.5.3.0+options,ocaml-option-32bit"
76+
ocaml-name: "5.4.0+32bit"
77+
ocaml-compiler: "ocaml-variants.5.4.0+options,ocaml-option-32bit"
7778
skip-effects: true # disabled for the same reason than `skip-test`
7879
skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :(
7980
skip-doc: true
8081
- os: macos-latest
8182
os-name: MacOS
82-
ocaml-compiler: "5.3"
83+
ocaml-compiler: "5.4"
8384
skip-effects: true
8485
skip-test: false
8586
skip-doc: true
8687
- os: windows-latest
8788
os-name: Windows
88-
ocaml-compiler: "5.3"
89+
ocaml-compiler: "5.4"
8990
skip-effects: false
9091
skip-test: false
9192
skip-doc: true
92-
- os: ubuntu-latest
93-
os-name: Ubuntu
94-
ocaml-name: "5.4-alpha1"
95-
ocaml-compiler: "ocaml-compiler.5.4.0~alpha1"
96-
skip-effects: true
97-
skip-test: true
98-
skip-doc: true
99-
93+
10094
runs-on: ${{ matrix.os }}
10195

10296
name:

.github/workflows/wasm_of_ocaml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- "5.0"
2727
- "5.1"
2828
- "5.2"
29+
- "5.4"
2930
separate_compilation:
3031
- true
3132
jane_street_tests:
@@ -116,7 +117,6 @@ jobs:
116117
run: |
117118
opam repo add js janestreet/opam-repository
118119
opam install opam-format
119-
opam pin add ppxlib -n 0.35.0
120120
opam exec -- dune exec --root wasm_of_ocaml tools/ci_setup.exe
121121
122122
- name: Pin Jane Street packages

compiler/tests-ocaml/lib-list/test.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,11 @@ let () =
6868
assert (List.take 3 [1; 2; 3; 4; 5] = [1; 2; 3]);
6969
assert (List.take 3 [1; 2] = [1; 2]);
7070
assert (List.take 3 [] = []);
71-
assert ((try List.take (-1) [1; 2] with Invalid_argument _ -> [999]) = [999]);
7271
assert (List.take 0 [1; 2] = []);
7372
assert (List.drop 6 hello_world = world);
7473
assert (List.drop 3 [1; 2; 3; 4; 5] = [4; 5]);
7574
assert (List.drop 3 [1; 2] = []);
7675
assert (List.drop 3 [] = []);
77-
assert ((try List.drop (-1) [1; 2] with Invalid_argument _ -> [999]) = [999]);
7876
assert (List.drop 0 [1; 2] = [1; 2]);
7977
assert (List.take_while (fun x -> x < 3) [1; 2; 3; 4; 1; 2; 3; 4]
8078
= [1; 2]);

compiler/tests-toplevel/test_toplevel.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ hello
22
- : int = 2
33
Line 4, characters 2-4:
44
Error: Syntax error
5-
Line 5, characters 0-16:
6-
Error: Unbound module "Missing_module"
5+
Line 5, characters 0-14:
6+
Error: Unbound module Missing_module
77
val y : float = 0.333333333333333315

0 commit comments

Comments
 (0)