commit 18422a411b81cebc930b7227dc49226bbd140e8d
author Jian Cai <jiancai@google.com> Wed Feb 12 16:06:00 2020 -0800
committer Jian Cai <jiancai@google.com> Thu Sep 17 19:18:37 2020 +0000
tree f1fb66c8df8d3dea4512497391908309f25d3d44
parent 4edc81e0b5fe33fb3c3f59e8188d16e3bd3aba54

bisection: exit after updating kernel

Exit after running update_kernel.sh as all the following code is
irrelevant to kernels.

BUG=chromium:1042452

TEST=verified locally.

Change-Id: I9d6fc6f6c319c7a825585868978911806f07a629
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2053243
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Jian Cai <jiancai@google.com>

binary_search_tool/common/test_setup.sh

diff --git a/binary_search_tool/common/test_setup.sh b/binary_search_tool/common/test_setup.sh
index 56b8944..4fa1abe 100755
--- a/binary_search_tool/common/test_setup.sh
+++ b/binary_search_tool/common/test_setup.sh
@@ -109,15 +109,17 @@
 
   echo
   echo "DEPLOYING"
-  if [[ ${PACKAGE} == sys-kernel/chromeos-kernel-* ]]; then
-    echo "/mnt/host/source/src/scripts/update_kernel.sh \
-      --remote=${BISECT_REMOTE}"
-    /mnt/host/source/src/scripts/update_kernel.sh --remote=${BISECT_REMOTE}
-  else
-    echo "cros deploy ${BISECT_REMOTE} ${BISECT_PACKAGE}"
-    cros deploy ${BISECT_REMOTE} ${BISECT_PACKAGE} --log-level=info
+
+  if [[ ${BISECT_PACKAGE} == sys-kernel/chromeos-kernel-* ]]; then
+    echo "/mnt/host/source/src/scripts/update_kernel.sh " \
+      "--remote=${BISECT_REMOTE} --board=${BISECT_BOARD}"
+    # exec the command to make sure it always exit after
+    exec /mnt/host/source/src/scripts/update_kernel.sh --remote=${BISECT_REMOTE} --board=${BISECT_BOARD}
   fi
 
+  echo "cros deploy ${BISECT_REMOTE} ${BISECT_PACKAGE}"
+  cros deploy ${BISECT_REMOTE} ${BISECT_PACKAGE} --log-level=info
+
   deploy_status=$?
 
   if [[ ${deploy_status} -eq 0 ]] ; then