From 025d01432fbdbefe24f7d3b4b487d040732f67fa Mon Sep 17 00:00:00 2001
From: Ariel Ben-Yehuda <ariel.byd@gmail.com>
Date: Sun, 26 Aug 2018 15:13:47 +0300
Subject: [PATCH] use an incremental-fulldeps test instead of a run-make test

---
 .../auxiliary/issue_49482_macro_def.rs}             |  2 ++
 .../auxiliary/issue_49482_reexport.rs}              |  8 ++++----
 .../main.rs => incremental-fulldeps/issue-49482.rs} | 10 +++++++++-
 src/test/run-make-fulldeps/issue-49482/Makefile     | 13 -------------
 4 files changed, 15 insertions(+), 18 deletions(-)
 rename src/test/{run-make-fulldeps/issue-49482/macro_def.rs => incremental-fulldeps/auxiliary/issue_49482_macro_def.rs} (98%)
 rename src/test/{run-make-fulldeps/issue-49482/reexport.rs => incremental-fulldeps/auxiliary/issue_49482_reexport.rs} (84%)
 rename src/test/{run-make-fulldeps/issue-49482/main.rs => incremental-fulldeps/issue-49482.rs} (75%)
 delete mode 100644 src/test/run-make-fulldeps/issue-49482/Makefile

diff --git a/src/test/run-make-fulldeps/issue-49482/macro_def.rs b/src/test/incremental-fulldeps/auxiliary/issue_49482_macro_def.rs
similarity index 98%
rename from src/test/run-make-fulldeps/issue-49482/macro_def.rs
rename to src/test/incremental-fulldeps/auxiliary/issue_49482_macro_def.rs
index 8a9c985a3e41c..763c9eb138e74 100644
--- a/src/test/run-make-fulldeps/issue-49482/macro_def.rs
+++ b/src/test/incremental-fulldeps/auxiliary/issue_49482_macro_def.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-prefer-dynamic
+
 #![crate_type="proc-macro"]
 #![allow(non_snake_case)]
 
diff --git a/src/test/run-make-fulldeps/issue-49482/reexport.rs b/src/test/incremental-fulldeps/auxiliary/issue_49482_reexport.rs
similarity index 84%
rename from src/test/run-make-fulldeps/issue-49482/reexport.rs
rename to src/test/incremental-fulldeps/auxiliary/issue_49482_reexport.rs
index 0a04d5a023f0a..aa9aa3b58b90c 100644
--- a/src/test/run-make-fulldeps/issue-49482/reexport.rs
+++ b/src/test/incremental-fulldeps/auxiliary/issue_49482_reexport.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type="rlib"]
-
 #[macro_use]
-extern crate macro_def;
+extern crate issue_49482_macro_def;
+
+pub use issue_49482_macro_def::*;
 
-pub use macro_def::*;
+pub fn foo() {}
diff --git a/src/test/run-make-fulldeps/issue-49482/main.rs b/src/test/incremental-fulldeps/issue-49482.rs
similarity index 75%
rename from src/test/run-make-fulldeps/issue-49482/main.rs
rename to src/test/incremental-fulldeps/issue-49482.rs
index b4505730920f9..3261b5ae09201 100644
--- a/src/test/run-make-fulldeps/issue-49482/main.rs
+++ b/src/test/incremental-fulldeps/issue-49482.rs
@@ -8,7 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate reexport;
+// aux-build:issue_49482_macro_def.rs
+// aux-build:issue_49482_reexport.rs
+// ignore-stage1
+// revisions: rpass1
+
+extern crate issue_49482_reexport;
 
 pub trait KvStorage
 {
@@ -29,5 +34,8 @@ impl KvStorage for u32 {
 }
 
 fn main() {
+    /* force issue_49482_reexport to be loaded */
+    issue_49482_reexport::foo();
+
     Box::new(2).get();
 }
diff --git a/src/test/run-make-fulldeps/issue-49482/Makefile b/src/test/run-make-fulldeps/issue-49482/Makefile
deleted file mode 100644
index baf66c9f5d6fd..0000000000000
--- a/src/test/run-make-fulldeps/issue-49482/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
--include ../tools.mk
-
-ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
-# ignore stage1
-all:
-
-else
-all:
-	mkdir $(TMPDIR)/incremental-dir
-	$(RUSTC) macro_def.rs
-	$(RUSTC) reexport.rs
-	$(RUSTC) main.rs -C incremental=$(TMPDIR)/incremental-dir
-endif