about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-01-11 04:50:49 +0900
committerGitHub <noreply@github.com>2020-01-11 04:50:49 +0900
commita74c790758404f654db98a19065f0cbdbf16e7b8 (patch)
treea9109b4d6fcaeb9905f0e6e2cabb1f6baf69a173 /src/tools/compiletest
parenta491100aa3e6d3dbc1f4633e446617ab31b18688 (diff)
parent686d5f83efcd552465ce4ab236f2ffb66c055d90 (diff)
downloadrust-a74c790758404f654db98a19065f0cbdbf16e7b8.tar.gz
rust-a74c790758404f654db98a19065f0cbdbf16e7b8.zip
Rollup merge of #68019 - cuviper:in-tree-compiletest, r=Mark-Simulacrum
Build compiletest with in-tree libtest

This updates compiletest to build in `Mode::ToolStd`, using the locally-built crates for `std` and especially `test`. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes #59264.

As a minor cleanup, this also removes the unused `llvm_tools` flag.
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/main.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index da1e3760e01..0642823404a 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -1,6 +1,8 @@
 #![crate_name = "compiletest"]
-#![feature(test)]
 #![deny(warnings)]
+// The `test` crate is the only unstable feature
+// allowed here, just to share similar code.
+#![feature(test)]
 
 extern crate test;