about summary refs log tree commit diff
path: root/scripts/setup_rust_fork.sh
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2022-04-27 14:09:41 +0200
committerbjorn3 <bjorn3@users.noreply.github.com>2022-04-27 14:09:41 +0200
commitf429b4093f905ff2239889daec21433deb198250 (patch)
tree76ab0c05b3fed6c98f7cd564fc164ff619d50f15 /scripts/setup_rust_fork.sh
parent7e45747a3d7c0877da20a9931cffc50e1b6d6aa4 (diff)
downloadrust-f429b4093f905ff2239889daec21433deb198250.tar.gz
rust-f429b4093f905ff2239889daec21433deb198250.zip
Fix running the rustc test suite
Diffstat (limited to 'scripts/setup_rust_fork.sh')
-rw-r--r--scripts/setup_rust_fork.sh15
1 files changed, 0 insertions, 15 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh
index cabbaaa8922..fa71dfeac07 100644
--- a/scripts/setup_rust_fork.sh
+++ b/scripts/setup_rust_fork.sh
@@ -26,21 +26,6 @@ index d95b5b7f17f..00b6f0e3635 100644
  [dev-dependencies]
  rand = "0.7"
  rand_xorshift = "0.2"
-diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
-index 887d27fd6dca4..2c2239f2b83d1 100644
---- a/src/tools/compiletest/src/header.rs
-+++ b/src/tools/compiletest/src/header.rs
-@@ -806,8 +806,8 @@ pub fn make_test_description<R: Read>(
-     cfg: Option<&str>,
- ) -> test::TestDesc {
-     let mut ignore = false;
-     #[cfg(not(bootstrap))]
--    let ignore_message: Option<String> = None;
-+    let ignore_message: Option<&str> = None;
-     let mut should_fail = false;
-
-     let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
-
 diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
 index 8431aa7b818..a3ff7e68ce5 100644
 --- a/src/tools/compiletest/src/runtest.rs