about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJonas Schievink <jonasschievink@gmail.com>2020-01-14 00:42:19 +0100
committerJonas Schievink <jonasschievink@gmail.com>2020-01-21 19:01:56 +0100
commitce7172da5142e3914f9461f7e968897959cab338 (patch)
tree9c0764cde62bb2eecdeb60488ac48fe23e7ae30b /src
parentce361fb24f0896bf7d983549117cbe1f70f32dcf (diff)
downloadrust-ce7172da5142e3914f9461f7e968897959cab338.tar.gz
rust-ce7172da5142e3914f9461f7e968897959cab338.zip
Fix thumb target CI
Diffstat (limited to 'src')
-rw-r--r--src/test/run-make/thumb-none-cortex-m/Makefile8
-rw-r--r--src/test/run-make/thumb-none-qemu/Makefile3
2 files changed, 4 insertions, 7 deletions
diff --git a/src/test/run-make/thumb-none-cortex-m/Makefile b/src/test/run-make/thumb-none-cortex-m/Makefile
index 6791c8ccdf1..36e51bcab6d 100644
--- a/src/test/run-make/thumb-none-cortex-m/Makefile
+++ b/src/test/run-make/thumb-none-cortex-m/Makefile
@@ -10,10 +10,7 @@
 # - thumbv7em-none-eabihf (Bare Cortex-M4F, M7F, FPU, hardfloat)
 # - thumbv7m-none-eabi (Bare Cortex-M3)
 
-# only-thumbv6m-none-eabi
-# only-thumbv7em-none-eabi
-# only-thumbv7em-none-eabihf
-# only-thumbv7m-none-eabi
+# only-thumb
 
 # For cargo setting
 RUSTC := $(RUSTC_ORIGINAL)
@@ -27,7 +24,8 @@ CRATE := cortex-m
 CRATE_URL := https://github.com/rust-embedded/cortex-m
 CRATE_SHA1 := a448e9156e2cb1e556e5441fd65426952ef4b927 # 0.5.0
 
-export RUSTFLAGS := --cap-lints=allow
+# Don't make lints fatal, but they need to at least warn or they break Cargo's target info parsing.
+export RUSTFLAGS := --cap-lints=warn
 
 all:
 	env
diff --git a/src/test/run-make/thumb-none-qemu/Makefile b/src/test/run-make/thumb-none-qemu/Makefile
index cb1ff859122..ab8b90e154e 100644
--- a/src/test/run-make/thumb-none-qemu/Makefile
+++ b/src/test/run-make/thumb-none-qemu/Makefile
@@ -1,7 +1,6 @@
 -include ../../run-make-fulldeps/tools.mk
 
-# only-thumbv7m-none-eabi
-# only-thumbv6m-none-eabi
+# only-thumb
 
 # How to run this
 # $ ./x.py clean