CI: test wasm on windows

.github/workflows/build-wasm_of_ocaml.yml

@@ -33,6 +33,11 @@ jobs:
             separate_compilation: true
             jane_street_tests: false
             all_jane_street_tests: false
+          - os: windows-latest
+            ocaml-compiler: "5.2"
+            separate_compilation: true
+            jane_street_tests: true
+            all_jane_street_tests: false
           - os: ubuntu-latest
             ocaml-compiler: "5.2"
             separate_compilation: true
@@ -48,7 +53,7 @@ jobs:
 
     steps:
       - name: Set git to use LF
-        if: ${{ matrix.os == 'windows-latest' && matrix.ocaml-compiler < 5.2 }}
+        if: ${{ matrix.os == 'windows-latest' }}
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
@@ -57,15 +62,15 @@ jobs:
       - name: Checkout tree
         uses: actions/checkout@v4
         with:
-          path: wasm_of_ocaml
+          path: w
 
       - name: Checkout Jane Street opam repository
         if: matrix.jane_street_tests
         uses: actions/checkout@v4
         with:
           repository: janestreet/opam-repository
           ref: 41c89c7824533f6b63cc5b6d75e6ddb1441d1520
-          path: janestreet/opam-repository
+          path: j/opam-repository
 
       - name: Set-up Node.js
         uses: actions/setup-node@v4
@@ -86,16 +91,25 @@ jobs:
         # It's faster to use a cached version
         run: opam install --fake binaryen-bin
 
+      # Work-around a race between reinstalling mingw-w64-shims
+      # (because of conf-pkg-config optional dep) and installing other
+      # packages that implicitly depend on mingw-w64-shims.
+      - run: opam install conf-pkg-config conf-mingw-w64-gcc-i686
+        if: runner.os == 'Windows'
+
+      - name: Pin dune
+        run: opam pin add -n dune https://github.com/vouillon/dune.git#inline-tests-wasm
+
       - name: Pin wasm_of_ocaml
-        working-directory: ./wasm_of_ocaml
-        run: opam pin -n --with-version `< VERSION` .
+        working-directory: ./w
+        run: opam pin . -n --with-version dev
 
       - name: Checkout Jane Street packages
         if: matrix.jane_street_tests
         run: |
-          opam repo add js janestreet/opam-repository
+          opam repo add js j/opam-repository
           opam install opam-format ocamlfind dune graphics cmdliner
-          opam exec -- ocaml wasm_of_ocaml/tools/ci_setup.ml
+          opam exec -- dune exec --root w tools/ci_setup.exe j
 
       - name: Pin Jane Street packages
         if: ${{ ! matrix.jane_street_tests }}
@@ -106,86 +120,88 @@ jobs:
           opam pin add -n ppx_expect.v0.16.1 https://github.com/ocaml-wasm/ppx_expect.git#wasm
 
       - name: Install wasm_of_ocaml and its test dependencies
-        working-directory: ./wasm_of_ocaml
+        working-directory: ./w
         run: |
-          opam install `basename -s .opam *.opam` num cohttp-lwt-unix ppx_expect cstruct
+          opam install .
+          opam install num cohttp-lwt-unix ppx_expect cstruct uucp
 
       - name: Run tests
         if: ${{ matrix.separate_compilation }}
-        working-directory: ./wasm_of_ocaml
+        working-directory: ./w
         run: opam exec -- dune build @runtest-wasm
 
       - name: Run tests with CPS effects
         if: ${{ matrix.ocaml-compiler >= '5.' && matrix.separate_compilation }}
-        working-directory: ./wasm_of_ocaml
+        working-directory: ./w
         run: opam exec -- dune build @runtest-wasm --profile with-effects
 
       - name: Run Base tests
-        if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/base
+        if: ${{ matrix.all_jane_street_tests || matrix.os == 'windows-latest' }}
+        working-directory: ./j/lib/base
         run: opam exec -- dune runtest
 
       - name: Run Base bigstring tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/base_bigstring
+        working-directory: ./j/lib/base_bigstring
         run: opam exec -- dune runtest
 
       - name: Run Core tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/core
+        working-directory: ./j/lib/core
         run: opam exec -- dune runtest
 
       - name: Run Bignum tests
-        if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/bignum
+        if: ${{ matrix.all_jane_street_tests || matrix.os == 'windows-latest' }}
+        working-directory: ./j/lib/bignum
         run: opam exec -- dune runtest
 
       - name: Run Bin_prot tests
+        # tests fails on windows
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/bin_prot
+        working-directory: ./j/lib/bin_prot
         run: opam exec -- dune runtest
 
       - name: Run String_dict tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/string_dict
+        working-directory: ./j/lib/string_dict
         run: opam exec -- dune runtest
 
       - name: Run Zarith tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/zarith_stubs_js
+        working-directory: ./j/lib/zarith_stubs_js
         run: opam exec -- dune runtest
 
       - name: Run Virtual_dom tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/virtual_dom
+        working-directory: ./j/lib/virtual_dom
         run: opam exec -- dune runtest
 
       - name: Run Bonsai tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/bonsai_test
+        working-directory: ./j/lib/bonsai_test
         run: opam exec -- dune runtest
 
       - name: Run Bonsai web tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/bonsai_web_test
+        working-directory: ./j/lib/bonsai_web_test
         run: opam exec -- dune runtest
 
       - name: Run Bonsai web components' tests
         if: matrix.all_jane_street_tests
-        working-directory: ./janestreet/lib/bonsai_web_components
+        working-directory: ./j/lib/bonsai_web_components
         run: opam exec -- dune runtest
 
       - name: Run Bonsai tests (release profile)
         if: ${{ ! matrix.separate_compilation }}
-        working-directory: ./janestreet/lib/bonsai_test
+        working-directory: ./j/lib/bonsai_test
         run: opam exec -- dune runtest --profile release
 
       - name: Run Bonsai web tests (release profile)
         if: ${{ ! matrix.separate_compilation }}
-        working-directory: ./janestreet/lib/bonsai_web_test
+        working-directory: ./j/lib/bonsai_web_test
         run: opam exec -- dune runtest --profile release
 
       - name: Run Bonsai web components' tests (release profile)
         if: ${{ ! matrix.separate_compilation }}
-        working-directory: ./janestreet/lib/bonsai_web_components
+        working-directory: ./j/lib/bonsai_web_components
         run: opam exec -- dune runtest --profile release

CHANGES.md

@@ -12,6 +12,7 @@
 * Compiler/Runtime: Make resuming a continuation more efficient in js (#1765)
 * Lib: Add other textMetrics property (#1784)
 * Misc: move tests to OCaml 5.3
+* Test: run wasm tests on windows
 
 ## Bug fixes
 * Fix small bug in global data flow analysis (#1768)

compiler/lib-wasm/link.ml

@@ -688,12 +688,7 @@ let remove_directory path =
   with Sys_error _ -> ()
 
 let gen_dir dir f =
-  let d_tmp =
-    Filename.temp_file_name
-      ~temp_dir:(Filename.dirname dir)
-      (Filename.basename dir)
-      ".tmp"
-  in
+  let d_tmp = Filename.temp_file_name ~temp_dir:(Filename.dirname dir) "assets" ".tmp" in
   try
     let res = f d_tmp in
     remove_directory dir;

compiler/tests-jsoo/dune

@@ -1,5 +1,5 @@
 (library
- (name jsoo_testsuite_latest)
+ (name j__latest)
  (modules test_io test_floats)
  (libraries unix compiler-libs.common js_of_ocaml-compiler)
  (enabled_if
@@ -10,7 +10,7 @@
   (pps ppx_expect)))
 
 (library
- (name jsoo_testsuite_compression)
+ (name j__comp)
  (modules test_marshal_compressed)
  (libraries unix compiler-libs.common js_of_ocaml-compiler)
  (enabled_if
@@ -21,7 +21,7 @@
   (pps ppx_expect)))
 
 (library
- (name jsoo_testsuite_parsing)
+ (name j__parsing)
  (modules test_parsing calc_parser calc_lexer)
  (libraries unix compiler-libs.common js_of_ocaml-compiler)
  (enabled_if
@@ -32,7 +32,7 @@
   (pps ppx_expect)))
 
 (library
- (name jsoo_testsuite)
+ (name j__common)
  (modules
   (:standard
    \

compiler/tests-jsoo/lib-effects/dune

@@ -5,7 +5,7 @@
     (:standard --enable effects)))))
 
 (library
- (name jsoo_testsuite_effect)
+ (name j__effect)
  (enabled_if
   (>= %{ocaml_version} 5))
  (inline_tests

dune-project

@@ -146,6 +146,7 @@
   (ppxlib (>= 0.15.0))
   (re :with-test)
   (cmdliner (>= 1.1.0))
+  (opam-format :with-test)
   (sedlex (>= 2.3))
   menhir
   menhirLib

lib/deriving_json/tests/dune

@@ -1,5 +1,5 @@
 (library
- (name deriving_expect_tests)
+ (name j__deriving)
  (libraries unix js_of_ocaml js_of_ocaml.deriving)
  (inline_tests
   (modes js wasm))