Merge #351

bors[bot] · reitermarkus · web-flow · commit 9ca1b8a47393 · 2019-11-22T22:43:56.000Z
351: Update `xargo`. r=Dylan-DPC a=reitermarkus



Co-authored-by: Markus Reiter &lt;me@reitermark.us&gt;
diff --git a/build-docker-image.sh b/build-docker-image.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 cd docker
 
diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml
@@ -2,7 +2,8 @@
 
 steps:
   - bash: |
-      set -e
+      set -euo pipefail
+
       if command -v rustup; then
         echo `command -v rustup` `rustup -V` already installed
         rustup self update
@@ -17,13 +18,16 @@ steps:
     displayName: Install rustup
 
   - bash: |
-      set -e
+      set -euo pipefail
+
       rustup update $TOOLCHAIN
       rustup default $TOOLCHAIN
     displayName: Install rust
 
   - bash: |
-      set -ex
+      set -x
+      set -euo pipefail
+
       rustup -V
       rustc -Vv
       cargo -V
diff --git a/ci/test.sh b/ci/test.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 function retry {
   local tries=${TRIES-5}
@@ -41,7 +42,7 @@ main() {
     export QEMU_STRACE=1
 
     # test `cross check`
-    if [ ! -z $STD ]; then
+    if [[ ! -z ${STD:-} ]]; then
         td=$(mktemp -d)
         cargo init --lib --name foo $td
         pushd $td
@@ -52,7 +53,7 @@ main() {
     fi
 
     # `cross build` test for targets where `std` is not available
-    if [ -z "$STD" ]; then
+    if [[ -z "${STD:-}" ]]; then
         td=$(mktemp -d)
 
         git clone \
@@ -98,9 +99,9 @@ EOF
         rm -rf $td
     fi
 
-    if [ $RUN ]; then
+    if [[ ${RUN:-} ]]; then
         # `cross test` test
-        if [ $DYLIB ]; then
+        if [[ ${DYLIB:-} ]]; then
             td=$(mktemp -d)
 
             pushd $td
@@ -150,15 +151,15 @@ EOF
     fi
 
     # Test C++ support
-    if [ $CPP ]; then
+    if [[ ${CPP:-} ]]; then
         td=$(mktemp -d)
 
         git clone --depth 1 https://github.com/japaric/hellopp $td
 
         pushd $td
         cargo update -p gcc
         retry cargo fetch
-        if [ $RUN ]; then
+        if [[ ${RUN:-} ]]; then
             cross_run --target $TARGET
         else
             cross build --target $TARGET
@@ -170,7 +171,7 @@ EOF
 }
 
 cross_run() {
-    if [ -z "$RUNNERS" ]; then
+    if [[ -z "${RUNNERS:-}" ]]; then
         cross run "$@"
     else
         for runner in $RUNNERS; do
@@ -181,7 +182,7 @@ cross_run() {
 }
 
 cross_test() {
-    if [ -z "$RUNNERS" ]; then
+    if [[ -z "${RUNNERS:-}" ]]; then
         cross test "$@"
     else
         for runner in $RUNNERS; do
@@ -192,7 +193,7 @@ cross_test() {
 }
 
 cross_bench() {
-    if [ -z "$RUNNERS" ]; then
+    if [[ -z "${RUNNERS:-}" ]]; then
         cross bench "$@"
     else
         for runner in $RUNNERS; do
diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android
@@ -14,7 +14,7 @@ COPY android-system.sh /
 RUN /android-system.sh arm64
 
 COPY qemu.sh /
-RUN /qemu.sh aarch64 android
+RUN /qemu.sh aarch64
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu
@@ -15,7 +15,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-arm64-cross
 
 COPY qemu.sh /
-RUN /qemu.sh aarch64 linux softmmu
+RUN /qemu.sh aarch64 softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi
@@ -14,7 +14,7 @@ COPY android-system.sh /
 RUN /android-system.sh arm
 
 COPY qemu.sh /
-RUN /qemu.sh arm android
+RUN /qemu.sh arm
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi
@@ -14,7 +14,7 @@ COPY android-system.sh /
 RUN /android-system.sh arm
 
 COPY qemu.sh /
-RUN /qemu.sh arm android
+RUN /qemu.sh arm
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
@@ -15,7 +15,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-armhf-cross
 
 COPY qemu.sh /
-RUN /qemu.sh arm linux softmmu
+RUN /qemu.sh arm softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.i686-linux-android b/docker/Dockerfile.i686-linux-android
@@ -21,7 +21,7 @@ RUN /android-system.sh x86
 #
 # Running with qemu works as expected
 COPY qemu.sh /
-RUN /qemu.sh i386 android
+RUN /qemu.sh i386
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu
@@ -14,7 +14,7 @@ RUN apt-get install -y --no-install-recommends \
     g++-multilib
 
 COPY qemu.sh /
-RUN /qemu.sh i386 linux softmmu
+RUN /qemu.sh i386 softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-mips-cross
 
 COPY qemu.sh /
-RUN /qemu.sh mips linux softmmu
+RUN /qemu.sh mips softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-mips64el-cross
 
 COPY qemu.sh /
-RUN /qemu.sh mips64el linux softmmu
+RUN /qemu.sh mips64el softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-mipsel-cross
 
 COPY qemu.sh /
-RUN /qemu.sh mipsel linux softmmu
+RUN /qemu.sh mipsel softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu
@@ -15,7 +15,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-powerpc-cross
 
 COPY qemu.sh /
-RUN /qemu.sh ppc linux softmmu
+RUN /qemu.sh ppc softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-ppc64-cross
 
 COPY qemu.sh /
-RUN /qemu.sh ppc64 linux softmmu
+RUN /qemu.sh ppc64 softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-ppc64el-cross
 
 COPY qemu.sh /
-RUN /qemu.sh ppc64le linux softmmu
+RUN /qemu.sh ppc64le softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-s390x-cross
 
 COPY qemu.sh /
-RUN /qemu.sh s390x linux softmmu
+RUN /qemu.sh s390x softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu
@@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \
     libc6-dev-sparc64-cross
 
 COPY qemu.sh /
-RUN /qemu.sh sparc64 linux softmmu
+RUN /qemu.sh sparc64 softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android
@@ -15,7 +15,7 @@ RUN /android-system.sh x86_64
 
 # Using qemu allows older host cpus (without sse4) to execute the target binaries
 COPY qemu.sh /
-RUN /qemu.sh x86_64 android
+RUN /qemu.sh x86_64
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu
@@ -15,7 +15,7 @@ RUN apt-get install -y --no-install-recommends \
     zlib1g-dev
 
 COPY qemu.sh /
-RUN /qemu.sh x86_64 linux softmmu
+RUN /qemu.sh x86_64 softmmu
 
 COPY dropbear.sh /
 RUN /dropbear.sh
diff --git a/docker/android-ndk.sh b/docker/android-ndk.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 NDK_URL=https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip
 
diff --git a/docker/android-system.sh b/docker/android-system.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 main() {
     local arch=$1
@@ -89,11 +90,13 @@ EOF
     # FATAL: kernel did not supply AT_SECURE
     sed -i -e 's/if (!kernel_supplied_AT_SECURE)/if (false)/g' bionic/linker/linker_environ.cpp
 
+    set +u
     source build/envsetup.sh
     lunch aosp_$arch-user
     mmma bionic/
     mmma external/mksh/
     mmma system/core/toolbox/
+    set -u
 
     if [ $arch = "arm" ]; then
         mv out/target/product/generic/system/ /
diff --git a/docker/cmake.sh b/docker/cmake.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 main() {
     local version=3.5.1
diff --git a/docker/common.sh b/docker/common.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 apt-get update
 
diff --git a/docker/dragonfly.sh b/docker/dragonfly.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 main() {
     local binutils=2.25.1 \
diff --git a/docker/dropbear.sh b/docker/dropbear.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 main() {
     local version=2019.78 \
diff --git a/docker/emscripten-entry.sh b/docker/emscripten-entry.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 export HOME=/emsdk-portable/
 
diff --git a/docker/emscripten.sh b/docker/emscripten.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 main() {
     local dependencies=(
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
+set -euo pipefail
 
 main() {
     local arch=$1
diff --git a/docker/linux-image.sh b/docker/linux-image.sh
diff --git a/docker/musl.sh b/docker/musl.sh
diff --git a/docker/netbsd.sh b/docker/netbsd.sh
diff --git a/docker/qemu.sh b/docker/qemu.sh
diff --git a/docker/solaris.sh b/docker/solaris.sh
diff --git a/docker/xargo.sh b/docker/xargo.sh

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ RUN /android-system.sh x86`
`21`	`21`	`#`
`22`	`22`	`# Running with qemu works as expected`
`23`	`23`	`COPY qemu.sh /`
`24`		`-RUN /qemu.sh i386 android`
	`24`	`+RUN /qemu.sh i386`
`25`	`25`
`26`	`26`	`RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/`
`27`	`27`