commit 7878ca7eb5513051031dfefc76e5b2ca069a7faa
author Benedict Wong <benedictwong@google.com> Fri Jul 13 15:56:36 2018 -0700
committer Benedict Wong <benedictwong@google.com> Mon Jul 16 17:18:57 2018 +0000
tree 836f691af16a7d8e4aaefc8e3370af8b30f26faf
parent 764991f41972a6ac7ba8919ce69a35e0f54c2197

Fix nobuild runs of run_net_test.sh without KERNEL_BINARY env var set

This commit sets the default location of KERNEL_BINARY based on the
architechture, and ensures that it is set for --nobuild runs as well.

Test: Ran kernel unit tests
Change-Id: I0db4f3aaab811cc0aec0406f24e4a2506cbe694a

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