From cf7f3055e5e2eacffde33fbc06ec0187ff828b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malo=20Jaffr=C3=A9?= <jaffre.malo@gmail.com>
Date: Tue, 8 Aug 2017 16:53:49 +0200
Subject: [PATCH] Ignore tests that fail on stage1

That makes ./x.py test --stage 1 work on x86_64-unknown-linux-gnu.
---
 .../proc-macro/attribute-with-error.rs                     | 1 +
 .../proc-macro/attributes-included.rs                      | 1 +
 src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs    | 1 +
 .../proc-macro/expand-to-unstable-2.rs                     | 1 +
 .../compile-fail-fulldeps/proc-macro/expand-to-unstable.rs | 1 +
 src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs   | 1 +
 src/test/compile-fail-fulldeps/proc-macro/item-error.rs    | 1 +
 .../proc-macro/lints_in_proc_macros.rs                     | 1 +
 .../proc-macro/proc-macro-attributes.rs                    | 1 +
 src/test/run-make/issue-37839/Makefile                     | 6 ++++++
 src/test/run-make/issue-37893/Makefile                     | 6 ++++++
 src/test/run-make/issue-38237/Makefile                     | 6 ++++++
 src/test/run-make/llvm-pass/Makefile                       | 7 +++++++
 src/test/run-make/rustc-macro-dep-files/Makefile           | 6 ++++++
 src/test/run-pass-fulldeps/issue-40663.rs                  | 1 +
 src/test/run-pass-fulldeps/proc-macro/add-impl.rs          | 1 +
 src/test/run-pass-fulldeps/proc-macro/append-impl.rs       | 1 +
 src/test/run-pass-fulldeps/proc-macro/attr-args.rs         | 1 +
 src/test/run-pass-fulldeps/proc-macro/bang-macro.rs        | 1 +
 .../run-pass-fulldeps/proc-macro/count_compound_ops.rs     | 1 +
 src/test/run-pass-fulldeps/proc-macro/crate-var.rs         | 1 +
 .../run-pass-fulldeps/proc-macro/derive-same-struct.rs     | 1 +
 src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs   | 1 +
 src/test/run-pass-fulldeps/proc-macro/issue-39889.rs       | 1 +
 src/test/run-pass-fulldeps/proc-macro/issue-40001.rs       | 1 +
 src/test/run-pass-fulldeps/proc-macro/load-two.rs          | 1 +
 src/test/run-pass-fulldeps/proc-macro/use-reexport.rs      | 1 +
 27 files changed, 53 insertions(+)

diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
index 65f4b6350c4ee..00a27818327f6 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:attribute-with-error.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs b/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs
index 508f8dac57119..0cb4135d953f1 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:attributes-included.rs
+// ignore-stage1
 
 #![feature(proc_macro, rustc_attrs)]
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs
index 42fad803bfa68..b03409c9c285e 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:derive-bad.rs
+// ignore-stage1
 
 #[macro_use]
 extern crate derive_bad;
diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs
index e4fcbb117a505..6f254dcbdb11a 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:derive-unstable-2.rs
+// ignore-stage1
 
 #![allow(warnings)]
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs
index 836e336fc22f0..ca0f0e382ed0c 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:derive-unstable.rs
+// ignore-stage1
 
 #![allow(warnings)]
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs b/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs
index 42475e6de90c9..1d645a7ec510f 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue_38586.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs b/src/test/compile-fail-fulldeps/proc-macro/item-error.rs
index 4133e75e3a62d..c0d4d71a6ec8b 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/item-error.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:derive-b.rs
+// ignore-stage1
 
 #![allow(warnings)]
 
diff --git a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs b/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs
index 93dead1a15685..b1fb7d42d8683 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:bang_proc_macro2.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 #![allow(unused_macros)]
diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs
index df881bedec1bb..153e4dd05717a 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:derive-b.rs
+// ignore-stage1
 
 #![allow(warnings)]
 
diff --git a/src/test/run-make/issue-37839/Makefile b/src/test/run-make/issue-37839/Makefile
index f17ce537fb813..8b3355b96226a 100644
--- a/src/test/run-make/issue-37839/Makefile
+++ b/src/test/run-make/issue-37839/Makefile
@@ -1,6 +1,12 @@
 -include ../tools.mk
 
+ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
+# ignore stage1
+all:
+
+else
 all:
 	$(RUSTC) a.rs && $(RUSTC) b.rs
 	$(BARE_RUSTC) c.rs -L dependency=$(TMPDIR) --extern b=$(TMPDIR)/libb.rlib \
 		--out-dir=$(TMPDIR)
+endif
diff --git a/src/test/run-make/issue-37893/Makefile b/src/test/run-make/issue-37893/Makefile
index 27b69baf97787..c7732cc2682b1 100644
--- a/src/test/run-make/issue-37893/Makefile
+++ b/src/test/run-make/issue-37893/Makefile
@@ -1,4 +1,10 @@
 -include ../tools.mk
 
+ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
+# ignore stage1
+all:
+
+else
 all:
 	$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs
+endif
diff --git a/src/test/run-make/issue-38237/Makefile b/src/test/run-make/issue-38237/Makefile
index 0a681401b1afb..855d958b344a9 100644
--- a/src/test/run-make/issue-38237/Makefile
+++ b/src/test/run-make/issue-38237/Makefile
@@ -1,5 +1,11 @@
 -include ../tools.mk
 
+ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
+# ignore stage1
+all:
+
+else
 all:
 	$(RUSTC) foo.rs; $(RUSTC) bar.rs
 	$(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR)
+endif
diff --git a/src/test/run-make/llvm-pass/Makefile b/src/test/run-make/llvm-pass/Makefile
index aab6e895f2260..0d31d2c823500 100644
--- a/src/test/run-make/llvm-pass/Makefile
+++ b/src/test/run-make/llvm-pass/Makefile
@@ -1,5 +1,10 @@
 -include ../tools.mk
 
+ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
+# ignore stage1
+all:
+
+else
 # Windows doesn't correctly handle include statements with escaping paths,
 # so this test will not get run on Windows.
 ifdef IS_WINDOWS
@@ -15,3 +20,5 @@ $(TMPDIR)/libllvm-function-pass.o:
 $(TMPDIR)/libllvm-module-pass.o:
 	$(CXX) $(CFLAGS) $(LLVM_CXXFLAGS) -c llvm-module-pass.so.cc -o $(TMPDIR)/libllvm-module-pass.o
 endif
+
+endif
diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/src/test/run-make/rustc-macro-dep-files/Makefile
index e3a6776c8080b..1ab27397e3146 100644
--- a/src/test/run-make/rustc-macro-dep-files/Makefile
+++ b/src/test/run-make/rustc-macro-dep-files/Makefile
@@ -1,6 +1,12 @@
 -include ../tools.mk
 
+ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
+# ignore stage1
+all:
+
+else
 all:
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs --emit dep-info
 	grep "proc-macro source" $(TMPDIR)/bar.d && exit 1 || exit 0
+endif
diff --git a/src/test/run-pass-fulldeps/issue-40663.rs b/src/test/run-pass-fulldeps/issue-40663.rs
index d030eab64e564..8cb9dc4a1b6ec 100644
--- a/src/test/run-pass-fulldeps/issue-40663.rs
+++ b/src/test/run-pass-fulldeps/issue-40663.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:custom_derive_plugin.rs
+// ignore-stage1
 
 #![feature(plugin, custom_derive)]
 #![plugin(custom_derive_plugin)]
diff --git a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs
index 7ea7ceafc2876..5175fe174a9e7 100644
--- a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:add-impl.rs
+// ignore-stage1
 
 #[macro_use]
 extern crate add_impl;
diff --git a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs
index 591f3331d28c0..37aef7ef1318c 100644
--- a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:append-impl.rs
+// ignore-stage1
 
 #![allow(warnings)]
 
diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs b/src/test/run-pass-fulldeps/proc-macro/attr-args.rs
index 8a9fdd7536770..2968cc7871d7e 100644
--- a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/attr-args.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:attr-args.rs
+// ignore-stage1
 
 #![allow(warnings)]
 #![feature(proc_macro)]
diff --git a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs b/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs
index 531bd0dd3569d..ffa4731f1e637 100644
--- a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:bang-macro.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 
diff --git a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs b/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs
index 1a2b144e4717b..00ad0e76ed014 100644
--- a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:count_compound_ops.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 
diff --git a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs b/src/test/run-pass-fulldeps/proc-macro/crate-var.rs
index ba1417ecb56e4..b6acb0faab2a5 100644
--- a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/crate-var.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:double.rs
+// ignore-stage1
 
 #![allow(unused)]
 
diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs
index ce3ba60b0ecf4..ba5a639a759cb 100644
--- a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:derive-same-struct.rs
+// ignore-stage1
 
 #[macro_use]
 extern crate derive_same_struct;
diff --git a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs b/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs
index 51198db5aa76d..4cac7d19b4de8 100644
--- a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs
@@ -10,6 +10,7 @@
 
 // aux-build:hygiene_example_codegen.rs
 // aux-build:hygiene_example.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 
diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs b/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs
index 05610116ad6bf..87130242c0f04 100644
--- a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-39889.rs
+// ignore-stage1
 
 #![feature(proc_macro)]
 #![allow(unused)]
diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs b/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs
index 54e84b7f6189f..b7826edd8b4e5 100644
--- a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-40001-plugin.rs
+// ignore-stage1
 
 #![feature(proc_macro, plugin)]
 #![plugin(issue_40001_plugin)]
diff --git a/src/test/run-pass-fulldeps/proc-macro/load-two.rs b/src/test/run-pass-fulldeps/proc-macro/load-two.rs
index d15a83a2cbe43..67c1237781470 100644
--- a/src/test/run-pass-fulldeps/proc-macro/load-two.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/load-two.rs
@@ -10,6 +10,7 @@
 
 // aux-build:derive-atob.rs
 // aux-build:derive-ctod.rs
+// ignore-stage1
 
 #[macro_use]
 extern crate derive_atob;
diff --git a/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs b/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs
index f0a1bfe652857..03dfeb1f5c9a5 100644
--- a/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs
@@ -10,6 +10,7 @@
 
 // aux-build:derive-a.rs
 // aux-build:derive-reexport.rs
+// ignore-stage1
 
 #[macro_use]
 extern crate derive_reexport;