Meta/Dothem: reorganize sanitization trigger a bit

diff --git a/Dothem b/Dothem
index 1f597b90b9470960b4f1f1b01be33ba1980d5572..b8eab21ec28232af3e962b8b2d24fc2397f71d14 100755 (executable)
--- a/Dothem
+++ b/Dothem
@@ -269,24 +269,27 @@ do
                section hdr-check
                Meta/Make $M $jobs -- hdr-check &&
 
-               # SANITIZE=address,undefined
-               case "$dotest,$san,$with_sha256" in
-               '')
-                       ;;
-               test,,)
-                       section test
-                       Meta/Make $M $noprove ${test+"$test"} $jobs $test_long $memtrash \
-                           -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest
-                       ;;
-               *,t,*)
+               if test -n "$san"
+               then
                        section SANITIZE=address,undefined
                        SANITIZE=address,undefined Meta/Make $M $jobs test &&
                        Meta/Make >/dev/null distclean
-                       ;;
-               esac &&
-
-               # sha256
-               if test -n "$with_sha256"
+               elif test "$with_leaks$with_sha256$dotest" = test
+               then
+                       section test
+                       Meta/Make $M $noprove ${test+"$test"} $jobs $test_long \
+                                 $memtrash \
+                           -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest
+               elif test -n "$with_leaks"
+               then
+                       section leaks
+                       (
+                               export SANITIZE=leak
+                               export GIT_TEST_PASSING_SANITIZE_LEAK=true
+                               Meta/Make -j16 $T CC=clang test &&
+                               Meta/Make -j16 >/dev/null distclean
+                       )
+               elif test -n "$with_sha256"
                then
                        section sha256
                        (
@@ -310,18 +313,6 @@ do
                        fi
                } &&
 
-               # leaks
-               if test -n "$with_leaks"
-               then
-                       section leaks
-                       (
-                               export SANITIZE=leak
-                               export GIT_TEST_PASSING_SANITIZE_LEAK=true
-                               Meta/Make -j16 $T CC=clang test &&
-                               Meta/Make -j16 >/dev/null distclean
-                       )
-               fi &&
-
                {
                        test z$install = znoinstall ||
                        if test "$save" = "$(git rev-parse HEAD)"