From 90d7ec46f1c8e16ac797ec54765eb9e60456d1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vouillon?= <jerome.vouillon@gmail.com>
Date: Sat, 2 Nov 2024 19:00:14 +0100
Subject: [PATCH] Compiler tests: lighter conditions

---
 compiler/tests-compiler/dune.inc         | 220 +++++++++++------------
 compiler/tests-compiler/gen-rules/gen.ml |   9 +-
 2 files changed, 114 insertions(+), 115 deletions(-)

diff --git a/compiler/tests-compiler/dune.inc b/compiler/tests-compiler/dune.inc
index dc6917b7c1..e10abfd48d 100644
--- a/compiler/tests-compiler/dune.inc
+++ b/compiler/tests-compiler/dune.inc
@@ -2,11 +2,11 @@
 (library
  ;; compiler/tests-compiler/array_access.ml
  (name array_access_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules array_access)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -17,11 +17,11 @@
 (library
  ;; compiler/tests-compiler/build_path_prefix_map.ml
  (name build_path_prefix_map_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules build_path_prefix_map)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -32,11 +32,11 @@
 (library
  ;; compiler/tests-compiler/call_gen.ml
  (name call_gen_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules call_gen)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -47,11 +47,11 @@
 (library
  ;; compiler/tests-compiler/compact.ml
  (name compact_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules compact)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -62,11 +62,11 @@
 (library
  ;; compiler/tests-compiler/cond.ml
  (name cond_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules cond)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -77,11 +77,11 @@
 (library
  ;; compiler/tests-compiler/direct_calls.ml
  (name direct_calls_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules direct_calls)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -92,11 +92,11 @@
 (library
  ;; compiler/tests-compiler/effects.ml
  (name effects_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects) (>= %{ocaml_version} 5)))
+ (enabled_if (and (>= %{ocaml_version} 5) (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules effects)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -107,11 +107,11 @@
 (library
  ;; compiler/tests-compiler/effects_continuations.ml
  (name effects_continuations_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules effects_continuations)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -122,11 +122,11 @@
 (library
  ;; compiler/tests-compiler/effects_exceptions.ml
  (name effects_exceptions_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules effects_exceptions)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -137,11 +137,11 @@
 (library
  ;; compiler/tests-compiler/effects_toplevel.ml
  (name effects_toplevel_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules effects_toplevel)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -152,11 +152,11 @@
 (library
  ;; compiler/tests-compiler/eliminate_exception_handler.ml
  (name eliminate_exception_handler_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules eliminate_exception_handler)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -167,11 +167,11 @@
 (library
  ;; compiler/tests-compiler/empty_cma.ml
  (name empty_cma_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules empty_cma)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -182,11 +182,11 @@
 (library
  ;; compiler/tests-compiler/end_to_end.ml
  (name end_to_end_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules end_to_end)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -197,11 +197,11 @@
 (library
  ;; compiler/tests-compiler/error.ml
  (name error_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules error)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -212,11 +212,11 @@
 (library
  ;; compiler/tests-compiler/es6.ml
  (name es6_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules es6)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -227,11 +227,11 @@
 (library
  ;; compiler/tests-compiler/exceptions.ml
  (name exceptions_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules exceptions)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -242,11 +242,11 @@
 (library
  ;; compiler/tests-compiler/exports.ml
  (name exports_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules exports)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -257,11 +257,11 @@
 (library
  ;; compiler/tests-compiler/getenv.ml
  (name getenv_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules getenv)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -272,11 +272,11 @@
 (library
  ;; compiler/tests-compiler/gh1007.ml
  (name gh1007_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1007)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -287,11 +287,11 @@
 (library
  ;; compiler/tests-compiler/gh1051.ml
  (name gh1051_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects) %{arch_sixtyfour}))
+ (enabled_if (and %{arch_sixtyfour} (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1051)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects) %{arch_sixtyfour}))
+  (enabled_if %{arch_sixtyfour})
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -302,11 +302,11 @@
 (library
  ;; compiler/tests-compiler/gh1320.ml
  (name gh1320_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1320)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -317,11 +317,11 @@
 (library
  ;; compiler/tests-compiler/gh1349.ml
  (name gh1349_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1349)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -332,11 +332,11 @@
 (library
  ;; compiler/tests-compiler/gh1354.ml
  (name gh1354_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1354)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -347,11 +347,11 @@
 (library
  ;; compiler/tests-compiler/gh1390.ml
  (name gh1390_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1390)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -362,11 +362,11 @@
 (library
  ;; compiler/tests-compiler/gh1481.ml
  (name gh1481_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1481)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -377,11 +377,11 @@
 (library
  ;; compiler/tests-compiler/gh1494.ml
  (name gh1494_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1494)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -392,11 +392,11 @@
 (library
  ;; compiler/tests-compiler/gh1559.ml
  (name gh1559_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1559)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -407,11 +407,11 @@
 (library
  ;; compiler/tests-compiler/gh1599.ml
  (name gh1599_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1599)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -422,11 +422,11 @@
 (library
  ;; compiler/tests-compiler/gh1659.ml
  (name gh1659_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1659)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -437,11 +437,11 @@
 (library
  ;; compiler/tests-compiler/gh747.ml
  (name gh747_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh747)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -452,11 +452,11 @@
 (library
  ;; compiler/tests-compiler/gl507.ml
  (name gl507_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gl507)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -467,11 +467,11 @@
 (library
  ;; compiler/tests-compiler/global_deadcode.ml
  (name global_deadcode_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules global_deadcode)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -482,11 +482,11 @@
 (library
  ;; compiler/tests-compiler/inlining.ml
  (name inlining_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules inlining)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -497,11 +497,11 @@
 (library
  ;; compiler/tests-compiler/js_parser_printer.ml
  (name js_parser_printer_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules js_parser_printer)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -512,11 +512,11 @@
 (library
  ;; compiler/tests-compiler/jsopt.ml
  (name jsopt_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules jsopt)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -527,11 +527,11 @@
 (library
  ;; compiler/tests-compiler/lambda_lifting.ml
  (name lambda_lifting_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules lambda_lifting)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -542,11 +542,11 @@
 (library
  ;; compiler/tests-compiler/lazy.ml
  (name lazy_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules lazy)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects) (>= %{ocaml_version} 5)))
+  (enabled_if (>= %{ocaml_version} 5))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -557,11 +557,11 @@
 (library
  ;; compiler/tests-compiler/loops.ml
  (name loops_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules loops)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -572,11 +572,11 @@
 (library
  ;; compiler/tests-compiler/macro.ml
  (name macro_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules macro)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -587,11 +587,11 @@
 (library
  ;; compiler/tests-compiler/match_with_exn.ml
  (name match_with_exn_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules match_with_exn)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -602,11 +602,11 @@
 (library
  ;; compiler/tests-compiler/minify.ml
  (name minify_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules minify)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -617,11 +617,11 @@
 (library
  ;; compiler/tests-compiler/mutable_closure.ml
  (name mutable_closure_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules mutable_closure)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -632,11 +632,11 @@
 (library
  ;; compiler/tests-compiler/obj.ml
  (name obj_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects) (>= %{ocaml_version} 5)))
+ (enabled_if (and (>= %{ocaml_version} 5) (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules obj)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects) (>= %{ocaml_version} 5)))
+  (enabled_if (>= %{ocaml_version} 5))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -647,11 +647,11 @@
 (library
  ;; compiler/tests-compiler/obj_dup.ml
  (name obj_dup_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules obj_dup)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -662,11 +662,11 @@
 (library
  ;; compiler/tests-compiler/scopes.ml
  (name scopes_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules scopes)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -677,11 +677,11 @@
 (library
  ;; compiler/tests-compiler/side_effect.ml
  (name side_effect_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules side_effect)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -692,11 +692,11 @@
 (library
  ;; compiler/tests-compiler/sourcemap.ml
  (name sourcemap_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules sourcemap)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -707,11 +707,11 @@
 (library
  ;; compiler/tests-compiler/static_eval.ml
  (name static_eval_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules static_eval)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -722,11 +722,11 @@
 (library
  ;; compiler/tests-compiler/sys_command.ml
  (name sys_command_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules sys_command)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -737,11 +737,11 @@
 (library
  ;; compiler/tests-compiler/sys_fs.ml
  (name sys_fs_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules sys_fs)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -752,11 +752,11 @@
 (library
  ;; compiler/tests-compiler/tailcall.ml
  (name tailcall_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules tailcall)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -767,11 +767,11 @@
 (library
  ;; compiler/tests-compiler/target_env.ml
  (name target_env_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules target_env)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -782,11 +782,11 @@
 (library
  ;; compiler/tests-compiler/test_string.ml
  (name test_string_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules test_string)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -797,11 +797,11 @@
 (library
  ;; compiler/tests-compiler/unix_fs.ml
  (name unix_fs_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules unix_fs)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
@@ -812,11 +812,11 @@
 (library
  ;; compiler/tests-compiler/variable_declaration_output.ml
  (name variable_declaration_output_15)
- (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+ (enabled_if (and true (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules variable_declaration_output)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
+  (enabled_if true)
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
diff --git a/compiler/tests-compiler/gen-rules/gen.ml b/compiler/tests-compiler/gen-rules/gen.ml
index 03866594ce..4ddd9fb34f 100644
--- a/compiler/tests-compiler/gen-rules/gen.ml
+++ b/compiler/tests-compiler/gen-rules/gen.ml
@@ -62,10 +62,9 @@ let test_enabled_if = function
 
 let enabled_if cond =
   match cond with
-  | Any -> "(and (<> %{profile} wasm) (<> %{profile} wasm-effects))"
-  | GE5 ->
-      "(and (<> %{profile} wasm) (<> %{profile} wasm-effects) (>= %{ocaml_version} 5))"
-  | B64 -> "(and (<> %{profile} wasm) (<> %{profile} wasm-effects) %{arch_sixtyfour})"
+  | Any -> "true"
+  | GE5 -> "(>= %{ocaml_version} 5)"
+  | B64 -> "%{arch_sixtyfour}"
 
 let () =
   Array.to_list (Sys.readdir ".")
@@ -78,7 +77,7 @@ let () =
 (library
  ;; %s%s.ml
  (name %s_%d)
- (enabled_if %s)
+ (enabled_if (and %s (<> %%{profile} wasm) (<> %%{profile} wasm-effects)))
  (modules %s)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests