Skip to content

Commit

Permalink
Auto merge of rust-lang#109875 - jyn514:no-fulldeps, r=compiler-errors
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Apr 14, 2023
2 parents 7a78c4f + 88ee6e5 commit d558796
Show file tree
Hide file tree
Showing 29 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/tools/tidy/src/ui_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 0 additions & 11 deletions tests/ui-fulldeps/extern-mod-syntax.rs

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions tests/ui/extern-mod-syntax.rs
Original file line number Diff line number Diff line change
@@ -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!");
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
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.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// run-pass
// ignore-wasm (needs file descriptors and env variables)

use std::env;
use std::fs::File;
Expand Down

0 comments on commit d558796

Please sign in to comment.