Auto merge of #109875 - jyn514:no-fulldeps, r=compiler-errors

Move most ui-fulldeps tests to ui/ Same rationale as #109770, they don't actually need a stage 2 build. This increases the limit for the UI directory because otherwise it was annoying to be constantly moving files into subdirectories when I fixed a test; #109873 makes up for it. cc #109770, #109874
rust-lang · Apr 14, 2023 · d558796 · d558796
2 parents 7a78c4f + 88ee6e5
commit d558796
Show file tree

Hide file tree

Showing 29 changed files with 14 additions and 12 deletions.
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
 
 // FIXME: The following limits should be reduced eventually.
 const ENTRY_LIMIT: usize = 885;
-const ROOT_ENTRY_LIMIT: usize = 880;
+const ROOT_ENTRY_LIMIT: usize = 891;
 const ISSUES_ENTRY_LIMIT: usize = 1978;
 
 fn check_entries(tests_path: &Path, bad: &mut bool) {

diff --git a/tests/ui-fulldeps/extern-mod-syntax.rs b/tests/ui-fulldeps/extern-mod-syntax.rs
diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-1.rs → tests/ui/auxiliary/issue-13560-1.rs b/tests/ui-fulldeps/auxiliary/issue-13560-1.rs → tests/ui/auxiliary/issue-13560-1.rs
diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-2.rs → tests/ui/auxiliary/issue-13560-2.rs b/tests/ui-fulldeps/auxiliary/issue-13560-2.rs → tests/ui/auxiliary/issue-13560-2.rs
diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-3.rs → tests/ui/auxiliary/issue-13560-3.rs b/tests/ui-fulldeps/auxiliary/issue-13560-3.rs → tests/ui/auxiliary/issue-13560-3.rs
diff --git a/tests/ui-fulldeps/auxiliary/issue-16822.rs → tests/ui/auxiliary/issue-16822.rs b/tests/ui-fulldeps/auxiliary/issue-16822.rs → tests/ui/auxiliary/issue-16822.rs
diff --git a/tests/ui-fulldeps/auxiliary/issue-18502.rs → tests/ui/auxiliary/issue-18502.rs b/tests/ui-fulldeps/auxiliary/issue-18502.rs → tests/ui/auxiliary/issue-18502.rs
diff --git a/tests/ui-fulldeps/auxiliary/issue-24106.rs → tests/ui/auxiliary/issue-24106.rs b/tests/ui-fulldeps/auxiliary/issue-24106.rs → tests/ui/auxiliary/issue-24106.rs
diff --git a/tests/ui/extern-mod-syntax.rs b/tests/ui/extern-mod-syntax.rs
@@ -0,0 +1,11 @@
+// run-pass
+
+#![allow(unused_imports)]
+#![no_std]
+
+extern crate std;
+use std::ffi::c_void;
+
+pub fn main() {
+    std::println!("Hello world!");
+}
diff --git a/...s/internal-lints/diagnostics_incorrect.rs → ...i/internal-lints/diagnostics_incorrect.rs b/...s/internal-lints/diagnostics_incorrect.rs → ...i/internal-lints/diagnostics_incorrect.rs
diff --git a/...ternal-lints/diagnostics_incorrect.stderr → ...ternal-lints/diagnostics_incorrect.stderr b/...ternal-lints/diagnostics_incorrect.stderr → ...ternal-lints/diagnostics_incorrect.stderr
diff --git a/...ps/internal-lints/existing_doc_keyword.rs → ...ui/internal-lints/existing_doc_keyword.rs b/...ps/internal-lints/existing_doc_keyword.rs → ...ui/internal-lints/existing_doc_keyword.rs
diff --git a/...nternal-lints/existing_doc_keyword.stderr → ...nternal-lints/existing_doc_keyword.stderr b/...nternal-lints/existing_doc_keyword.stderr → ...nternal-lints/existing_doc_keyword.stderr
diff --git a/...ternal-lints/query_stability_incorrect.rs → ...ternal-lints/query_stability_incorrect.rs b/...ternal-lints/query_stability_incorrect.rs → ...ternal-lints/query_stability_incorrect.rs
diff --git a/...al-lints/query_stability_incorrect.stderr → ...al-lints/query_stability_incorrect.stderr b/...al-lints/query_stability_incorrect.stderr → ...al-lints/query_stability_incorrect.stderr
diff --git a/...nternal-lints/rustc_pass_by_value_self.rs → ...nternal-lints/rustc_pass_by_value_self.rs b/...nternal-lints/rustc_pass_by_value_self.rs → ...nternal-lints/rustc_pass_by_value_self.rs
diff --git a/...nal-lints/rustc_pass_by_value_self.stderr → ...nal-lints/rustc_pass_by_value_self.stderr b/...nal-lints/rustc_pass_by_value_self.stderr → ...nal-lints/rustc_pass_by_value_self.stderr
diff --git a/tests/ui-fulldeps/issue-11881.rs → tests/ui/issue-11881.rs b/tests/ui-fulldeps/issue-11881.rs → tests/ui/issue-11881.rs
diff --git a/tests/ui-fulldeps/issue-13560.rs → tests/ui/issue-13560.rs b/tests/ui-fulldeps/issue-13560.rs → tests/ui/issue-13560.rs
@@ -1,4 +1,5 @@
 // run-pass
+// ignore-cross-compile (needs dylibs and compiletest doesn't have a more specific header)
 // aux-build:issue-13560-1.rs
 // aux-build:issue-13560-2.rs
 // aux-build:issue-13560-3.rs

diff --git a/tests/ui-fulldeps/issue-15924.rs → tests/ui/issue-15924.rs b/tests/ui-fulldeps/issue-15924.rs → tests/ui/issue-15924.rs
diff --git a/tests/ui-fulldeps/issue-16822.rs → tests/ui/issue-16822.rs b/tests/ui-fulldeps/issue-16822.rs → tests/ui/issue-16822.rs
diff --git a/tests/ui-fulldeps/issue-18502.rs → tests/ui/issue-18502.rs b/tests/ui-fulldeps/issue-18502.rs → tests/ui/issue-18502.rs
diff --git a/tests/ui-fulldeps/issue-24106.rs → tests/ui/issue-24106.rs b/tests/ui-fulldeps/issue-24106.rs → tests/ui/issue-24106.rs
diff --git a/tests/ui-fulldeps/issue-2804.rs → tests/ui/issue-2804.rs b/tests/ui-fulldeps/issue-2804.rs → tests/ui/issue-2804.rs
diff --git a/tests/ui-fulldeps/myriad-closures.rs → tests/ui/myriad-closures.rs b/tests/ui-fulldeps/myriad-closures.rs → tests/ui/myriad-closures.rs
diff --git a/tests/ui-fulldeps/std/issue-15149.rs → tests/ui/std/issue-15149.rs b/tests/ui-fulldeps/std/issue-15149.rs → tests/ui/std/issue-15149.rs
diff --git a/...s/std/issue-81357-unsound-file-methods.rs → ...i/std/issue-81357-unsound-file-methods.rs b/...s/std/issue-81357-unsound-file-methods.rs → ...i/std/issue-81357-unsound-file-methods.rs
diff --git a/tests/ui-fulldeps/std/stdio-from.rs → tests/ui/std/stdio-from.rs b/tests/ui-fulldeps/std/stdio-from.rs → tests/ui/std/stdio-from.rs
diff --git a/tests/ui-fulldeps/std/switch-stdout.rs → tests/ui/std/switch-stdout.rs b/tests/ui-fulldeps/std/switch-stdout.rs → tests/ui/std/switch-stdout.rs
@@ -1,4 +1,5 @@
 // run-pass
+// ignore-wasm (needs file descriptors and env variables)
 
 use std::env;
 use std::fs::File;