OxCaml: check primitives

Author: vouillon

compiler/tests-check-prim/dune.inc

@@ -2,7 +2,7 @@
  (targets main.4.14.output)
  (mode
   (promote (until-clean)))
- (enabled_if (and (>= %{ocaml_version} 4.14)(< %{ocaml_version} 5.0)))
+ (enabled_if (and (>= %{ocaml_version} 4.14)(< %{ocaml_version} 5.0)(not %{oxcaml_supported})))
  (action
   (with-stdout-to
    %{targets}
@@ -17,7 +17,7 @@
  (targets unix-Win32.4.14.output)
  (mode
   (promote (until-clean)))
- (enabled_if (and (>= %{ocaml_version} 4.14)(< %{ocaml_version} 5.0)(= %{os_type} Win32)))
+ (enabled_if (and (>= %{ocaml_version} 4.14)(< %{ocaml_version} 5.0)(= %{os_type} Win32)(not %{oxcaml_supported})))
  (action
   (with-stdout-to
    %{targets}
@@ -32,7 +32,7 @@
  (targets unix-Unix.4.14.output)
  (mode
   (promote (until-clean)))
- (enabled_if (and (>= %{ocaml_version} 4.14)(< %{ocaml_version} 5.0)(= %{os_type} Unix)))
+ (enabled_if (and (>= %{ocaml_version} 4.14)(< %{ocaml_version} 5.0)(= %{os_type} Unix)(not %{oxcaml_supported})))
  (action
   (with-stdout-to
    %{targets}
@@ -47,7 +47,7 @@
  (targets main.5.4.output)
  (mode
   (promote (until-clean)))
- (enabled_if (and (>= %{ocaml_version} 5.4)(< %{ocaml_version} 5.5)))
+ (enabled_if (and (>= %{ocaml_version} 5.4)(< %{ocaml_version} 5.5)(not %{oxcaml_supported})))
  (action
   (with-stdout-to
    %{targets}
@@ -62,7 +62,7 @@
  (targets unix-Win32.5.4.output)
  (mode
   (promote (until-clean)))
- (enabled_if (and (>= %{ocaml_version} 5.4)(< %{ocaml_version} 5.5)(= %{os_type} Win32)))
+ (enabled_if (and (>= %{ocaml_version} 5.4)(< %{ocaml_version} 5.5)(= %{os_type} Win32)(not %{oxcaml_supported})))
  (action
   (with-stdout-to
    %{targets}
@@ -77,7 +77,52 @@
  (targets unix-Unix.5.4.output)
  (mode
   (promote (until-clean)))
- (enabled_if (and (>= %{ocaml_version} 5.4)(< %{ocaml_version} 5.5)(= %{os_type} Unix)))
+ (enabled_if (and (>= %{ocaml_version} 5.4)(< %{ocaml_version} 5.5)(= %{os_type} Unix)(not %{oxcaml_supported})))
+ (action
+  (with-stdout-to
+   %{targets}
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:unix.bc}))))
+
+(rule
+ (targets main.5.2+ox.output)
+ (mode
+  (promote (until-clean)))
+ (enabled_if (and (>= %{ocaml_version} 5.2)(< %{ocaml_version} 5.3)%{oxcaml_supported}))
+ (action
+  (with-stdout-to
+   %{targets}
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:main.bc}))))
+
+(rule
+ (targets unix-Win32.5.2+ox.output)
+ (mode
+  (promote (until-clean)))
+ (enabled_if (and (>= %{ocaml_version} 5.2)(< %{ocaml_version} 5.3)(= %{os_type} Win32)%{oxcaml_supported}))
+ (action
+  (with-stdout-to
+   %{targets}
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:unix.bc}))))
+
+(rule
+ (targets unix-Unix.5.2+ox.output)
+ (mode
+  (promote (until-clean)))
+ (enabled_if (and (>= %{ocaml_version} 5.2)(< %{ocaml_version} 5.3)(= %{os_type} Unix)%{oxcaml_supported}))
  (action
   (with-stdout-to
    %{targets}

compiler/tests-check-prim/gen_dune.ml

@@ -11,6 +11,11 @@ type version =
   | `V5_5
   ]
 
+type variant =
+  [ `Mainstream
+  | `OxCaml
+  ]
+
 let string_of_version : version -> string = function
   | `V4_13 -> "4.13"
   | `V4_14 -> "4.14"
@@ -39,7 +44,7 @@ let string_of_os_type = function
   | Unix -> "Unix"
   | Win32 -> "Win32"
 
-let rule bc ocaml_version os_type =
+let rule bc ocaml_version os_type ocaml_variant =
   let vl =
     [ Printf.sprintf "(>= %%{ocaml_version} %s)" (string_of_version ocaml_version) ]
   in
@@ -53,7 +58,13 @@ let rule bc ocaml_version os_type =
     | None -> []
     | Some os_type -> [ Printf.sprintf "(= %%{os_type} %s)" (string_of_os_type os_type) ]
   in
-  let enabled_if = Printf.sprintf "(and %s)" (String.concat "" (vl @ vu @ os)) in
+  let ox =
+    [ (match ocaml_variant with
+      | `Mainstream -> "(not %{oxcaml_supported})"
+      | `OxCaml -> "%{oxcaml_supported}")
+    ]
+  in
+  let enabled_if = Printf.sprintf "(and %s)" (String.concat "" (vl @ vu @ os @ ox)) in
 
   let target =
     Filename.chop_extension bc
@@ -62,6 +73,9 @@ let rule bc ocaml_version os_type =
       | Some os_type -> "-" ^ string_of_os_type os_type)
     ^ "."
     ^ string_of_version ocaml_version
+    ^ (match ocaml_variant with
+      | `Mainstream -> ""
+      | `OxCaml -> "+ox")
     ^ ".output"
   in
   Printf.sprintf
@@ -85,11 +99,13 @@ let rule bc ocaml_version os_type =
     bc
 
 let () =
-  let versions : version list = [ `V4_14; `V5_4 ] in
+  let versions : (version * variant) list =
+    [ `V4_14, `Mainstream; `V5_4, `Mainstream; `V5_2, `OxCaml ]
+  in
   set_binary_mode_out stdout true;
   List.iter
-    (fun ocaml_version ->
+    (fun (ocaml_version, ocaml_variant) ->
       List.iter
-        (fun (bc, os_type) -> print_endline (rule bc ocaml_version os_type))
+        (fun (bc, os_type) -> print_endline (rule bc ocaml_version os_type ocaml_variant))
         [ "main.bc", None; "unix.bc", Some Win32; "unix.bc", Some Unix ])
     versions