From 0b3b8bf15c9f6be35c2f7cf1f282d81859dd05d2 Mon Sep 17 00:00:00 2001
From: Hideki Sekine <sekineh@me.com>
Date: Wed, 18 Jul 2018 18:14:47 +0900
Subject: [PATCH] Use `dist-various-1` Dockerfile.

---
 .travis.yml                             |  2 --
 src/ci/docker/dist-various-1/Dockerfile |  9 ++++++-
 src/ci/docker/thumb-none/Dockerfile     | 34 -------------------------
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 src/ci/docker/thumb-none/Dockerfile

diff --git a/.travis.yml b/.travis.yml
index e231acb86cbc..ba8a39f355c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,8 +162,6 @@ matrix:
       if: branch = auto
     - env: IMAGE=wasm32-unknown
       if: branch = auto
-    - env: IMAGE=thumb-none
-      if: branch = auto
     - env: IMAGE=x86_64-gnu
       if: branch = auto
     - env: IMAGE=x86_64-gnu-full-bootstrap
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
index b195decfcf57..e57209b9c65b 100644
--- a/src/ci/docker/dist-various-1/Dockerfile
+++ b/src/ci/docker/dist-various-1/Dockerfile
@@ -80,6 +80,11 @@ RUN \
   echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \
   echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh
 
+# ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi
+ENV RUN_MAKE_TARGETS=thumbv7m-none-eabi
+ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabi
+ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf
+
 ENV TARGETS=asmjs-unknown-emscripten
 ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
 ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd
@@ -120,7 +125,9 @@ ENV RUST_CONFIGURE_ARGS \
       --enable-emscripten \
       --disable-docs
 
-ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
+ENV SCRIPT \ 
+      python2.7 ../x.py test --target $RUN_MAKE_TARGETS src/test/run-make && \
+      python2.7 ../x.py dist --target $TARGETS
 
 # sccache
 COPY scripts/sccache.sh /scripts/
diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile
deleted file mode 100644
index 354c022305e9..000000000000
--- a/src/ci/docker/thumb-none/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  g++ \
-  make \
-  file \
-  curl \
-  ca-certificates \
-  python2.7 \
-  git \
-  cmake \
-  sudo \
-  xz-utils \
-  zlib1g-dev \
-  bzip2 \
-  patch \
-  libssl-dev \
-  pkg-config \
-  gcc-arm-none-eabi \
-  libnewlib-arm-none-eabi
-
-# ENV TARGETS=thumbv6m-none-eabi
-ENV TARGETS=thumbv7m-none-eabi
-ENV TARGETS=$TARGETS,thumbv7em-none-eabi
-ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
-
-ENV RUST_CONFIGURE_ARGS \
-      --disable-docs
-
-ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-make
-
-# sccache
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh