Fix rustc test suite

And re-enable a no longer failing test.

Author: bjorn3

scripts/setup_rust_fork.sh

@@ -53,12 +53,13 @@ diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/co
 index a656927b1f6..44fc5546fac 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -2249,13 +2249,6 @@ pub fn parse_download_ci_llvm<'a>(
+@@ -2249,14 +2249,6 @@ pub fn parse_download_ci_llvm<'a>(
                  );
              }
 
--            if b && dwn_ctx.is_running_on_ci {
--                // On CI, we must always rebuild LLVM if there were any modifications to it
+-            #[cfg(not(test))]
+-            if b && 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."
 -                );

scripts/test_rustc_tests.sh

@@ -46,7 +46,9 @@ rm tests/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
 rm tests/ui/abi/variadic-ffi.rs # requires callee side vararg support
 rm -r tests/run-make/c-link-to-rust-va-list-fn # requires callee side vararg support
 rm tests/ui/c-variadic/valid.rs # same
-rm tests/ui/c-variadic/naked.rs # same
+rm tests/ui/c-variadic/trait-method.rs # same
+rm tests/ui/c-variadic/inherent-method.rs # same
+rm tests/ui/c-variadic/same-program-multiple-abis-x86_64.rs # variadics for calling conventions other than C unsupported
 rm tests/ui/delegation/fn-header.rs
 
 # misc unimplemented things
@@ -64,7 +66,6 @@ rm -r tests/run-make/embed-source-dwarf # embedding sources in debuginfo
 rm -r tests/run-make/used-proc-macro # used(linker) isn't supported yet
 rm tests/ui/linking/no-gc-encapsulation-symbols.rs # same
 rm tests/ui/attributes/fn-align-dyn.rs # per-function alignment not supported
-rm tests/ui/c-variadic/same-program-multiple-abis-x86_64.rs # variadics for calling conventions other than C unsupported
 rm -r tests/ui/explicit-tail-calls # tail calls
 
 # requires LTO