bash: avoid waiting on taskkilled jobs

Author: josephbirkner

test-wheel.bash

@@ -52,18 +52,15 @@ terminate_pid_tree() {
 
   if [[ "$is_windows_shell" == true ]] && command -v taskkill >/dev/null 2>&1; then
     taskkill //PID "$pid" //T //F >/dev/null 2>&1 || true
-  else
-    kill -TERM "-$pid" >/dev/null 2>&1 || kill "$pid" >/dev/null 2>&1 || true
+    return 0
   fi
 
+  kill -TERM "-$pid" >/dev/null 2>&1 || kill "$pid" >/dev/null 2>&1 || true
+
   local deadline=$((SECONDS + 20))
   while kill -0 "$pid" >/dev/null 2>&1; do
     if (( SECONDS >= deadline )); then
-      if [[ "$is_windows_shell" == true ]] && command -v taskkill >/dev/null 2>&1; then
-        taskkill //PID "$pid" //T //F >/dev/null 2>&1 || true
-      else
-        kill -KILL "-$pid" >/dev/null 2>&1 || kill -9 "$pid" >/dev/null 2>&1 || true
-      fi
+      kill -KILL "-$pid" >/dev/null 2>&1 || kill -9 "$pid" >/dev/null 2>&1 || true
       break
     fi
     sleep 1
@@ -95,6 +92,15 @@ launch_background_command() {
 cleanup_background_jobs() {
   local pid=""
   for pid in "${background_pids[@]:+${background_pids[@]}}"; do
+    if [[ "$is_windows_shell" == true ]]; then
+      if kill -0 "$pid" >/dev/null 2>&1; then
+        terminate_pid_tree "$pid"
+      else
+        wait "$pid" 2>/dev/null || true
+      fi
+      continue
+    fi
+
     if kill -0 "$pid" >/dev/null 2>&1; then
       terminate_pid_tree "$pid"
     else