From e8d4ba815a033ff46dc0891daac5c309d0480d6c Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 17 Dec 2018 12:30:10 +1100 Subject: [PATCH] do_build: stop a failing "kill" from killing the whole here-script --- do_build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/do_build b/do_build index 4ea51aa..3c4df6d 100755 --- a/do_build +++ b/do_build @@ -143,9 +143,9 @@ $cmd <<-EOF echo "ERROR: perf build failed - log follows" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" cat \$log_perf - kill \$x86_64_pid - kill \$ppc64_pid - kill \$arm_pid + kill \$x86_64_pid || true + kill \$ppc64_pid || true + kill \$arm_pid || true killall make rm .scmversion exit 1 @@ -161,8 +161,8 @@ $cmd <<-EOF echo "ERROR: arm multi_v7_defconfig build failed - log follows" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" cat \$log_arm - kill \$x86_64_pid - kill \$ppc64_pid + kill \$x86_64_pid || true + kill \$ppc64_pid || true killall make rm .scmversion exit 1 @@ -178,7 +178,7 @@ $cmd <<-EOF echo "ERROR: powerpc ppc64_defconfig build failed - log follows" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" cat \$log_ppc - kill \$x86_64_pid + kill \$x86_64_pid || true killall make rm .scmversion exit 1 -- 2.39.5