3 files changed +1
-21
lines changed Original file line number Diff line number Diff line change @@ -15,8 +15,6 @@ pub struct Environment {
15
15
artifact_dir : Utf8PathBuf ,
16
16
/// Path to the host LLVM used to compile LLVM in `src/llvm-project`.
17
17
host_llvm_dir : Utf8PathBuf ,
18
- /// List of test paths that should be skipped when testing the optimized artifacts.
19
- skipped_tests : Vec < String > ,
20
18
/// Arguments passed to `rustc-perf --cargo-config <value>` when running benchmarks.
21
19
#[ builder( default ) ]
22
20
benchmark_cargo_config : Vec < String > ,
@@ -94,10 +92,6 @@ impl Environment {
94
92
self . shared_llvm
95
93
}
96
94
97
- pub fn skipped_tests ( & self ) -> & [ String ] {
98
- & self . skipped_tests
99
- }
100
-
101
95
pub fn benchmark_cargo_config ( & self ) -> & [ String ] {
102
96
& self . benchmark_cargo_config
103
97
}
Original file line number Diff line number Diff line change @@ -84,10 +84,6 @@ enum EnvironmentCmd {
84
84
#[ arg( long, default_value_t = false ) ]
85
85
use_bolt : bool ,
86
86
87
- /// Tests that should be skipped when testing the optimized compiler.
88
- #[ arg( long) ]
89
- skipped_tests : Vec < String > ,
90
-
91
87
#[ clap( flatten) ]
92
88
shared : SharedArgs ,
93
89
@@ -122,7 +118,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
122
118
rustc_perf_checkout_dir,
123
119
llvm_shared,
124
120
use_bolt,
125
- skipped_tests,
126
121
benchmark_cargo_config,
127
122
shared,
128
123
} => {
@@ -136,7 +131,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
136
131
. prebuilt_rustc_perf ( rustc_perf_checkout_dir)
137
132
. shared_llvm ( llvm_shared)
138
133
. use_bolt ( use_bolt)
139
- . skipped_tests ( skipped_tests)
140
134
. benchmark_cargo_config ( benchmark_cargo_config)
141
135
. build ( ) ?;
142
136
@@ -172,7 +166,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
172
166
. shared_llvm ( true )
173
167
// FIXME: Enable bolt for aarch64 once it's fixed upstream. Broken as of December 2024.
174
168
. use_bolt ( !is_aarch64)
175
- . skipped_tests ( skip_tests)
176
169
. build ( ) ?;
177
170
178
171
( env, shared. build_args )
@@ -191,10 +184,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
191
184
. build_dir ( checkout_dir)
192
185
. shared_llvm ( false )
193
186
. use_bolt ( false )
194
- . skipped_tests ( vec ! [
195
- // Fails as of June 2023.
196
- "tests\\ codegen\\ vec-shrink-panik.rs" . to_string( ) ,
197
- ] )
198
187
. build ( ) ?;
199
188
200
189
( env, shared. build_args )
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ llvm-config = "{llvm_config}"
89
89
std:: fs:: write ( "config.toml" , config_content) ?;
90
90
91
91
let x_py = env. checkout_path ( ) . join ( "x.py" ) ;
92
- let mut args = vec ! [
92
+ let args = vec ! [
93
93
env. python_binary( ) ,
94
94
x_py. as_str( ) ,
95
95
"test" ,
@@ -107,9 +107,6 @@ llvm-config = "{llvm_config}"
107
107
"tests/ui" ,
108
108
"tests/crashes" ,
109
109
] ;
110
- for test_path in env. skipped_tests ( ) {
111
- args. extend ( [ "--skip" , test_path] ) ;
112
- }
113
110
cmd ( & args)
114
111
. env ( "COMPILETEST_FORCE_STAGE0" , "1" )
115
112
// Also run dist-only tests
0 commit comments