From 899d936dee555ef2ac67e68a5017ccb0d1e9a697 Mon Sep 17 00:00:00 2001
From: Denys Zariaiev <denys.zariaiev@gmail.com>
Date: Tue, 29 Jan 2019 19:06:42 +0100
Subject: Merge NVPTX and WASM test images into `test-various`

---
 src/ci/docker/test-various/Dockerfile   | 50 +++++++++++++++++++++++++++++++++
 src/ci/docker/wasm32-unknown/Dockerfile | 41 ---------------------------
 2 files changed, 50 insertions(+), 41 deletions(-)
 create mode 100644 src/ci/docker/test-various/Dockerfile
 delete mode 100644 src/ci/docker/wasm32-unknown/Dockerfile

(limited to 'src/ci')

diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile
new file mode 100644
index 00000000000..a5ae94262c1
--- /dev/null
+++ b/src/ci/docker/test-various/Dockerfile
@@ -0,0 +1,50 @@
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  file \
+  curl \
+  ca-certificates \
+  python \
+  git \
+  cmake \
+  sudo \
+  gdb \
+  xz-utils
+
+# FIXME: build the `ptx-linker` instead.
+RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha.1/rust-ptx-linker.linux64.tar.gz | \
+  tar -xzvC /usr/bin
+
+RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
+  tar -xJ
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+ENV RUST_CONFIGURE_ARGS \
+  --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
+  --set rust.lld
+
+# Some run-make tests have assertions about code size, and enabling debug
+# assertions in libstd causes the binary to be much bigger than it would
+# otherwise normally be. We already test libstd with debug assertions in lots of
+# other contexts as well
+ENV NO_DEBUG_ASSERTIONS=1
+
+ENV WASM_TARGETS=wasm32-unknown-unknown
+ENV WASM_SCRIPT python2.7 /checkout/x.py test --target $WASM_TARGETS \
+  src/test/run-make \
+  src/test/ui \
+  src/test/run-pass \
+  src/test/compile-fail \
+  src/test/mir-opt \
+  src/test/codegen-units \
+  src/libcore
+
+ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
+ENV NVPTX_SCRIPT python2.7 /checkout/x.py test --target $NVPTX_TARGETS \
+  src/test/run-make
+
+ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT
diff --git a/src/ci/docker/wasm32-unknown/Dockerfile b/src/ci/docker/wasm32-unknown/Dockerfile
deleted file mode 100644
index 161f0c0062f..00000000000
--- a/src/ci/docker/wasm32-unknown/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  g++ \
-  make \
-  file \
-  curl \
-  ca-certificates \
-  python \
-  git \
-  cmake \
-  sudo \
-  gdb \
-  xz-utils
-
-RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
-    tar -xJ
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-ENV TARGETS=wasm32-unknown-unknown
-
-ENV RUST_CONFIGURE_ARGS \
-  --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
-  --set rust.lld
-
-# Some run-make tests have assertions about code size, and enabling debug
-# assertions in libstd causes the binary to be much bigger than it would
-# otherwise normally be. We already test libstd with debug assertions in lots of
-# other contexts as well
-ENV NO_DEBUG_ASSERTIONS=1
-
-ENV SCRIPT python2.7 /checkout/x.py test --target $TARGETS \
-  src/test/run-make \
-  src/test/ui \
-  src/test/run-pass \
-  src/test/compile-fail \
-  src/test/mir-opt \
-  src/test/codegen-units \
-  src/libcore \
-- 
cgit 1.4.1-3-g733a5