summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-10-20 02:28:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-20 02:28:01 +0000
commit4e00b5559811b29e8566816970e9dea39371fdfc (patch)
treebc50a605bfeae8e387658ef62b712694f13eb725
parente559187e1b3afa22ea375d1c5c9d695407096683 (diff)
parent7b3d72a46edd3ba1ebfa148ab3a611555f551774 (diff)
downloadtests-4e00b5559811b29e8566816970e9dea39371fdfc.tar.gz
net-test: properly support SUBARCH on command line am: 9520f1f3a6 am: b2c3edd1e0 am: 7b3d72a46e
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1466688 Change-Id: I03e5a63807764950a2dbc3aec760da09defe9ce8
-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