Misc: promote to 5.3

ocsigen · Nov 19, 2024 · 897840a · 897840a
1 parent 493c064
commit 897840a
Show file tree

Hide file tree

Showing 8 changed files with 4,957 additions and 4,335 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
           - "4.13"
           - "5.0"
           - "5.1"
+          - "5.2"
         skip-test:
           - true
         skip-doc:
@@ -53,7 +54,7 @@ jobs:
             skip-test: false
             skip-doc: true
           - os: ubuntu-latest
-            ocaml-compiler: "5.2"
+            ocaml-compiler: "ocaml-variants.5.3.0~beta1"
             skip-effects: false
             skip-test: false
             skip-doc: false
@@ -64,12 +65,12 @@ jobs:
             skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :(
             skip-doc: true
           - os: macos-latest
-            ocaml-compiler: "5.2"
+            ocaml-compiler: "ocaml-variants.5.3.0~beta1"
             skip-effects: true
             skip-test: false
             skip-doc: true
           - os: windows-latest
-            ocaml-compiler: "5.2"
+            ocaml-compiler: "ocaml-variants.5.3.0~beta1"
             skip-effects: false
             skip-test: false
             skip-doc: true

diff --git a/compiler/tests-check-prim/main.output5 b/compiler/tests-check-prim/main.output5
@@ -4,7 +4,6 @@ Missing
 From main.bc:
 caml_alloc_dummy_function
 caml_continuation_use
-caml_drop_continuation
 caml_int_as_pointer
 caml_reset_afl_instrumentation
 debugger
@@ -128,7 +127,6 @@ caml_set_static_env
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_get_section_table
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

diff --git a/compiler/tests-check-prim/unix-unix.output5 b/compiler/tests-check-prim/unix-unix.output5
@@ -4,7 +4,6 @@ Missing
 From unix.bc:
 caml_alloc_dummy_function
 caml_continuation_use
-caml_drop_continuation
 caml_int_as_pointer
 caml_reset_afl_instrumentation
 caml_unix_accept
@@ -239,7 +238,6 @@ caml_set_static_env
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_get_section_table
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

diff --git a/compiler/tests-compiler/rec52.ml b/compiler/tests-compiler/rec52.ml
@@ -61,7 +61,7 @@ let%expect_test "let rec" =
         Stdlib_Hashtbl = global_data.Stdlib__Hashtbl,
         letrec_function_context = [],
         c = [],
-        d = runtime.caml_make_vect(5, 0),
+        d = runtime.caml_array_make(5, 0),
         default$0 = 42;
        function a(x){return b(x);}
        function b(x){

diff --git a/compiler/tests-full/dune b/compiler/tests-full/dune
@@ -1,7 +1,7 @@
 (rule
  (targets stdlib.cma.js)
  (enabled_if
-  (= %{ocaml_version} "5.2.0"))
+  (> %{ocaml_version} "5.2.0"))
  (action
   (run
    %{bin:js_of_ocaml}
@@ -14,7 +14,7 @@
 (rule
  (targets stdlib.cma.output.js)
  (enabled_if
-  (= %{ocaml_version} "5.2.0"))
+  (> %{ocaml_version} "5.2.0"))
  (action
   (with-stdout-to
    %{targets}
@@ -23,7 +23,7 @@
 (rule
  (alias runtest)
  (enabled_if
-  (= %{ocaml_version} "5.2.0"))
+  (> %{ocaml_version} "5.2.0"))
  (action
   (diff stdlib.cma.expected.js stdlib.cma.output.js)))