about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThom Chiovoloni <thom@shift.click>2022-10-31 05:53:54 -0700
committerThom Chiovoloni <thom@shift.click>2022-10-31 05:53:54 -0700
commitbf88755f8892c1e42eccd302ed5b17716f669975 (patch)
treea8e0cb6efcc4b71fde75af33a0ed7becea9dc4c4
parent656b9a48b6ee1c0fc5ff2519bccf6d4a2fe34c3b (diff)
downloadrust-bf88755f8892c1e42eccd302ed5b17716f669975.tar.gz
rust-bf88755f8892c1e42eccd302ed5b17716f669975.zip
Add `ignore-cross-compile` to the `#[bench]` smoketest, and move it back to run-make
-rw-r--r--src/test/run-make/test-benches/Makefile (renamed from src/test/run-make-fulldeps/test-benches/Makefile)4
-rw-r--r--src/test/run-make/test-benches/smokebench.rs (renamed from src/test/run-make-fulldeps/test-benches/smokebench.rs)0
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/test-benches/Makefile b/src/test/run-make/test-benches/Makefile
index a1f0a9510d9..8fc122515d0 100644
--- a/src/test/run-make-fulldeps/test-benches/Makefile
+++ b/src/test/run-make/test-benches/Makefile
@@ -1,4 +1,6 @@
-include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
+
+# ignore-cross-compile
 
 all:
 	# Smoke-test that `#[bench]` isn't entirely broken.
diff --git a/src/test/run-make-fulldeps/test-benches/smokebench.rs b/src/test/run-make/test-benches/smokebench.rs
index ef5e5a62068..ef5e5a62068 100644
--- a/src/test/run-make-fulldeps/test-benches/smokebench.rs
+++ b/src/test/run-make/test-benches/smokebench.rs