Skip to content

Commit 74575a8

Browse files
committed
Auto merge of rust-lang#135960 - workingjubilee:remove-opt-dists-test-skipping-code, r=<try>
ci: Remove the power to skip tests from opt-dist This will probably take a bit of testing against the dist pipelines to make it pass. r? `@ghost` try-job: dist-aarch64-linux try-job: dist-x86_64-msvc
2 parents 99768c8 + 14e50f4 commit 74575a8

File tree

3 files changed

+1
-34
lines changed

3 files changed

+1
-34
lines changed

src/tools/opt-dist/src/environment.rs

-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ pub struct Environment {
1515
artifact_dir: Utf8PathBuf,
1616
/// Path to the host LLVM used to compile LLVM in `src/llvm-project`.
1717
host_llvm_dir: Utf8PathBuf,
18-
/// List of test paths that should be skipped when testing the optimized artifacts.
19-
skipped_tests: Vec<String>,
2018
/// Arguments passed to `rustc-perf --cargo-config <value>` when running benchmarks.
2119
#[builder(default)]
2220
benchmark_cargo_config: Vec<String>,
@@ -94,10 +92,6 @@ impl Environment {
9492
self.shared_llvm
9593
}
9694

97-
pub fn skipped_tests(&self) -> &[String] {
98-
&self.skipped_tests
99-
}
100-
10195
pub fn benchmark_cargo_config(&self) -> &[String] {
10296
&self.benchmark_cargo_config
10397
}

src/tools/opt-dist/src/main.rs

-24
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ enum EnvironmentCmd {
8484
#[arg(long, default_value_t = false)]
8585
use_bolt: bool,
8686

87-
/// Tests that should be skipped when testing the optimized compiler.
88-
#[arg(long)]
89-
skipped_tests: Vec<String>,
90-
9187
#[clap(flatten)]
9288
shared: SharedArgs,
9389

@@ -122,7 +118,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
122118
rustc_perf_checkout_dir,
123119
llvm_shared,
124120
use_bolt,
125-
skipped_tests,
126121
benchmark_cargo_config,
127122
shared,
128123
} => {
@@ -136,7 +131,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
136131
.prebuilt_rustc_perf(rustc_perf_checkout_dir)
137132
.shared_llvm(llvm_shared)
138133
.use_bolt(use_bolt)
139-
.skipped_tests(skipped_tests)
140134
.benchmark_cargo_config(benchmark_cargo_config)
141135
.build()?;
142136

@@ -148,19 +142,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
148142

149143
let is_aarch64 = target_triple.starts_with("aarch64");
150144

151-
let mut skip_tests = vec![
152-
// Fails because of linker errors, as of June 2023.
153-
"tests/ui/process/nofile-limit.rs".to_string(),
154-
];
155-
156-
if is_aarch64 {
157-
skip_tests.extend([
158-
// Those tests fail only inside of Docker on aarch64, as of December 2024
159-
"tests/ui/consts/promoted_running_out_of_memory_issue-130687.rs".to_string(),
160-
"tests/ui/consts/large_const_alloc.rs".to_string(),
161-
]);
162-
}
163-
164145
let checkout_dir = Utf8PathBuf::from("/checkout");
165146
let env = EnvironmentBuilder::default()
166147
.host_tuple(target_triple)
@@ -172,7 +153,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
172153
.shared_llvm(true)
173154
// FIXME: Enable bolt for aarch64 once it's fixed upstream. Broken as of December 2024.
174155
.use_bolt(!is_aarch64)
175-
.skipped_tests(skip_tests)
176156
.build()?;
177157

178158
(env, shared.build_args)
@@ -191,10 +171,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
191171
.build_dir(checkout_dir)
192172
.shared_llvm(false)
193173
.use_bolt(false)
194-
.skipped_tests(vec![
195-
// Fails as of June 2023.
196-
"tests\\codegen\\vec-shrink-panik.rs".to_string(),
197-
])
198174
.build()?;
199175

200176
(env, shared.build_args)

src/tools/opt-dist/src/tests.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ llvm-config = "{llvm_config}"
8989
std::fs::write("config.toml", config_content)?;
9090

9191
let x_py = env.checkout_path().join("x.py");
92-
let mut args = vec![
92+
let args = vec![
9393
env.python_binary(),
9494
x_py.as_str(),
9595
"test",
@@ -107,9 +107,6 @@ llvm-config = "{llvm_config}"
107107
"tests/ui",
108108
"tests/crashes",
109109
];
110-
for test_path in env.skipped_tests() {
111-
args.extend(["--skip", test_path]);
112-
}
113110
cmd(&args)
114111
.env("COMPILETEST_FORCE_STAGE0", "1")
115112
// Also run dist-only tests

0 commit comments

Comments
 (0)