Skip to content

Commit

Permalink
Rollup merge of rust-lang#73981 - ehuss:remove-ignore-stage1, r=nikom…
Browse files Browse the repository at this point in the history
…atsakis

Remove some `ignore-stage1` annotations.

These tests appear to no longer need the `ignore-stage1` marker.

- `run-make-fulldeps/issue-37839` and `run-make-fulldeps/issue-37893`: I believe these were due to the use of proc-macros, and probably were just missed in rust-lang#49219 which fixed the proc-macro compatibility.

- `compile-fail/asm-src-loc-codegen-units.rs`: This was due to an old issue with landing pads (as mentioned in the linked issue rust-lang#20184). `-Zno-landing-pads` was an option when building the first stage (it was much faster), but somewhere along the way (I think the switch from makefiles to rustbuild), the option was removed.
  - NOTE: This test doesn't actually test what it was originally written for, and is probably mostly pointless now. This test was asserting the message "build without -C codegen-units for more exact errors", but that was removed in rust-lang#42682. It is now in essence identical to `asm-src-loc.rs`.
  • Loading branch information
Manishearth authored Jul 16, 2020
2 parents 9cdc999 + 9b6b400 commit 7674ed9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions src/test/compile-fail/asm-src-loc-codegen-units.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// WONTFIX(#20184) Needs landing pads (not present in stage1) or the compiler hangs.
// ignore-stage1
// compile-flags: -C codegen-units=2
// ignore-emscripten

Expand Down
2 changes: 0 additions & 2 deletions src/test/run-make-fulldeps/issue-37839/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
-include ../tools.mk

# ignore-stage1

all:
$(RUSTC) a.rs && $(RUSTC) b.rs
$(BARE_RUSTC) c.rs -L dependency=$(TMPDIR) --extern b=$(TMPDIR)/libb.rlib \
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-make-fulldeps/issue-37893/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
-include ../tools.mk

# ignore-stage1

all:
$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs

0 comments on commit 7674ed9

Please sign in to comment.