OxCaml support: update tests

Author: vouillon

compiler/tests-compiler/double-translation/dune.inc

@@ -21,7 +21,7 @@
  (modules effects_continuations)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -36,7 +36,7 @@
  (modules effects_exceptions)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))

compiler/tests-compiler/dune.inc

@@ -96,7 +96,7 @@
  (modules effects)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -111,7 +111,7 @@
  (modules effects_continuations)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -126,7 +126,7 @@
  (modules effects_exceptions)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -156,7 +156,7 @@
  (modules eliminate_exception_handler)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -231,7 +231,7 @@
  (modules exceptions)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -336,7 +336,7 @@
  (modules gh1354)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -456,7 +456,7 @@
  (modules gh1868)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -486,7 +486,7 @@
  (modules gh747)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -516,7 +516,7 @@
  (modules global_deadcode)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -606,7 +606,7 @@
  (modules loops)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (not %{oxcaml_supported}))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -681,7 +681,7 @@
  (modules obj)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (>= %{ocaml_version} 5))
+  (enabled_if (and (>= %{ocaml_version} 5) (not %{oxcaml_supported})))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))

compiler/tests-compiler/gen-rules/gen.ml

@@ -51,6 +51,8 @@ type enabled_if =
   | GE52
   | LT52
   | B64
+  | NotOxCaml
+  | GE5NotOxCaml
   | Any
 
 let lib_enabled_if = function
@@ -59,10 +61,21 @@ let lib_enabled_if = function
   | _ -> Any
 
 let test_enabled_if = function
-  | "obj" | "lazy" -> GE5
+  | "obj" -> GE5NotOxCaml (* Some Obj functions are no longer primitives *)
+  | "lazy" -> GE5
   | "gh1051" -> B64
   | "rec52" -> GE52
   | "rec" -> LT52
+  | "gh1354"
+  | "gh1868"
+  | "exceptions"
+  | "effects_continuations"
+  | "effects_exceptions"
+  | "eliminate_exception_handler"
+  | "loops"
+  | "global_deadcode" -> NotOxCaml (* In OxCaml, raise is always reraise *)
+  | "effects" -> NotOxCaml (* Call to Printf.printf is somehow compiled differently *)
+  | "gh747" -> NotOxCaml (* More debug locations *)
   | _ -> Any
 
 let enabled_if = function
@@ -71,6 +84,8 @@ let enabled_if = function
   | GE52 -> "(>= %{ocaml_version} 5.2)"
   | LT52 -> "(< %{ocaml_version} 5.2)"
   | B64 -> "%{arch_sixtyfour}"
+  | GE5NotOxCaml -> "(and (>= %{ocaml_version} 5) (not %{oxcaml_supported}))"
+  | NotOxCaml -> "(not %{oxcaml_supported})"
 
 let () =
   Array.to_list (Sys.readdir ".")

compiler/tests-jsoo/dune

@@ -20,7 +20,9 @@
  (modules test_marshal_compressed)
  (libraries unix compiler-libs.common js_of_ocaml-compiler)
  (enabled_if
-  (>= %{ocaml_version} 5.1.1))
+  (and
+   (>= %{ocaml_version} 5.1.1)
+   (not %{oxcaml_supported})))
  (inline_tests
   (modes js wasm best))
  (preprocess

compiler/tests-jsoo/gh_1307.ml

@@ -5,18 +5,15 @@ let test content =
   | n ->
       Printf.printf "%d\n" n;
       print_endline "success"
-  | exception e ->
-      print_endline (Printexc.to_string e);
-      print_endline "failure"
+  | exception Parsing.Parse_error -> print_endline "Parse_error"
 
 let%expect_test "parsing" =
   (* use [Parsing.set_trace true] once https://github.com/janestreet/ppx_expect/issues/43 is fixed *)
   let (old : bool) = Parsing.set_trace false in
   test "a";
   [%expect {|
     input: "a"
-    Stdlib.Parsing.Parse_error
-    failure |}];
+    Parse_error |}];
   test "aa";
   [%expect {|
     input: "aa"
@@ -25,7 +22,6 @@ let%expect_test "parsing" =
   test "aaa";
   [%expect {|
     input: "aaa"
-    Stdlib.Parsing.Parse_error
-    failure |}];
+    Parse_error |}];
   let (_ : bool) = Parsing.set_trace old in
   ()

compiler/tests-linkall/dune

@@ -5,6 +5,9 @@
   (js_of_ocaml
    (compilation_mode separate))
   (wasm_of_ocaml
+   ; dynlink not compiling
+   (enabled_if
+    (not %{oxcaml_supported}))
    (compilation_mode separate))))
 
 (test

compiler/tests-ocaml/basic-more/dune

@@ -4,7 +4,6 @@
   div_by_zero
   function_in_ref
   if_in_if
-  labels_evaluation_order
   morematch
   opaque_prim
   pr10294
@@ -24,3 +23,12 @@
  (build_if
   (>= %{ocaml_version} 5.2))
  (modes js wasm))
+
+(tests
+ (names labels_evaluation_order)
+ (libraries ocaml_testing)
+ (build_if
+  (and
+   (>= %{ocaml_version} 5.2)
+   (not %{oxcaml_supported})))
+ (modes js wasm))

compiler/tests-ocaml/lib-marshal/dune

@@ -2,7 +2,9 @@
  (names compressed)
  (libraries compiler-libs.common)
  (build_if
-  (>= %{ocaml_version} 5.2))
+  (and
+   (>= %{ocaml_version} 5.2)
+   (not %{oxcaml_supported})))
  (modes js wasm))
 
 (tests