commit 2a5ab7270578f5e664e0139478863b530017915d
author Benedict Wong <benedictwong@google.com> Mon Jul 16 13:32:36 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 16 13:32:36 2018 -0700
tree 836f691af16a7d8e4aaefc8e3370af8b30f26faf
parent 300c4ec6f37a468916fca201bb18f13d46a73908
parent e84422ed291550703024ffcd95f7d64decfac280

Fix nobuild runs of run_net_test.sh without KERNEL_BINARY env var set am: 7878ca7eb5
am: e84422ed29

Change-Id: I35d49ff465ee384f3cda7d09c8bf34c0ea3616ed

net/test/run_net_test.sh

diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index 84536f0..4ae7705 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -191,6 +191,14 @@
 
 if [ -n "$KERNEL_BINARY" ]; then
   nobuild=1
+else
+  # Set default KERNEL_BINARY location if it was not provided.
+  if [ "$ARCH" == "um" ]; then
+    KERNEL_BINARY=./linux
+  else
+    # Assume x86_64 bzImage for now
+    KERNEL_BINARY=./arch/x86/boot/bzImage
+  fi
 fi
 
 if ((nobuild == 0)); then
@@ -229,11 +237,8 @@
   # Compile the kernel.
   if [ "$ARCH" == "um" ]; then
     $MAKE -j$J $make_flags linux
-    KERNEL_BINARY=./linux
   else
     $MAKE -j$J $make_flags
-    # Assume x86_64 bzImage for now
-    KERNEL_BINARY=./arch/x86/boot/bzImage
   fi
 fi