Merge pull request #113 from jmid/test-cond-tweaks

Test condition tweaks

Author: Sudha247

test/dune

@@ -98,8 +98,15 @@
  (name backtrace)
  (libraries domainslib)
  (modules backtrace)
- (enabled_if (and (= %{arch_sixtyfour} true) (<> %{architecture} power) (<> %{architecture} s390x))))
- ;; disabled temporarily on bytecode switches https://github.com/ocaml/dune/issues/7845
+ (enabled_if (<> %{system} mingw64)) ;; triggers a known issue on mingw https://github.com/ocaml/ocaml/pull/12231
+ (modes byte native))
+ ;; byte_complete .exes don't include debug+trace info https://github.com/ocaml/dune/issues/7845
+ ;; so on a bytecode switch/platform we build a plain bytecode version w/trace info
+ ;; and rename it to .exe
+(rule
+ (target backtrace.exe)
+ (action (copy backtrace.bc backtrace.exe))
+ (enabled_if (and (= %{bin-available:ocamlopt} false) (<> %{system} mingw64))))
 
 (test
  (name off_by_one)
@@ -112,16 +119,14 @@
  (name task_one_dep)
  (modules task_one_dep)
  (libraries qcheck-multicoretests-util qcheck-core qcheck-core.runner domainslib)
- (enabled_if (and (= %{arch_sixtyfour} true) (<> %{architecture} power) (<> %{architecture} s390x)))
- ;; takes forever on bytecode
+ (enabled_if %{bin-available:ocamlopt}) ;; takes forever on bytecode
  (action (run %{test} --verbose)))
 
 (test
  (name task_more_deps)
  (modules task_more_deps)
  (libraries qcheck-multicoretests-util qcheck-core qcheck-core.runner domainslib)
- (enabled_if (and (= %{arch_sixtyfour} true) (<> %{architecture} power) (<> %{architecture} s390x)))
- ;; takes forever on bytecode
+ (enabled_if %{bin-available:ocamlopt}) ;; takes forever on bytecode
  (action (run %{test} --verbose)))
 
 (test