Skip to content

Commit d558796

Browse files
committed
Auto merge of rust-lang#109875 - jyn514:no-fulldeps, r=compiler-errors
Move most ui-fulldeps tests to ui/ Same rationale as rust-lang#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; rust-lang#109873 makes up for it. cc rust-lang#109770, rust-lang#109874
2 parents 7a78c4f + 88ee6e5 commit d558796

29 files changed

+14
-12
lines changed

src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
99

1010
// FIXME: The following limits should be reduced eventually.
1111
const ENTRY_LIMIT: usize = 885;
12-
const ROOT_ENTRY_LIMIT: usize = 880;
12+
const ROOT_ENTRY_LIMIT: usize = 891;
1313
const ISSUES_ENTRY_LIMIT: usize = 1978;
1414

1515
fn check_entries(tests_path: &Path, bad: &mut bool) {

tests/ui-fulldeps/extern-mod-syntax.rs

-11
This file was deleted.

tests/ui/extern-mod-syntax.rs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// run-pass
2+
3+
#![allow(unused_imports)]
4+
#![no_std]
5+
6+
extern crate std;
7+
use std::ffi::c_void;
8+
9+
pub fn main() {
10+
std::println!("Hello world!");
11+
}
File renamed without changes.

tests/ui-fulldeps/issue-13560.rs renamed to tests/ui/issue-13560.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-pass
2+
// ignore-cross-compile (needs dylibs and compiletest doesn't have a more specific header)
23
// aux-build:issue-13560-1.rs
34
// aux-build:issue-13560-2.rs
45
// aux-build:issue-13560-3.rs
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/ui-fulldeps/std/switch-stdout.rs renamed to tests/ui/std/switch-stdout.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-pass
2+
// ignore-wasm (needs file descriptors and env variables)
23

34
use std::env;
45
use std::fs::File;

0 commit comments

Comments
 (0)