test

ocaml · Jul 26, 2024 · 4f81c56 · 4f81c56
1 parent b114357
commit 4f81c56
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/dune_rules/jsoo/jsoo_rules.ml b/src/dune_rules/jsoo/jsoo_rules.ml
@@ -380,7 +380,7 @@ let link_rule cc ~runtime ~target ~obj_dir cm ~flags ~linkall ~link_time_code_ge
   js_of_ocaml_rule sctx ~sub_command:Link ~dir ~spec ~target ~flags ~config:None
 ;;
 
-let shapes_enabled = false
+let shapes_enabled = true
 
 let build_cm' sctx ~dir ~in_context ~src ~target ~config ~shapes =
   let spec =

diff --git a/test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t/run.t b/test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t/run.t
@@ -25,12 +25,12 @@ specify js mode (#1940).
   $ dune build --display short @@all 2>&1 | grep js_of_ocaml
    js_of_ocaml .b.eobjs/jsoo/b.bc.runtime.js
    js_of_ocaml .e.eobjs/jsoo/e.bc.runtime.js
-   js_of_ocaml .js/default/stdlib/std_exit.cmo.js
-   js_of_ocaml .js/default/stdlib/stdlib.cma.js
-   js_of_ocaml .b.eobjs/jsoo/b.cmo.js
+   js_of_ocaml .js/default/stdlib/stdlib.cma.{js,jsoo-shape}
+   js_of_ocaml .js/default/stdlib/std_exit.cmo.{js,jsoo-shape}
+   js_of_ocaml .b.eobjs/jsoo/b.cmo.{js,jsoo-shape}
    js_of_ocaml b.bc.js
-   js_of_ocaml .e.eobjs/jsoo/e.cmo.js
-   js_of_ocaml .foo.objs/jsoo/default/foo.cma.js
+   js_of_ocaml .foo.objs/jsoo/default/foo.cma.{js,jsoo-shape}
+   js_of_ocaml .e.eobjs/jsoo/e.cmo.{js,jsoo-shape}
    js_of_ocaml e.bc.js
 
 Check that building a JS-enabled executable that depends on a library works.

diff --git a/test/blackbox-tests/test-cases/jsoo/jsoo-noautolink.t b/test/blackbox-tests/test-cases/jsoo/jsoo-noautolink.t
@@ -48,5 +48,6 @@ The file dlllibA_stubs.so should not appear in the next list.
   _build/default/libA.ml
   _build/default/mainA.bc-for-jsoo
   _build/default/mainA.bc.js
+  _build/default/mainA.bc.jsoo-shape
   _build/default/mainA.ml
   _build/default/mainA.mli
diff --git a/test/blackbox-tests/test-cases/jsoo/no-check-prim.t/run.t b/test/blackbox-tests/test-cases/jsoo/no-check-prim.t/run.t
@@ -10,21 +10,21 @@ Compilation using jsoo
       ocamldep bin/.technologic.eobjs/z.impl.d
       ocamlopt lib/.x.objs/native/x__.{cmx,o}
         ocamlc lib/.x.objs/byte/x__Y.{cmi,cmo,cmt}
-   js_of_ocaml .js/default/js_of_ocaml-compiler.runtime/jsoo_runtime.cma.js
-   js_of_ocaml .js/default/js_of_ocaml/js_of_ocaml.cma.js
-   js_of_ocaml .js/default/stdlib/std_exit.cmo.js
-   js_of_ocaml .js/default/stdlib/stdlib.cma.js
+   js_of_ocaml .js/default/js_of_ocaml-compiler.runtime/jsoo_runtime.cma.{js,jsoo-shape}
+   js_of_ocaml .js/default/js_of_ocaml/js_of_ocaml.cma.{js,jsoo-shape}
+   js_of_ocaml .js/default/stdlib/std_exit.cmo.{js,jsoo-shape}
+   js_of_ocaml .js/default/stdlib/stdlib.cma.{js,jsoo-shape}
       ocamlopt lib/.x.objs/native/x__Y.{cmx,o}
         ocamlc lib/.x.objs/byte/x.{cmi,cmo,cmt}
       ocamlopt lib/.x.objs/native/x.{cmx,o}
         ocamlc bin/.technologic.eobjs/byte/z.{cmi,cmo,cmt}
         ocamlc lib/x.cma
       ocamlopt lib/x.{a,cmxa}
         ocamlc bin/.technologic.eobjs/byte/technologic.{cmi,cmo,cmt}
-   js_of_ocaml bin/.technologic.eobjs/jsoo/z.cmo.js
-   js_of_ocaml lib/.x.objs/jsoo/default/x.cma.js
+   js_of_ocaml lib/.x.objs/jsoo/default/x.cma.{js,jsoo-shape}
       ocamlopt lib/x.cmxs
-   js_of_ocaml bin/.technologic.eobjs/jsoo/technologic.cmo.js
+   js_of_ocaml bin/.technologic.eobjs/jsoo/technologic.cmo.{js,jsoo-shape}
+   js_of_ocaml bin/.technologic.eobjs/jsoo/z.cmo.{js,jsoo-shape}
    js_of_ocaml bin/technologic.bc.js
   $ node ./_build/default/bin/technologic.bc.js
   buy it