Skip to content

Commit

Permalink
Rollup merge of rust-lang#62317 - JohnTitor:move-tests-to-build-pass,…
Browse files Browse the repository at this point in the history
… r=Centril

Migrate `compile-pass` annotations to `build-pass`

This is a part of rust-lang#62277.

As a first step, the `compile-pass` tests are migrated to `build-pass`.

r? @cramertj
cc @Centril
  • Loading branch information
Centril authored Jul 3, 2019
2 parents 1fd388b + c004451 commit da52d46
Show file tree
Hide file tree
Showing 711 changed files with 716 additions and 716 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// aux-build:point.rs
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/change_add_field/struct_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/change_crate_dep_kind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph -Cpanic=unwind
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(panic_unwind)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/change_private_fn/struct_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/change_private_fn_cc/struct_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// aux-build:point.rs
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![crate_type = "rlib"]
#![feature(rustc_attrs)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// aux-build:point.rs
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![crate_type = "rlib"]
#![feature(rustc_attrs)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![crate_type = "rlib"]
#![feature(rustc_attrs)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![crate_type = "rlib"]
#![feature(rustc_attrs)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/call_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/closure_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/consts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/enum_constructors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/enum_defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// results in a change of the ICH for the enum's metadata, and that it stays
// the same between rev2 and rev3.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/exported_vs_not.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/extern_mods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/for_loops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/function_interfaces.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/if_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/indexing_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/inherent_impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/inline_asm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/let_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/loop_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/match_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/panic_exprs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -C debug-assertions

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/statics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/struct_constructors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/struct_defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// results in a change of the ICH for the struct's metadata, and that it stays
// the same between rev2 and rev3.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/trait_defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// results in a change of the ICH for the trait's metadata, and that it stays
// the same between rev2 and rev3.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/trait_impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/type_defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// results in a change of the ICH for the enum's metadata, and that it stays
// the same between rev2 and rev3.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/unary_and_binary_exprs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/while_let_loops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/while_loops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// and make sure that the hash has changed, then change nothing between rev2 and
// rev3 and make sure that the hash has not changed.

// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -Zincremental-ignore-spans

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/ich_nested_items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// the nested items (or even added new ones).

// revisions: cfail1 cfail2
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![crate_type = "rlib"]
#![feature(rustc_attrs)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/incremental_proc_macro.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// aux-build:incremental_proc_macro_aux.rs
// revisions: cfail1 cfail2
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

// This test makes sure that we still find the proc-macro registrar function
// when we compile proc-macros incrementally (see #47292).
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/issue-42602.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

// revisions:cfail1 cfail2 cfail3
// compile-flags:-Zquery-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/issue-49595/issue-49595.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// revisions:cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph --test
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]
#![crate_type = "rlib"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// subsequent runs) if incremental compilation is enabled.

// revisions: cfail1 cfail2
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(on_unimplemented)]
#![deny(unused_attributes)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// enabled.

// revisions: cfail1 cfail2
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![feature(rustc_attrs)]
#![deny(unused_attributes)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/krate-inherent.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// revisions: cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![allow(warnings)]
#![feature(rustc_attrs)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/macro_export.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// revisions: cfail1 cfail2 cfail3
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

// This test case makes sure that we can compile with incremental compilation
// enabled when there are macros exported from this crate. (See #37756)
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/remove_source_file/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Note that we specify -g so that the SourceFiles actually get referenced by the
// incr. comp. cache:
// compile-flags: -Z query-dep-graph -g
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![crate_type= "rlib"]

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/string_constant.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// revisions: cfail1 cfail2
// compile-flags: -Z query-dep-graph
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)

#![allow(warnings)]
#![feature(rustc_attrs)]
Expand Down
Loading

0 comments on commit da52d46

Please sign in to comment.