Skip to content

std tests added #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lordshashank wants to merge 2 commits into
base: master
Choose a base branch
from
Open

std tests added #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec2f39
std tests added
lordshashank Mar 25, 2024
8e41146
improvs
lordshashank Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 32 additions & 39 deletions build_system/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ where
println!("Keeping all {} tests", test_type);
}

if test_type == "ui" {
if test_type == "tests/ui" {
if run_error_pattern_test {
// After we removed the error tests that are known to panic with rustc_codegen_gcc, we now remove the passing tests since this runs the error tests.
walk_dir(
Expand Down Expand Up @@ -1003,7 +1003,7 @@ where
}

// FIXME: create a function "display_if_not_quiet" or something along the line.
println!("[TEST] rustc {} test suite", test_type);
println!("[TEST] rustc {} suite", test_type);
env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());

let extra =
Expand All @@ -1027,7 +1027,7 @@ where
&"always",
&"--stage",
&"0",
&format!("tests/{}", test_type),
&test_type,
&"--rustc-args",
&rustc_args,
],
Expand All @@ -1039,7 +1039,7 @@ where

fn test_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
//test_rustc_inner(env, args, |_| Ok(false), false, "run-make")?;
test_rustc_inner(env, args, |_| Ok(false), false, "ui")
test_rustc_inner(env, args, |_| Ok(false), false, "tests/ui")
}

fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
Expand All @@ -1055,21 +1055,22 @@ fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
let result2 = test_rustc_inner(
env,
args,
retain_files_callback("tests/failing-ui-tests.txt", "ui"),
retain_files_callback("tests/failing-ui-tests.txt", "tests/ui"),
false,
"ui",
"tests/ui",
);

result1.and(result2)
}

fn test_successful_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
// All std tests are successful thus no need to prepare file callback
test_rustc_inner(env, args, |_| Ok(false), false, "library/std")?;
test_rustc_inner(
env,
args,
remove_files_callback("tests/failing-ui-tests.txt", "ui"),
remove_files_callback("tests/failing-ui-tests.txt", "tests/ui"),
false,
"ui",
"tests/ui",
)?;
Ok(())
/*test_rustc_inner(
Expand All @@ -1085,9 +1086,9 @@ fn test_failing_ui_pattern_tests(env: &Env, args: &TestArg) -> Result<(), String
test_rustc_inner(
env,
args,
remove_files_callback("tests/failing-ice-tests.txt", "ui"),
remove_files_callback("tests/failing-ice-tests.txt", "tests/ui"),
true,
"ui",
"tests/ui",
)
}

Expand All @@ -1105,7 +1106,7 @@ fn retain_files_callback<'a>(
run_command(
&[
&"find",
&format!("tests/{}", test_type),
&test_type,
&"-mindepth",
&"1",
&"-type",
Expand All @@ -1124,7 +1125,7 @@ fn retain_files_callback<'a>(
run_command(
&[
&"find",
&format!("tests/{}", test_type),
&test_type,
&"-type",
&"f",
&"-name",
Expand Down Expand Up @@ -1159,39 +1160,31 @@ fn remove_files_callback<'a>(
test_type: &'a str,
) -> impl Fn(&Path) -> Result<bool, String> + 'a {
move |rust_path| {
let files = std::fs::read_to_string(file_path).unwrap_or_default();
let first_file_name = files.lines().next().unwrap_or("");
// If the first line ends with a `/`, we treat all lines in the file as a directory.
if first_file_name.ends_with('/') {
// Removing the failing tests.
if let Ok(files) = std::fs::read_to_string(file_path) {
for file in
files.split('\n').map(|line| line.trim()).filter(|line| !line.is_empty())
{
let path = rust_path.join(file);
// Attempt to read the file
if let Ok(files) = std::fs::read_to_string(file_path) {
// Iterate over each line in the file
for file in files.split('\n').map(|line| line.trim()).filter(|line| !line.is_empty()) {
let path = rust_path.join(file);

// If the line ends with a `/`, treat it as a directory
if file.ends_with('/') {
if let Err(e) = std::fs::remove_dir_all(&path) {
println!("Failed to remove directory `{}`: {}", path.display(), e);
}
} else {
// Otherwise, treat it as a file
if let Err(e) = std::fs::remove_file(&path) {
println!("Failed to remove file `{}`: {}", path.display(), e);
}
}
} else {
println!(
"Failed to read `{}`, not putting back failing {} tests",
file_path, test_type
);
}
} else {
// Removing the failing tests.
if let Ok(files) = std::fs::read_to_string(file_path) {
for file in
files.split('\n').map(|line| line.trim()).filter(|line| !line.is_empty())
{
let path = rust_path.join(file);
remove_file(&path)?;
}
} else {
println!("Failed to read `{}`, not putting back failing ui tests", file_path);
}
println!(
"Failed to read `{}`, not putting back failing {} tests",
file_path, test_type
);
}

Ok(true)
}
}
Expand Down