Make 29-svcomp/36-svcomp-arch multilib detection more precise

Also handles missing gcc-multilib on Linux, e.g. in opam docker. There's no conf-* package for gcc-multilib.
goblint · Nov 28, 2024 · eb9ee51 · eb9ee51
1 parent 0df4d86
commit eb9ee51
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/tests/regression/29-svcomp/dune b/tests/regression/29-svcomp/dune
@@ -17,4 +17,4 @@
 
 (cram
  (applies_to 36-svcomp-arch)
- (enabled_if (<> %{system} macosx))) ; https://dune.readthedocs.io/en/stable/reference/boolean-language.html
+ (enabled_if %{read:../../util/multilibAvailable})) ; https://dune.readthedocs.io/en/stable/reference/boolean-language.html
diff --git a/tests/util/dune b/tests/util/dune
@@ -1,11 +1,16 @@
 (executables
- (names yamlWitnessStrip yamlWitnessStripDiff)
+ (names yamlWitnessStrip yamlWitnessStripDiff multilibConfigure)
  (libraries
    batteries.unthreaded
+   goblint-cil
    goblint_std
    goblint_lib
    yaml
    goblint.sites.dune
    goblint.build-info.dune)
  (flags :standard -open Goblint_std)
  (preprocess (pps ppx_deriving.std)))
+
+(rule
+ (target multilibAvailable)
+ (action (with-stdout-to %{target} (run ./multilibConfigure.exe))))
diff --git a/tests/util/multilibConfigure.ml b/tests/util/multilibConfigure.ml
@@ -0,0 +1,4 @@
+open GoblintCil
+
+let () =
+  Printf.printf "%B" (Option.is_some GoblintCil.Machdep.gcc32 && Option.is_some GoblintCil.Machdep.gcc64)