File tree 3 files changed +8
-5
lines changed
ci/docker/host-x86_64/wasm32
3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -302,8 +302,10 @@ impl StepDescription {
302
302
}
303
303
}
304
304
305
- fn maybe_run ( & self , builder : & Builder < ' _ > , pathsets : Vec < PathSet > ) {
306
- if pathsets. iter ( ) . any ( |set| self . is_excluded ( builder, set) ) {
305
+ fn maybe_run ( & self , builder : & Builder < ' _ > , mut pathsets : Vec < PathSet > ) {
306
+ pathsets. retain ( |set| !self . is_excluded ( builder, set) ) ;
307
+
308
+ if pathsets. is_empty ( ) {
307
309
return ;
308
310
}
309
311
Original file line number Diff line number Diff line change @@ -136,9 +136,9 @@ fn test_exclude_kind() {
136
136
let mut config = configure ( "test" , & [ "A" ] , & [ "A" ] ) ;
137
137
// Ensure our test is valid, and `test::Rustc` would be run without the exclude.
138
138
assert ! ( run_build( & [ ] , config. clone( ) ) . contains:: <test:: CrateLibrustc >( ) ) ;
139
- // Ensure tests for rustc are skipped.
139
+ // Ensure tests for rustc are not skipped.
140
140
config. skip = vec ! [ path. clone( ) ] ;
141
- assert ! ( ! run_build( & [ ] , config. clone( ) ) . contains:: <test:: CrateLibrustc >( ) ) ;
141
+ assert ! ( run_build( & [ ] , config. clone( ) ) . contains:: <test:: CrateLibrustc >( ) ) ;
142
142
// Ensure builds for rustc are not skipped.
143
143
assert ! ( run_build( & [ ] , config) . contains:: <compile:: Rustc >( ) ) ;
144
144
}
Original file line number Diff line number Diff line change @@ -58,5 +58,6 @@ ENV NO_CHANGE_USER=1
58
58
RUN chown 10719 -R /emsdk-portable/
59
59
60
60
# Exclude library/alloc due to OOM in benches.
61
+ # FIXME: Fix std tests
61
62
ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \
62
- --skip library/alloc
63
+ --skip library/alloc --skip library/std
You can’t perform that action at this time.
0 commit comments