diff --git a/ci-build.sh b/ci-build.sh index 5fbc955d..0f9482d0 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -347,27 +347,19 @@ else pids=() for idx in 1 2 3 4; do if [ $idx -le ${#tests[@]} ]; then - # All builds run Valgrind + # All builds run Valgrind on Linux if [ "$ARCH" = "linux" ]; then run_valgrind="yes" - if [ $idx -eq 1 ]; then - extra_flags="--enable-valgrind --enable-coverage" - run_coverage="yes" - else - extra_flags="--enable-valgrind" - run_coverage="no" - fi + extra_flags="--enable-valgrind" else extra_flags="" run_valgrind="no" - run_coverage="no" fi + run_coverage="no" build_and_test "${tests[$((idx-1))]}" "$* $extra_flags" "$idx" "$run_valgrind" "$run_coverage" & pids+=("$!") flags_desc="" - [ "$run_valgrind" = "yes" ] && flags_desc="Valgrind" - [ "$run_coverage" = "yes" ] && flags_desc="${flags_desc:+$flags_desc+}Coverage" - [ -n "$flags_desc" ] && flags_desc=" [+$flags_desc]" + [ "$run_valgrind" = "yes" ] && flags_desc=" [+Valgrind]" echo " → Build $idx: ${tests[$((idx-1))]}$flags_desc" fi done