From bfdd2d4177391312022b48a328ff4f177769055c Mon Sep 17 00:00:00 2001
From: Josh Driver <keeperofdakeys@gmail.com>
Date: Tue, 22 Nov 2016 00:02:58 +1030
Subject: [PATCH] Allow --test to be used on proc-macro crates

---
 src/libsyntax_ext/proc_macro_registrar.rs          |  6 ++++--
 .../proc-macro/derive-test.rs}                     | 14 +++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)
 rename src/test/{compile-fail-fulldeps/proc-macro/error-on-test.rs => run-pass-fulldeps/proc-macro/derive-test.rs} (74%)

diff --git a/src/libsyntax_ext/proc_macro_registrar.rs b/src/libsyntax_ext/proc_macro_registrar.rs
index bbdbda701ae8e..6256440bc815e 100644
--- a/src/libsyntax_ext/proc_macro_registrar.rs
+++ b/src/libsyntax_ext/proc_macro_registrar.rs
@@ -75,6 +75,10 @@ pub fn modify(sess: &ParseSess,
         handler.err("cannot mix `proc-macro` crate type with others");
     }
 
+    if is_test_crate {
+        return krate;
+    }
+
     krate.module.items.push(mk_registrar(&mut cx, &collect.derives));
 
     if krate.exported_macros.len() > 0 {
@@ -141,8 +145,6 @@ impl<'a> Visitor for CollectCustomDerives<'a> {
         }
 
         if self.is_test_crate {
-            self.handler.span_err(attr.span(),
-                                  "`--test` cannot be used with proc-macro crates");
             return;
         }
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/error-on-test.rs b/src/test/run-pass-fulldeps/proc-macro/derive-test.rs
similarity index 74%
rename from src/test/compile-fail-fulldeps/proc-macro/error-on-test.rs
rename to src/test/run-pass-fulldeps/proc-macro/derive-test.rs
index 4751679ddb8cf..2f44515a873de 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/error-on-test.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/derive-test.rs
@@ -8,15 +8,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-prefer-dynamic
 // compile-flags: --test
 
 #![crate_type = "proc-macro"]
+#![feature(proc_macro)]
 #![feature(proc_macro, proc_macro_lib)]
 
 extern crate proc_macro;
 
-#[proc_macro_derive(A)]
-//~^ ERROR: `--test` cannot be used with proc-macro crates
-pub fn foo1(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+use proc_macro::TokenStream;
+
+#[proc_macro_derive(Foo)]
+pub fn derive_foo(_input: TokenStream) -> TokenStream {
     "".parse().unwrap()
 }
+
+#[test]
+pub fn test_derive() {
+    assert!(true);
+}