about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-01-24 15:48:46 +0000
committerbors <bors@rust-lang.org>2019-01-24 15:48:46 +0000
commit01f8e25b15f4ab157c8e7c9c56054df7595ec0e1 (patch)
tree5c4eeb98011f8ae07b45521ea85759e8a168bc22 /src/bootstrap
parent095b44c83b540bb4dbf74be1cae604f4bae87989 (diff)
parentdb97c48ad6e7f36468b152e9b08efc6f2f7da691 (diff)
downloadrust-01f8e25b15f4ab157c8e7c9c56054df7595ec0e1.tar.gz
rust-01f8e25b15f4ab157c8e7c9c56054df7595ec0e1.zip
Auto merge of #51285 - Mark-Simulacrum:remove-quote_apis, r=Manishearth
Remove quote_*! macros

This deletes a considerable amount of test cases, some of which we may want to keep. I'm not entirely certain what the primary intent of many of them was; if we should keep them I can attempt to edit each case to continue compiling without the quote_*! macros involved.

Fixes #46849.
Fixes #12265.
Fixes #12266.
Fixes #26994.

r? @Manishearth
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs3
-rw-r--r--src/bootstrap/mk/Makefile.in1
-rw-r--r--src/bootstrap/test.rs20
3 files changed, 0 insertions, 24 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 31adab64f60..c3dc9458839 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -378,14 +378,11 @@ impl<'a> Builder<'a> {
                 test::Debuginfo,
                 test::UiFullDeps,
                 test::RunPassFullDeps,
-                test::RunFailFullDeps,
                 test::Rustdoc,
                 test::Pretty,
                 test::RunPassPretty,
                 test::RunFailPretty,
                 test::RunPassValgrindPretty,
-                test::RunPassFullDepsPretty,
-                test::RunFailFullDepsPretty,
                 test::Crate,
                 test::CrateLibrustc,
                 test::CrateRustdoc,
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 8ff1456f0f4..1c27cf3909b 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -53,7 +53,6 @@ check-aux:
 		src/test/run-fail/pretty \
 		src/test/run-pass-valgrind/pretty \
 		src/test/run-pass-fulldeps/pretty \
-		src/test/run-fail-fulldeps/pretty \
 		$(AUX_ARGS) \
 		$(BOOTSTRAP_ARGS)
 check-bootstrap:
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 2edc78ebaa9..216649808e2 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -848,12 +848,6 @@ host_test!(RunPassFullDeps {
     suite: "run-pass-fulldeps"
 });
 
-host_test!(RunFailFullDeps {
-    path: "src/test/run-fail-fulldeps",
-    mode: "run-fail",
-    suite: "run-fail-fulldeps"
-});
-
 host_test!(Rustdoc {
     path: "src/test/rustdoc",
     mode: "rustdoc",
@@ -888,20 +882,6 @@ test!(RunPassValgrindPretty {
     default: false,
     host: true
 });
-test!(RunPassFullDepsPretty {
-    path: "src/test/run-pass-fulldeps/pretty",
-    mode: "pretty",
-    suite: "run-pass-fulldeps",
-    default: false,
-    host: true
-});
-test!(RunFailFullDepsPretty {
-    path: "src/test/run-fail-fulldeps/pretty",
-    mode: "pretty",
-    suite: "run-fail-fulldeps",
-    default: false,
-    host: true
-});
 
 default_test!(RunMake {
     path: "src/test/run-make",