summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-10-20 01:56:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-20 01:56:31 +0000
commit7b3d72a46edd3ba1ebfa148ab3a611555f551774 (patch)
treebc50a605bfeae8e387658ef62b712694f13eb725
parenteb7071f934eddfa63eaf93c5bc62f3d96ad1bf1e (diff)
parentb2c3edd1e0b461743b03a6697e1de6883e77dcfb (diff)
downloadtests-7b3d72a46edd3ba1ebfa148ab3a611555f551774.tar.gz
net-test: properly support SUBARCH on command line am: 9520f1f3a6 am: b2c3edd1e0
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1466688 Change-Id: I907fbcd9751f7f26e8ba4efce9637fa676ddc930
-rwxr-xr-xnet/test/run_net_test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index 1969a92..dbc411e 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -259,7 +259,7 @@ if ((nobuild == 0)); then
if [ "$ARCH" == "um" ]; then
# Exporting ARCH=um SUBARCH=x86_64 doesn't seem to work, as it
# "sometimes" (?) results in a 32-bit kernel.
- make_flags="$make_flags ARCH=$ARCH SUBARCH=x86_64 CROSS_COMPILE= "
+ make_flags="$make_flags ARCH=$ARCH SUBARCH=${SUBARCH:-x86_64} CROSS_COMPILE= "
fi
if [ -n "$CC" ]; then
# The CC flag is *not* inherited from the environment, so it must be