Meta/Dothem: reorganize sanitization trigger a bit
Junio C Hamano committed
Jun 9, 2025 at 09:35 UTC
c9eea792abc0093702c6051046a5d0a044def502
1 file changed
+18
-27
Dothem
+18
-27
@@ -269,24 +269,27 @@ do
269
section hdr-check
270
Meta/Make $M $jobs -- hdr-check &&
271
272
- # SANITIZE=address,undefined
273
- case "$dotest,$san,$with_sha256" in
274
- '')
275
- ;;
276
- test,,)
277
- section test
278
- Meta/Make $M $noprove ${test+"$test"} $jobs $test_long $memtrash \
279
- -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest
280
- ;;
281
- *,t,*)
272
+ if test -n "$san"
273
+ then
274
section SANITIZE=address,undefined
275
SANITIZE=address,undefined Meta/Make $M $jobs test &&
276
Meta/Make >/dev/null distclean
285
- ;;
286
- esac &&
287
-
288
- # sha256
289
- if test -n "$with_sha256"
277
+ elif test "$with_leaks$with_sha256$dotest" = test
278
+ then
279
+ section test
280
+ Meta/Make $M $noprove ${test+"$test"} $jobs $test_long \
281
+ $memtrash \
282
+ -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest
283
+ elif test -n "$with_leaks"
284
+ then
285
+ section leaks
286
+ (
287
+ export SANITIZE=leak
288
+ export GIT_TEST_PASSING_SANITIZE_LEAK=true
289
+ Meta/Make -j16 $T CC=clang test &&
290
+ Meta/Make -j16 >/dev/null distclean
291
+ )
292
+ elif test -n "$with_sha256"
293
then
294
section sha256
295
(
@@ -310,18 +313,6 @@ do
313
fi
314
} &&
315
313
- # leaks
314
- if test -n "$with_leaks"
315
- then
316
- section leaks
317
- (
318
- export SANITIZE=leak
319
- export GIT_TEST_PASSING_SANITIZE_LEAK=true
320
- Meta/Make -j16 $T CC=clang test &&
321
- Meta/Make -j16 >/dev/null distclean
322
- )
323
- fi &&
324
-
316
{
317
test z$install = znoinstall ||
318
if test "$save" = "$(git rev-parse HEAD)"