Rollup merge of rust-lang#68194 - jonas-schievink:fix-thumb-ci, r=ale…

…xcrichton

Fix CI for embedded ARM targets

Closes rust-lang#67018

It would be better to move the `thumb-none-cortex-m` test into the `cargotest` suite, but it doesn't seem to support cross-compilation.

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

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

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);