about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorTom Eccles <tom.eccles@codethink.co.uk>2021-03-16 18:22:21 +0000
committerTom Eccles <tom.eccles@codethink.co.uk>2021-03-28 16:50:56 +0100
commit1fa48cf181f1fe7e1aba133be199804c652fe55c (patch)
treece3648a77e53e544630e85366733d644d9286cc9 /src
parente7505fb7454d946fd307b57e4cb0d45f8e50fdba (diff)
downloadrust-1fa48cf181f1fe7e1aba133be199804c652fe55c.tar.gz
rust-1fa48cf181f1fe7e1aba133be199804c652fe55c.zip
test: run-make: skip tests on unsupported platforms
The tests issue-36710 and incr-prev-body-beyond-eof were changed in a
previous commit so that the correct target was passed to rustc
(previously rustc was building for the host not for the specific
target).

Since that change it turns out that these platforms never worked (they
only appeared to work because rustc was actually building for the host
architecture).

The wasm architectures fall over trying to build the C++ file in
issue-36710. They look for clang (which isn't installed in the
test-various docker container). If clang is installed, they can't find
a wasm c++ standard library to link to.

nvtptx64-nvidia-cuda fails in rustc saying it can't find std. The rust
platforms support page says that std is supported on cuda so this is
surprising.

dist-i586-gnu-i586-i686-musl can't find the C++ compiler. There is only
a musl-gcc and no musl-g++ in /musl-i586/bin/. The Docker image probably
needs tweaking.
Diffstat (limited to 'src')
-rw-r--r--src/test/run-make/incr-prev-body-beyond-eof/Makefile1
-rw-r--r--src/test/run-make/issue-36710/Makefile5
-rw-r--r--src/test/run-make/issue-83112-incr-test-moved-file/Makefile1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/test/run-make/incr-prev-body-beyond-eof/Makefile b/src/test/run-make/incr-prev-body-beyond-eof/Makefile
index c57ce9c53e7..24eea3acaea 100644
--- a/src/test/run-make/incr-prev-body-beyond-eof/Makefile
+++ b/src/test/run-make/incr-prev-body-beyond-eof/Makefile
@@ -1,4 +1,5 @@
 # ignore-none no-std is not supported
+# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std`
 
 include ../../run-make-fulldeps/tools.mk
 
diff --git a/src/test/run-make/issue-36710/Makefile b/src/test/run-make/issue-36710/Makefile
index 7014b763ae3..b5270ad2ba9 100644
--- a/src/test/run-make/issue-36710/Makefile
+++ b/src/test/run-make/issue-36710/Makefile
@@ -2,6 +2,11 @@
 #                              so it won't work with remote-test-server
 # ignore-arm Another build using remote-test-server
 # ignore-none no-std is not supported
+# ignore-wasm32 FIXME: don't attempt to compile C++ to WASM
+# ignore-wasm64 FIXME: don't attempt to compile C++ to WASM
+# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std`
+# ignore-musl FIXME: this makefile needs teaching how to use a musl toolchain
+#                    (see dist-i586-gnu-i586-i686-musl Dockerfile)
 
 include ../../run-make-fulldeps/tools.mk
 
diff --git a/src/test/run-make/issue-83112-incr-test-moved-file/Makefile b/src/test/run-make/issue-83112-incr-test-moved-file/Makefile
index 30bb259ef6d..2f796e5b2fc 100644
--- a/src/test/run-make/issue-83112-incr-test-moved-file/Makefile
+++ b/src/test/run-make/issue-83112-incr-test-moved-file/Makefile
@@ -1,6 +1,7 @@
 include ../../run-make-fulldeps/tools.mk
 
 # ignore-none no-std is not supported
+# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'
 
 # Regression test for issue #83112
 # The generated test harness code contains spans with a dummy location,