Merge pull request #172 from akabe/bugfix/update-travis

Run tests for OCaml 4.12 on Travis CI
akabe · Mar 28, 2021 · 583795f · 583795f
2 parents bbec99f + 50f0be9
commit 583795f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -48,6 +48,8 @@ matrix:
       env: OCAML_VERSION=4.10.0 ARCHIMEDES=1
     - os: linux
       env: OCAML_VERSION=4.11.0 ARCHIMEDES=1
+    - os: linux
+      env: OCAML_VERSION=4.12.0 ARCHIMEDES=1
   # allow_failures:
   #   - os: linux
   #     env: OPAM_VERSION=2.0.4 OCAML_VERSION=4.09.0

diff --git a/test/repl/test_evaluation.ml b/test/repl/test_evaluation.ml
@@ -165,7 +165,14 @@ let test__long_error_message ctxt =
 let test__exception ctxt =
   let status, actual = eval "failwith \"FAIL\"" in
   let msg =
-    if Sys.ocaml_version >= "4.11"
+    if Sys.ocaml_version >= "4.12"
+    then "\x1b[31mException: Failure \"FAIL\".\n\
+          Raised at Stdlib.failwith in file \"stdlib.ml\", line 29, characters 17-33\n\
+          Called from Stdlib__fun.protect in file \"fun.ml\", line 33, characters 8-15\n\
+          Re-raised at Stdlib__fun.protect in file \"fun.ml\", line 38, characters 6-52\n\
+          Called from Toploop.load_lambda in file \"toplevel/toploop.ml\", line 212, characters 4-150\n\
+          \x1b[0m"
+    else if Sys.ocaml_version >= "4.11"
     then "\x1b[31mException: Failure \"FAIL\".\n\
           Raised at Stdlib.failwith in file \"stdlib.ml\", line 29, characters 17-33\n\
           Called from Toploop.load_lambda in file \"toplevel/toploop.ml\", line 212, characters 17-27\n\x1b[0m"