From 2ffb0de8cfda57cafdfd71a690f14c2e17216d85 Mon Sep 17 00:00:00 2001 From: jyn Date: Sun, 2 Apr 2023 18:09:11 -0400 Subject: [PATCH 1/2] Move most ui-fulldeps tests to ui They pass fine. Only tests that required `extern crate rustc_*` or were marked `ignore-stage1` have been keep in fulldeps. --- src/tools/tidy/src/ui_tests.rs | 2 +- tests/{ui-fulldeps => ui}/auxiliary/issue-13560-1.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-13560-2.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-13560-3.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-16822.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-18502.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-24106.rs | 0 tests/{ui-fulldeps => ui}/extern-mod-syntax.rs | 0 .../{ui-fulldeps => ui}/internal-lints/diagnostics_incorrect.rs | 0 .../internal-lints/diagnostics_incorrect.stderr | 0 .../{ui-fulldeps => ui}/internal-lints/existing_doc_keyword.rs | 0 .../internal-lints/existing_doc_keyword.stderr | 0 .../internal-lints/query_stability_incorrect.rs | 0 .../internal-lints/query_stability_incorrect.stderr | 0 .../internal-lints/rustc_pass_by_value_self.rs | 0 .../internal-lints/rustc_pass_by_value_self.stderr | 0 tests/{ui-fulldeps => ui}/issue-11881.rs | 0 tests/{ui-fulldeps => ui}/issue-13560.rs | 0 tests/{ui-fulldeps => ui}/issue-15924.rs | 0 tests/{ui-fulldeps => ui}/issue-16822.rs | 0 tests/{ui-fulldeps => ui}/issue-18502.rs | 0 tests/{ui-fulldeps => ui}/issue-24106.rs | 0 tests/{ui-fulldeps => ui}/issue-2804.rs | 0 tests/{ui-fulldeps => ui}/myriad-closures.rs | 0 tests/{ui-fulldeps => ui}/std/issue-15149.rs | 0 .../{ui-fulldeps => ui}/std/issue-81357-unsound-file-methods.rs | 0 tests/{ui-fulldeps => ui}/std/stdio-from.rs | 0 tests/{ui-fulldeps => ui}/std/switch-stdout.rs | 0 28 files changed, 1 insertion(+), 1 deletion(-) rename tests/{ui-fulldeps => ui}/auxiliary/issue-13560-1.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-13560-2.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-13560-3.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-16822.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-18502.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-24106.rs (100%) rename tests/{ui-fulldeps => ui}/extern-mod-syntax.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/diagnostics_incorrect.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/diagnostics_incorrect.stderr (100%) rename tests/{ui-fulldeps => ui}/internal-lints/existing_doc_keyword.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/existing_doc_keyword.stderr (100%) rename tests/{ui-fulldeps => ui}/internal-lints/query_stability_incorrect.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/query_stability_incorrect.stderr (100%) rename tests/{ui-fulldeps => ui}/internal-lints/rustc_pass_by_value_self.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/rustc_pass_by_value_self.stderr (100%) rename tests/{ui-fulldeps => ui}/issue-11881.rs (100%) rename tests/{ui-fulldeps => ui}/issue-13560.rs (100%) rename tests/{ui-fulldeps => ui}/issue-15924.rs (100%) rename tests/{ui-fulldeps => ui}/issue-16822.rs (100%) rename tests/{ui-fulldeps => ui}/issue-18502.rs (100%) rename tests/{ui-fulldeps => ui}/issue-24106.rs (100%) rename tests/{ui-fulldeps => ui}/issue-2804.rs (100%) rename tests/{ui-fulldeps => ui}/myriad-closures.rs (100%) rename tests/{ui-fulldeps => ui}/std/issue-15149.rs (100%) rename tests/{ui-fulldeps => ui}/std/issue-81357-unsound-file-methods.rs (100%) rename tests/{ui-fulldeps => ui}/std/stdio-from.rs (100%) rename tests/{ui-fulldeps => ui}/std/switch-stdout.rs (100%) diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 7b7ee62a2474d..3d7f9828a7eb6 100644 --- 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/auxiliary/issue-13560-1.rs b/tests/ui/auxiliary/issue-13560-1.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-1.rs rename to tests/ui/auxiliary/issue-13560-1.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-2.rs b/tests/ui/auxiliary/issue-13560-2.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-2.rs rename to tests/ui/auxiliary/issue-13560-2.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-3.rs b/tests/ui/auxiliary/issue-13560-3.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-3.rs rename to tests/ui/auxiliary/issue-13560-3.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-16822.rs b/tests/ui/auxiliary/issue-16822.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-16822.rs rename to tests/ui/auxiliary/issue-16822.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-18502.rs b/tests/ui/auxiliary/issue-18502.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-18502.rs rename to tests/ui/auxiliary/issue-18502.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-24106.rs b/tests/ui/auxiliary/issue-24106.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-24106.rs rename to tests/ui/auxiliary/issue-24106.rs diff --git a/tests/ui-fulldeps/extern-mod-syntax.rs b/tests/ui/extern-mod-syntax.rs similarity index 100% rename from tests/ui-fulldeps/extern-mod-syntax.rs rename to tests/ui/extern-mod-syntax.rs diff --git a/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs b/tests/ui/internal-lints/diagnostics_incorrect.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs rename to tests/ui/internal-lints/diagnostics_incorrect.rs diff --git a/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr b/tests/ui/internal-lints/diagnostics_incorrect.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr rename to tests/ui/internal-lints/diagnostics_incorrect.stderr diff --git a/tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs b/tests/ui/internal-lints/existing_doc_keyword.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs rename to tests/ui/internal-lints/existing_doc_keyword.rs diff --git a/tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr b/tests/ui/internal-lints/existing_doc_keyword.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr rename to tests/ui/internal-lints/existing_doc_keyword.stderr diff --git a/tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs b/tests/ui/internal-lints/query_stability_incorrect.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs rename to tests/ui/internal-lints/query_stability_incorrect.rs diff --git a/tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr b/tests/ui/internal-lints/query_stability_incorrect.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr rename to tests/ui/internal-lints/query_stability_incorrect.stderr diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs b/tests/ui/internal-lints/rustc_pass_by_value_self.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs rename to tests/ui/internal-lints/rustc_pass_by_value_self.rs diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr b/tests/ui/internal-lints/rustc_pass_by_value_self.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr rename to tests/ui/internal-lints/rustc_pass_by_value_self.stderr diff --git a/tests/ui-fulldeps/issue-11881.rs b/tests/ui/issue-11881.rs similarity index 100% rename from tests/ui-fulldeps/issue-11881.rs rename to tests/ui/issue-11881.rs diff --git a/tests/ui-fulldeps/issue-13560.rs b/tests/ui/issue-13560.rs similarity index 100% rename from tests/ui-fulldeps/issue-13560.rs rename to tests/ui/issue-13560.rs diff --git a/tests/ui-fulldeps/issue-15924.rs b/tests/ui/issue-15924.rs similarity index 100% rename from tests/ui-fulldeps/issue-15924.rs rename to tests/ui/issue-15924.rs diff --git a/tests/ui-fulldeps/issue-16822.rs b/tests/ui/issue-16822.rs similarity index 100% rename from tests/ui-fulldeps/issue-16822.rs rename to tests/ui/issue-16822.rs diff --git a/tests/ui-fulldeps/issue-18502.rs b/tests/ui/issue-18502.rs similarity index 100% rename from tests/ui-fulldeps/issue-18502.rs rename to tests/ui/issue-18502.rs diff --git a/tests/ui-fulldeps/issue-24106.rs b/tests/ui/issue-24106.rs similarity index 100% rename from tests/ui-fulldeps/issue-24106.rs rename to tests/ui/issue-24106.rs diff --git a/tests/ui-fulldeps/issue-2804.rs b/tests/ui/issue-2804.rs similarity index 100% rename from tests/ui-fulldeps/issue-2804.rs rename to tests/ui/issue-2804.rs diff --git a/tests/ui-fulldeps/myriad-closures.rs b/tests/ui/myriad-closures.rs similarity index 100% rename from tests/ui-fulldeps/myriad-closures.rs rename to tests/ui/myriad-closures.rs diff --git a/tests/ui-fulldeps/std/issue-15149.rs b/tests/ui/std/issue-15149.rs similarity index 100% rename from tests/ui-fulldeps/std/issue-15149.rs rename to tests/ui/std/issue-15149.rs diff --git a/tests/ui-fulldeps/std/issue-81357-unsound-file-methods.rs b/tests/ui/std/issue-81357-unsound-file-methods.rs similarity index 100% rename from tests/ui-fulldeps/std/issue-81357-unsound-file-methods.rs rename to tests/ui/std/issue-81357-unsound-file-methods.rs diff --git a/tests/ui-fulldeps/std/stdio-from.rs b/tests/ui/std/stdio-from.rs similarity index 100% rename from tests/ui-fulldeps/std/stdio-from.rs rename to tests/ui/std/stdio-from.rs diff --git a/tests/ui-fulldeps/std/switch-stdout.rs b/tests/ui/std/switch-stdout.rs similarity index 100% rename from tests/ui-fulldeps/std/switch-stdout.rs rename to tests/ui/std/switch-stdout.rs From 88ee6e5a6c5fad39494d4f5dcbfe026fa7fac621 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sun, 9 Apr 2023 09:11:00 -0500 Subject: [PATCH 2/2] Fix tests on wasm The `std` test straightforwardly can't work without file descriptors; #99417 tracks moving it out of tests/ui. `issue-13560.rs` requires the target to support dynamic linking. `extern-mod-syntax` is interesting. The original test was added to check if `extern mod` could be parsed correctly and used `extern mod std` and an import: https://github.com/rust-lang/rust/commit/138dc3048af36f0a20f857542c357fe8df563013#diff-73700e1e851b7a37bc92174635dab726124c82e5bfabbbc45b4a3c2e8e14fadd At some point `std::json::Object` was moved out of std to an unstable rustc-only `extras` crate, and rather than just changing the import it got changed to use the unstable crate. When `extras` was removed, people assumed the test was meant to also test rustc_private and changed it to another unstable crate rather than using something in std. This changes the test to remove the `rustc_private` import, to allow it to work properly when cross-compiling. --- tests/ui/extern-mod-syntax.rs | 8 ++++---- tests/ui/issue-13560.rs | 1 + tests/ui/std/switch-stdout.rs | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/ui/extern-mod-syntax.rs b/tests/ui/extern-mod-syntax.rs index 230194c537793..65dfa6a0f5790 100644 --- a/tests/ui/extern-mod-syntax.rs +++ b/tests/ui/extern-mod-syntax.rs @@ -1,11 +1,11 @@ // run-pass #![allow(unused_imports)] -#![feature(rustc_private)] +#![no_std] -extern crate libc; -use libc::c_void; +extern crate std; +use std::ffi::c_void; pub fn main() { - println!("Hello world!"); + std::println!("Hello world!"); } diff --git a/tests/ui/issue-13560.rs b/tests/ui/issue-13560.rs index 5f7d647e2301f..3397202bef2fd 100644 --- a/tests/ui/issue-13560.rs +++ b/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/std/switch-stdout.rs b/tests/ui/std/switch-stdout.rs index e9501a809308b..2d936d96b0596 100644 --- a/tests/ui/std/switch-stdout.rs +++ b/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;