Skip to content

Commit cec2f39

Browse files
committed
std tests added
1 parent 98ed962 commit cec2f39

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

build_system/src/test.rs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ where
892892
println!("Keeping all {} tests", test_type);
893893
}
894894

895-
if test_type == "ui" {
895+
if test_type == "tests/ui" {
896896
if run_error_pattern_test {
897897
// 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.
898898
walk_dir(
@@ -1003,7 +1003,7 @@ where
10031003
}
10041004

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

10091009
let extra =
@@ -1027,7 +1027,7 @@ where
10271027
&"always",
10281028
&"--stage",
10291029
&"0",
1030-
&format!("tests/{}", test_type),
1030+
&test_type,
10311031
&"--rustc-args",
10321032
&rustc_args,
10331033
],
@@ -1039,7 +1039,7 @@ where
10391039

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

10451045
fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
@@ -1055,21 +1055,22 @@ fn test_failing_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
10551055
let result2 = test_rustc_inner(
10561056
env,
10571057
args,
1058-
retain_files_callback("tests/failing-ui-tests.txt", "ui"),
1058+
retain_files_callback("tests/failing-ui-tests.txt", "tests/ui"),
10591059
false,
1060-
"ui",
1060+
"tests/ui",
10611061
);
1062-
10631062
result1.and(result2)
10641063
}
10651064

10661065
fn test_successful_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
1066+
// All std tests are successful thus no need to prepare file callback
1067+
test_rustc_inner(env, args, |_| Ok(false), false, "library/std")?;
10671068
test_rustc_inner(
10681069
env,
10691070
args,
1070-
remove_files_callback("tests/failing-ui-tests.txt", "ui"),
1071+
remove_files_callback("tests/failing-ui-tests.txt", "tests/ui"),
10711072
false,
1072-
"ui",
1073+
"tests/ui",
10731074
)?;
10741075
Ok(())
10751076
/*test_rustc_inner(
@@ -1085,9 +1086,9 @@ fn test_failing_ui_pattern_tests(env: &Env, args: &TestArg) -> Result<(), String
10851086
test_rustc_inner(
10861087
env,
10871088
args,
1088-
remove_files_callback("tests/failing-ice-tests.txt", "ui"),
1089+
remove_files_callback("tests/failing-ice-tests.txt", "tests/ui"),
10891090
true,
1090-
"ui",
1091+
"tests/ui",
10911092
)
10921093
}
10931094

@@ -1105,7 +1106,7 @@ fn retain_files_callback<'a>(
11051106
run_command(
11061107
&[
11071108
&"find",
1108-
&format!("tests/{}", test_type),
1109+
&test_type,
11091110
&"-mindepth",
11101111
&"1",
11111112
&"-type",
@@ -1124,7 +1125,7 @@ fn retain_files_callback<'a>(
11241125
run_command(
11251126
&[
11261127
&"find",
1127-
&format!("tests/{}", test_type),
1128+
&test_type,
11281129
&"-type",
11291130
&"f",
11301131
&"-name",

0 commit comments

Comments
 (0)