summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej enczykowski <maze@google.com>2019-03-21 23:04:48 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-21 23:04:48 -0700
commit4825e4ba2ed20342d56d994169d4703c793df912 (patch)
tree031340d657dcda198cb2d2171add3a94ce85d5b9
parent713b0139dc76c286709b6d81364098b0f71010a9 (diff)
parent1ffe120dd3ae65da9128406214b7ad3973dcf1c1 (diff)
downloadtests-4825e4ba2ed20342d56d994169d4703c793df912.tar.gz
net-test: build_rootfs - fix -n being ignored am: e9e18054c2 am: 0ee596ee82
am: 1ffe120dd3 Change-Id: Id64eaebeb8d5a97bbdf23a12f773c58a412b7277
-rwxr-xr-xnet/test/build_rootfs.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/test/build_rootfs.sh b/net/test/build_rootfs.sh
index ce09da1..07106cc 100755
--- a/net/test/build_rootfs.sh
+++ b/net/test/build_rootfs.sh
@@ -66,7 +66,9 @@ while getopts ":hs:a:m:n:" opt; do
esac
done
-name=net_test.rootfs.$arch.`date +%Y%m%d`
+if [[ -z "${name}" ]]; then
+ name=net_test.rootfs.$arch.`date +%Y%m%d`
+fi
# Switch to qemu-debootstrap for incompatible architectures
if [ "$arch" = "arm64" ]; then