Skip to content

Commit 2ad3baa

Browse files
Rollup merge of rust-lang#43744 - MaloJaffre:stage1-test, r=Mark-Simulacrum
Ignore tests that fail on stage1 That makes `./x.py test --stage 1` work on `x86_64-unknown-linux-gnu`.
2 parents 18238c7 + cf7f305 commit 2ad3baa

27 files changed

+53
-0
lines changed

src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:attribute-with-error.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro)]
1415

src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:attributes-included.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro, rustc_attrs)]
1415
#![warn(unused)]

src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:derive-bad.rs
12+
// ignore-stage1
1213

1314
#[macro_use]
1415
extern crate derive_bad;

src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:derive-unstable-2.rs
12+
// ignore-stage1
1213

1314
#![allow(warnings)]
1415

src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:derive-unstable.rs
12+
// ignore-stage1
1213

1314
#![allow(warnings)]
1415

src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue_38586.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro)]
1415

src/test/compile-fail-fulldeps/proc-macro/item-error.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:derive-b.rs
12+
// ignore-stage1
1213

1314
#![allow(warnings)]
1415

src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:bang_proc_macro2.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro)]
1415
#![allow(unused_macros)]

src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:derive-b.rs
12+
// ignore-stage1
1213

1314
#![allow(warnings)]
1415

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
-include ../tools.mk
22

3+
ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
4+
# ignore stage1
5+
all:
6+
7+
else
38
all:
49
$(RUSTC) a.rs && $(RUSTC) b.rs
510
$(BARE_RUSTC) c.rs -L dependency=$(TMPDIR) --extern b=$(TMPDIR)/libb.rlib \
611
--out-dir=$(TMPDIR)
12+
endif
+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
-include ../tools.mk
22

3+
ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
4+
# ignore stage1
5+
all:
6+
7+
else
38
all:
49
$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs
10+
endif
+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
-include ../tools.mk
22

3+
ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
4+
# ignore stage1
5+
all:
6+
7+
else
38
all:
49
$(RUSTC) foo.rs; $(RUSTC) bar.rs
510
$(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR)
11+
endif

src/test/run-make/llvm-pass/Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
-include ../tools.mk
22

3+
ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
4+
# ignore stage1
5+
all:
6+
7+
else
38
# Windows doesn't correctly handle include statements with escaping paths,
49
# so this test will not get run on Windows.
510
ifdef IS_WINDOWS
@@ -15,3 +20,5 @@ $(TMPDIR)/libllvm-function-pass.o:
1520
$(TMPDIR)/libllvm-module-pass.o:
1621
$(CXX) $(CFLAGS) $(LLVM_CXXFLAGS) -c llvm-module-pass.so.cc -o $(TMPDIR)/libllvm-module-pass.o
1722
endif
23+
24+
endif
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
-include ../tools.mk
22

3+
ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1)
4+
# ignore stage1
5+
all:
6+
7+
else
38
all:
49
$(RUSTC) foo.rs
510
$(RUSTC) bar.rs --emit dep-info
611
grep "proc-macro source" $(TMPDIR)/bar.d && exit 1 || exit 0
12+
endif

src/test/run-pass-fulldeps/issue-40663.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:custom_derive_plugin.rs
12+
// ignore-stage1
1213

1314
#![feature(plugin, custom_derive)]
1415
#![plugin(custom_derive_plugin)]

src/test/run-pass-fulldeps/proc-macro/add-impl.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:add-impl.rs
12+
// ignore-stage1
1213

1314
#[macro_use]
1415
extern crate add_impl;

src/test/run-pass-fulldeps/proc-macro/append-impl.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:append-impl.rs
12+
// ignore-stage1
1213

1314
#![allow(warnings)]
1415

src/test/run-pass-fulldeps/proc-macro/attr-args.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:attr-args.rs
12+
// ignore-stage1
1213

1314
#![allow(warnings)]
1415
#![feature(proc_macro)]

src/test/run-pass-fulldeps/proc-macro/bang-macro.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:bang-macro.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro)]
1415

src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:count_compound_ops.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro)]
1415

src/test/run-pass-fulldeps/proc-macro/crate-var.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:double.rs
12+
// ignore-stage1
1213

1314
#![allow(unused)]
1415

src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:derive-same-struct.rs
12+
// ignore-stage1
1213

1314
#[macro_use]
1415
extern crate derive_same_struct;

src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// aux-build:hygiene_example_codegen.rs
1212
// aux-build:hygiene_example.rs
13+
// ignore-stage1
1314

1415
#![feature(proc_macro)]
1516

src/test/run-pass-fulldeps/proc-macro/issue-39889.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-39889.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro)]
1415
#![allow(unused)]

src/test/run-pass-fulldeps/proc-macro/issue-40001.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-40001-plugin.rs
12+
// ignore-stage1
1213

1314
#![feature(proc_macro, plugin)]
1415
#![plugin(issue_40001_plugin)]

src/test/run-pass-fulldeps/proc-macro/load-two.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// aux-build:derive-atob.rs
1212
// aux-build:derive-ctod.rs
13+
// ignore-stage1
1314

1415
#[macro_use]
1516
extern crate derive_atob;

src/test/run-pass-fulldeps/proc-macro/use-reexport.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// aux-build:derive-a.rs
1212
// aux-build:derive-reexport.rs
13+
// ignore-stage1
1314

1415
#[macro_use]
1516
extern crate derive_reexport;

0 commit comments

Comments
 (0)