Fix cortex-m-rt compiletest tests

Author: adamgreig

cortex-m-rt/Cargo.toml

@@ -18,16 +18,14 @@ links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
 
 [dependencies]
 cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }
-# Note: Do not depend on `cortex-m` here. This crate is used for testing `cortex-m`, so we need to
-# avoid pulling in multiple versions of `cortex-m`.
 
 [dev-dependencies]
 cortex-m = { version = "0.7.4", path = ".." }
 panic-halt = "0.2.0"
 cortex-m-semihosting = "0.3"
 
 [target.'cfg(not(target_os = "none"))'.dev-dependencies]
-compiletest_rs = "0.4.0"
+compiletest_rs = "0.7"
 
 [[example]]
 name = "device"

cortex-m-rt/tests/compile-fail/non-static-resource.rs

@@ -6,7 +6,6 @@
 #![no_std]
 #![no_main]
 
-extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate panic_halt;
 

cortex-m-rt/tests/compiletest.rs

@@ -7,11 +7,11 @@ fn run_mode(mode: &'static str) {
 
     config.mode = mode.parse().expect("Invalid mode");
     config.src_base = PathBuf::from(format!("tests/{}", mode));
-    // config.link_deps(); // Populate config.target_rustcflags with dependencies on the path
     config.target_rustcflags = Some(
-        "-L target/debug -L target/debug/deps -C panic=abort --cfg feature=\"device\"".to_owned(),
+        "-L ../target/debug -L ../target/debug/deps -C panic=abort --cfg feature=\"device\""
+            .to_owned(),
     );
-    // config.clean_rmeta(); // If your tests import the parent crate, this helps with E0464
+    config.clean_rmeta(); // If your tests import the parent crate, this helps with E0464
 
     compiletest::run_tests(&config);
 }