Fix rustc test suite

Author: bjorn3

scripts/setup_rust_fork.sh

@@ -63,18 +63,18 @@ index 2e16f2cf27..3ac3df99a8 100644
          # Note that RUSTFLAGS_BOOTSTRAP should always be added to the end of
          # RUSTFLAGS, since that causes RUSTFLAGS_BOOTSTRAP to override RUSTFLAGS.
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index a656927b1f6..44fc5546fac 100644
+index bc68bfe396..00143ef3ed 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -2249,7 +2249,7 @@ pub fn parse_download_ci_llvm<'a>(
-             }
+@@ -2230,7 +2230,7 @@ pub fn download_ci_rustc_commit<'a>(
+                     return None;
+                 }
 
-             #[cfg(not(test))]
--            if b && dwn_ctx.is_running_on_ci && CiEnv::is_rust_lang_managed_ci_job() {
-+            if false && dwn_ctx.is_running_on_ci && CiEnv::is_rust_lang_managed_ci_job() {
-                 // On rust-lang CI, we must always rebuild LLVM if there were any modifications to it
-                 panic!(
-                     "\`llvm.download-ci-llvm\` cannot be set to \`true\` on CI. Use \`if-unchanged\` instead."
+-                if dwn_ctx.is_running_on_ci() {
++                if false && dwn_ctx.is_running_on_ci() {
+                     eprintln!("CI rustc commit matches with HEAD and we are in CI.");
+                     eprintln!(
+                         "\`rustc.download-ci\` functionality will be skipped as artifacts are not available."
 diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs
 index 330fb465de..a4593ed96f 100644
 --- a/src/build_helper/src/git.rs

scripts/test_rustc_tests.sh

@@ -20,7 +20,6 @@ for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|//@ error-pa
 done
 
 git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
-git checkout -- tests/ui/proc-macro/pretty-print-hack/
 git checkout -- tests/ui/entry-point/auxiliary/bad_main_functions.rs
 
 # missing features