From b5214917b7b225e12289b81d8cb305fee4e51177 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Tue, 14 Jan 2020 00:42:19 +0100
Subject: [PATCH 1/2] Fix thumb target CI

---
 src/test/run-make/thumb-none-cortex-m/Makefile | 8 +++-----
 src/test/run-make/thumb-none-qemu/Makefile     | 3 +--
 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 6791c8ccdf138..36e51bcab6de2 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 cb1ff8591221e..ab8b90e154eab 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

From f37601a72ef2433bee7c3ad0309643a4b7d303e5 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Tue, 14 Jan 2020 00:56:11 +0100
Subject: [PATCH 2/2] Account for run-make tests in `is_up_to_date`

---
 src/tools/compiletest/src/main.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index efa9d05f16c38..1f0b42d1786c1 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -624,7 +624,8 @@ fn is_up_to_date(
 
     // Check timestamps.
     let mut inputs = inputs.clone();
-    inputs.add_path(&testpaths.file);
+    // Use `add_dir` to account for run-make tests, which use their individual directory
+    inputs.add_dir(&testpaths.file);
 
     for aux in &props.aux {
         let path = testpaths.file.parent().unwrap().join("auxiliary").join(aux);