ci: Simplify to use generic wrapper for QEMU, Valgrind, etc

.cirrus.yml

@@ -5,7 +5,6 @@ env:
   ASM: no
   BUILD: check
   WITH_VALGRIND: yes
-  RUN_VALGRIND: no
   EXTRAFLAGS:
   HOST:
   ECDH: no
@@ -162,7 +161,7 @@ task:
     cpu: 1
     memory: 1G
   env:
-    QEMU_CMD: qemu-s390x
+    WRAPPER_CMD: qemu-s390x
     HOST: s390x-linux-gnu
     BUILD:
     WITH_VALGRIND: no
@@ -185,7 +184,7 @@ task:
     cpu: 1
     memory: 1G
   env:
-    QEMU_CMD: qemu-arm
+    WRAPPER_CMD: qemu-arm
     HOST: arm-linux-gnueabihf
     BUILD:
     WITH_VALGRIND: no
@@ -209,7 +208,7 @@ task:
     cpu: 1
     memory: 1G
   env:
-    QEMU_CMD: qemu-aarch64
+    WRAPPER_CMD: qemu-aarch64
     HOST: aarch64-linux-gnu
     BUILD:
     WITH_VALGRIND: no
@@ -230,7 +229,7 @@ task:
     cpu: 1
     memory: 1G
   env:
-    WINE_CMD: wine64-stable
+    WRAPPER_CMD: wine64-stable
     HOST: x86_64-w64-mingw32
     BUILD:
     WITH_VALGRIND: no
@@ -251,6 +250,7 @@ task:
     cpu: 1
     memory: 1G
   env:
+    BUILD:
     ECDH: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
@@ -260,9 +260,12 @@ task:
   matrix:
     - name: "Valgrind (memcheck)"
       env:
-        RUN_VALGRIND: yes
+        # The `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (https://www.valgrind.org/docs/manual/manual-core.html)
+        WRAPPER_CMD: "valgrind --error-exitcode=42"
     - name: "UBSan, ASan, LSan"
       env:
+        # Use dummy wrapper command to run the tests outside of make check
+        WRAPPER_CMD: env
         CFLAGS: "-fsanitize=undefined,address"
         CFLAGS_FOR_BUILD: "-fsanitize=undefined,address"
         UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1"

ci/cirrus.sh

@@ -34,40 +34,19 @@ then
     make "$BUILD"
 fi
 
-if [ "$RUN_VALGRIND" = "yes" ]
+if [ -n "$WRAPPER_CMD" ]
 then
-    # the `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (https://www.valgrind.org/docs/manual/manual-core.html)
-    valgrind --error-exitcode=42 ./tests 16
-    valgrind --error-exitcode=42 ./exhaustive_tests
-fi
-
-if [ -n "$QEMU_CMD" ]
-then
-    $QEMU_CMD ./tests 16
-    $QEMU_CMD ./exhaustive_tests
-fi
-
-if [ -n "$WINE_CMD" ]
-then
-    $WINE_CMD ./tests 16
-    $WINE_CMD ./exhaustive_tests
+    $WRAPPER_CMD ./tests 16
+    $WRAPPER_CMD ./exhaustive_tests
 fi
 
 if [ "$BENCH" = "yes" ]
 then
     # Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
     EXEC='./libtool --mode=execute'
-    if [ -n "$QEMU_CMD" ]
-    then
-       EXEC="$EXEC $QEMU_CMD"
-    fi
-    if [ "$RUN_VALGRIND" = "yes" ]
-    then
-        EXEC="$EXEC valgrind --error-exitcode=42"
-    fi
-    if [ -n "$WINE_CMD" ]
+    if [ -n "$WRAPPER_CMD" ]
     then
-        EXEC="$WINE_CMD"
+        EXEC="$EXEC $WRAPPER_CMD"
     fi
     # This limits the iterations in the benchmarks below to ITER iterations.
     export SECP256K1_BENCH_ITERS="$ITERS"