Skip to content

Commit f429b40

Browse files
committed
Fix running the rustc test suite
1 parent 7e45747 commit f429b40

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

scripts/setup_rust_fork.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,6 @@ index d95b5b7f17f..00b6f0e3635 100644
2626
[dev-dependencies]
2727
rand = "0.7"
2828
rand_xorshift = "0.2"
29-
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
30-
index 887d27fd6dca4..2c2239f2b83d1 100644
31-
--- a/src/tools/compiletest/src/header.rs
32-
+++ b/src/tools/compiletest/src/header.rs
33-
@@ -806,8 +806,8 @@ pub fn make_test_description<R: Read>(
34-
cfg: Option<&str>,
35-
) -> test::TestDesc {
36-
let mut ignore = false;
37-
#[cfg(not(bootstrap))]
38-
- let ignore_message: Option<String> = None;
39-
+ let ignore_message: Option<&str> = None;
40-
let mut should_fail = false;
41-
42-
let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
43-
4429
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
4530
index 8431aa7b818..a3ff7e68ce5 100644
4631
--- a/src/tools/compiletest/src/runtest.rs

scripts/test_rustc_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ rm src/test/incremental/spike-neg1.rs # errors out for some reason
101101
rm src/test/incremental/spike-neg2.rs # same
102102
rm src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs # gives a stackoverflow before the backend runs
103103
rm src/test/ui/mir/ssa-analysis-regression-50041.rs # produces ICE
104+
rm src/test/ui/type-alias-impl-trait/assoc-projection-ice.rs # produces ICE
104105

105106
rm src/test/ui/simd/intrinsic/generic-reduction-pass.rs # simd_reduce_add_unordered doesn't accept an accumulator for integer vectors
106107

0 commit comments

Comments
 (0)