CR: move new tests to tests-jsoo/lib-effects

ocsigen · Dec 29, 2024 · 62d8cc8 · 62d8cc8
1 parent 227f261
commit 62d8cc8
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 21 deletions.
diff --git a/...ts-ocaml/lib-effects/assume_no_perform.ml → ...sts-jsoo/lib-effects/assume_no_perform.ml b/...ts-ocaml/lib-effects/assume_no_perform.ml → ...sts-jsoo/lib-effects/assume_no_perform.ml
diff --git a/...fects/assume_no_perform_nested_handler.ml → ...fects/assume_no_perform_nested_handler.ml b/...fects/assume_no_perform_nested_handler.ml → ...fects/assume_no_perform_nested_handler.ml
diff --git a/...ib-effects/assume_no_perform_unhandled.ml → ...ib-effects/assume_no_perform_unhandled.ml b/...ib-effects/assume_no_perform_unhandled.ml → ...ib-effects/assume_no_perform_unhandled.ml
diff --git a/compiler/tests-jsoo/lib-effects/double-translation/dune b/compiler/tests-jsoo/lib-effects/double-translation/dune
@@ -0,0 +1,40 @@
+(env
+ (with-effects
+  (flags
+   (:standard -w -38))
+  (js_of_ocaml
+   (flags
+    (:standard --effects=double-translation))
+   ;; separate compilation doesn't yet work when using
+   ;; '--effect=double-translation' since Dune doesn't know it should compile a
+   ;; different version of the dependencies.
+   ;; TODO: remove once support in ocaml/dune#11222 is released.
+   (compilation_mode whole_program)))
+ (_
+  (flags
+   (:standard -w -38))
+  (js_of_ocaml
+   (flags
+    (:standard --effects=double-translation))
+   ;; separate compilation doesn't yet work when using
+   ;; '--effect=double-translation' since Dune doesn't know it should compile a
+   ;; different version of the dependencies.
+   ;; TODO: remove once support in ocaml/dune#11222 is released.
+   (compilation_mode whole_program))))
+
+(copy_files# ../*.ml)
+
+(tests
+ (build_if
+  (>= %{ocaml_version} 5))
+ (names
+  assume_no_perform
+  assume_no_perform_unhandled
+  assume_no_perform_nested_handler)
+ (libraries js_of_ocaml)
+ (action
+  (ignore-outputs
+   (with-accepted-exit-codes
+    0
+    (run node %{test}))))
+ (modes js))
diff --git a/compiler/tests-jsoo/lib-effects/dune b/compiler/tests-jsoo/lib-effects/dune
@@ -10,5 +10,30 @@
   (>= %{ocaml_version} 5))
  (inline_tests
   (modes js wasm best))
+ (modules
+  (:standard
+   \
+   assume_no_perform
+   assume_no_perform_unhandled
+   assume_no_perform_nested_handler))
  (preprocess
   (pps ppx_expect)))
+
+(tests
+ (build_if
+  (>= %{ocaml_version} 5))
+ (names
+  assume_no_perform
+  assume_no_perform_unhandled
+  assume_no_perform_nested_handler)
+ (modules
+  assume_no_perform
+  assume_no_perform_unhandled
+  assume_no_perform_nested_handler)
+ (libraries js_of_ocaml)
+ (action
+  (ignore-outputs
+   (with-accepted-exit-codes
+    0
+    (run node %{test}))))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-effects/dune b/compiler/tests-ocaml/lib-effects/dune
@@ -34,12 +34,7 @@
   test_lazy
   used_cont)
  (modules
-  (:standard
-   \
-   unhandled_unlinked
-   assume_no_perform
-   assume_no_perform_unhandled
-   assume_no_perform_nested_handler))
+  (:standard \ unhandled_unlinked))
  (modes js wasm))
 
 (tests
@@ -54,18 +49,3 @@
     (run node %{test}))
    (run cat)))
  (modes js wasm))
-
-(tests
- (build_if
-  (>= %{ocaml_version} 5))
- (names
-  assume_no_perform
-  assume_no_perform_unhandled
-  assume_no_perform_nested_handler)
- (libraries js_of_ocaml)
- (action
-  (ignore-outputs
-   (with-accepted-exit-codes
-    0
-    (run node %{test}))))
- (modes js wasm))