Merge pull request ocsigen#128 from ocaml-wasm/env-var

Use environment variable to disable some tests when testing Wasm_of_ocaml
OlivierNicole · Nov 6, 2024 · 9d6df66 · 9d6df66
2 parents 1a7305e + aa1c9c9
commit 9d6df66
Show file tree

Hide file tree

Showing 17 changed files with 124 additions and 196 deletions.
diff --git a/compiler/tests-compiler/dune.inc b/compiler/tests-compiler/dune.inc
diff --git a/compiler/tests-compiler/gen-rules/gen.ml b/compiler/tests-compiler/gen-rules/gen.ml
@@ -77,7 +77,7 @@ let () =
 (library
  ;; %s%s.ml
  (name %s_%d)
- (enabled_if (and %s (<> %%{profile} wasm) (<> %%{profile} wasm-effects)))
+ (enabled_if (and %s %%{env:js-enabled=}))
  (modules %s)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests

diff --git a/compiler/tests-dynlink-js/dune b/compiler/tests-dynlink-js/dune
@@ -1,9 +1,6 @@
 (executable
  (name main)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (modules main)
  (libraries js_of_ocaml)
  (link_flags
@@ -40,10 +37,7 @@
 
 (rule
  (target main.js)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (run %{bin:js_of_ocaml} --linkall %{read-strings:effects_flags.txt} -o
    %{target} %{dep:main.bc})))
@@ -73,10 +67,7 @@
 
 (rule
  (target main.out)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (deps plugin.js plugin2.js)
  (action
   (with-outputs-to
@@ -85,10 +76,7 @@
 
 (rule
  (target main.out2)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (deps plugin.js plugin2.js)
  (action
   (with-outputs-to
@@ -97,18 +85,12 @@
 
 (rule
  (alias runtest)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (diff main.out.expected main.out)))
 
 (rule
  (alias runtest)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (diff main.out.expected main.out2)))
diff --git a/compiler/tests-dynlink/dune b/compiler/tests-dynlink/dune
@@ -1,19 +1,13 @@
 (executable
  (name main)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (modules main)
  (libraries dynlink js_of_ocaml-compiler.dynlink)
  (modes byte))
 
 (rule
  (target main.js)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (deps plugin.cmo export)
  (action
   (run %{bin:js_of_ocaml} --dynlink --export export --pretty -o %{target}
@@ -26,10 +20,7 @@
 
 (rule
  (target main.out)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (deps plugin.cmo)
  (action
   (with-outputs-to
@@ -38,9 +29,6 @@
 
 (rule
  (alias runtest)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (diff main.out.expected main.out)))
diff --git a/compiler/tests-io/dune b/compiler/tests-io/dune
@@ -32,9 +32,7 @@
  (action
   (copy cat.bc.wasm.js cat.bc.js))
  (enabled_if
-  (or
-   (= %{profile} wasm)
-   (= %{profile} wasm-effects))))
+  (not %{env:js-enabled=})))
 
 (rule
  (target md5-native.stdout)
@@ -83,6 +81,4 @@
  (action
   (copy md5.bc.wasm.js md5.bc.js))
  (enabled_if
-  (or
-   (= %{profile} wasm)
-   (= %{profile} wasm-effects))))
+  (not %{env:js-enabled=})))
diff --git a/compiler/tests-jsoo/bin/dune b/compiler/tests-jsoo/bin/dune
@@ -59,9 +59,7 @@
  (action
   (copy error1.bc.wasm.js error1.bc.js))
  (enabled_if
-  (or
-   (= %{profile} wasm)
-   (= %{profile} wasm-effects))))
+  (not %{env:js-enabled=})))
 
 (rule
  (target error2.js.actual)
@@ -118,6 +116,4 @@
  (action
   (copy error2.bc.wasm.js error2.bc.js))
  (enabled_if
-  (or
-   (= %{profile} wasm)
-   (= %{profile} wasm-effects))))
+  (not %{env:js-enabled=})))
diff --git a/compiler/tests-jsoo/lib-effects/dune b/compiler/tests-jsoo/lib-effects/dune
@@ -1,14 +1,22 @@
+(env
+ (using-effects)
+ (wasm)
+ (wasm-effects)
+ (_
+  (js_of_ocaml
+   (flags
+    (:standard --enable effects))
+   ;; separate compilation doesn't work when using
+   ;; features such as 'effects' or 'use-js-string'
+   ;; because dune doesn't know that it should compile
+   ;; multiple versions of the dependencies
+   (compilation_mode whole_program))))
+
 (library
  (name jsoo_testsuite_effect)
  (enabled_if
-  (and
-   (>= %{ocaml_version} 5)
-   (or
-    (= %{profile} using-effects)
-    (= %{profile} wasm-effects))))
+  (>= %{ocaml_version} 5))
  (inline_tests
-  ;; This requires the unreleased dune 3.7 to work
-  (enabled_if true)
   (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
diff --git a/compiler/tests-num/dune b/compiler/tests-num/dune
@@ -2,10 +2,7 @@
  (name main)
  (modules main test_nats test test_big_ints test_ratios test_nums test_io)
  (libraries num)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (modes
   js
   (best exe))

diff --git a/compiler/tests-ocaml/lib-hashtbl/dune b/compiler/tests-ocaml/lib-hashtbl/dune
@@ -17,15 +17,10 @@
 (rule
  (action
   (copy hfun.expected-js hfun.expected))
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects))))
+ (enabled_if %{env:js-enabled=}))
 
 (rule
  (action
   (copy hfun.expected-wasm hfun.expected))
  (enabled_if
-  (or
-   (= %{profile} wasm)
-   (= %{profile} wasm-effects))))
+  (not %{env:js-enabled=})))
diff --git a/compiler/tests-toplevel/dune b/compiler/tests-toplevel/dune
@@ -1,9 +1,6 @@
 (executables
  (names test_toplevel)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (libraries js_of_ocaml-compiler.dynlink compiler-libs.toplevel)
  (flags
   (:standard -linkall))
@@ -13,20 +10,13 @@
 
 (rule
  (targets test_toplevel.js)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (run %{bin:js_of_ocaml} --toplevel %{dep:test_toplevel.bc} -o %{targets})))
 
 (rule
  (target test_toplevel.bc.js.actual)
- (enabled_if
-  (and
-   (>= %{ocaml_version} 5.2)
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (with-stdout-to
    %{target}
@@ -37,8 +27,7 @@
  (enabled_if
   (and
    (>= %{ocaml_version} 5.2)
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+   %{env:js-enabled=}))
  (action
   (with-stdout-to
    %{target}
@@ -49,8 +38,7 @@
  (enabled_if
   (and
    (>= %{ocaml_version} 5.2)
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+   %{env:js-enabled=}))
  (action
   (progn
    (diff test_toplevel.expected test_toplevel.bc.js.actual)

diff --git a/dune b/dune
@@ -3,7 +3,9 @@
   (wasm_of_ocaml
    (enabled_if false))
   (flags
-   (:standard -w +a-4-40-41-42-44-48-58-66-70)))
+   (:standard -w +a-4-40-41-42-44-48-58-66-70))
+  (env-vars
+   (js-enabled true)))
  (using-effects
   (wasm_of_ocaml
    (enabled_if false))
@@ -12,14 +14,18 @@
    (flags
     (:standard --enable effects))
    (build_runtime_flags
-    (:standard --enable effects))))
+    (:standard --enable effects)))
+  (env-vars
+   (js-enabled true)))
  (wasm
   (binaries
    (tools/node_wrapper.sh as node))
   (js_of_ocaml
    (enabled_if false))
   (wasm_of_ocaml
-   (compilation_mode separate)))
+   (compilation_mode separate))
+  (env-vars
+   (js-enabled false)))
  (wasm-effects
   (binaries
    (tools/node_wrapper.sh as node))
@@ -28,14 +34,21 @@
   (wasm_of_ocaml
    (compilation_mode separate)
    (flags
-    (:standard --enable effects))))
+    (:standard --enable effects)))
+  (env-vars
+   (js-enabled false)))
  (bench_no_debug
   (flags
    (:standard \ -g))
   (ocamlc_flags
    (:standard \ -g))
   (link_flags
-   (:standard \ -g))))
+   (:standard \ -g))
+  (env-vars
+   (js-enabled true)))
+ (_
+  (env-vars
+   (js-enabled true))))
 
 (rule
  (targets version.ml.in)

diff --git a/examples/namespace/dune b/examples/namespace/dune
@@ -35,9 +35,6 @@
 
 (rule
  (alias runtest)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (diff %{dep:for-node.expected} %{dep:for-node.actual})))
diff --git a/examples/separate_compilation/dune b/examples/separate_compilation/dune
@@ -76,18 +76,12 @@
 
 (rule
  (alias runtest)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (action
   (diff bin.expected bin.actual)))
 
 (alias
  (name default)
- (enabled_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (enabled_if %{env:js-enabled=})
  (deps myruntime.js stdlib.cma.js std_exit.js module2.js module1.js bin.js
   index.html))
diff --git a/ppx/ppx_deriving_json/tests/dune b/ppx/ppx_deriving_json/tests/dune
@@ -26,8 +26,7 @@
  (enabled_if
   (and
    (>= %{ocaml_version} 5.1)
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+   %{env:js-enabled=}))
  ;; (package js_of_ocaml-ppx)
  (action
   (diff ppx.mlt ppx.mlt.corrected)))
@@ -37,8 +36,7 @@
  (enabled_if
   (and
    (>= %{ocaml_version} 5.1)
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+   %{env:js-enabled=}))
  ;; (package js_of_ocaml-ppx)
  (action
   (diff gen.mlt gen.mlt.corrected)))