File tree Expand file tree Collapse file tree 6 files changed +0
-49
lines changed Expand file tree Collapse file tree 6 files changed +0
-49
lines changed Original file line number Diff line number Diff line change @@ -321,8 +321,6 @@ jobs:
321321 env :
322322 RUST_CONFIGURE_ARGS : " --build=x86_64-pc-windows-msvc --enable-profiler"
323323 SCRIPT : make ci-subset-1
324- NO_DEBUG_ASSERTIONS : 1
325- NO_LLVM_ASSERTIONS : 1
326324 os : windows-latest-xl
327325 - name : x86_64-msvc-2
328326 env :
@@ -333,23 +331,17 @@ jobs:
333331 env :
334332 RUST_CONFIGURE_ARGS : " --build=i686-pc-windows-msvc"
335333 SCRIPT : make ci-subset-1
336- NO_DEBUG_ASSERTIONS : 1
337- NO_LLVM_ASSERTIONS : 1
338334 os : windows-latest-xl
339335 - name : i686-msvc-2
340336 env :
341337 RUST_CONFIGURE_ARGS : " --build=i686-pc-windows-msvc"
342338 SCRIPT : make ci-subset-2
343- NO_DEBUG_ASSERTIONS : 1
344- NO_LLVM_ASSERTIONS : 1
345339 os : windows-latest-xl
346340 - name : x86_64-msvc-cargo
347341 env :
348342 SCRIPT : python x.py --stage 2 test src/tools/cargotest src/tools/cargo
349343 RUST_CONFIGURE_ARGS : " --build=x86_64-pc-windows-msvc --enable-lld"
350344 VCVARS_BAT : vcvars64.bat
351- NO_DEBUG_ASSERTIONS : 1
352- NO_LLVM_ASSERTIONS : 1
353345 os : windows-latest-xl
354346 - name : x86_64-msvc-tools
355347 env :
@@ -361,8 +353,6 @@ jobs:
361353 RUST_CONFIGURE_ARGS : " --build=i686-pc-windows-gnu"
362354 SCRIPT : make ci-mingw-subset-1
363355 CUSTOM_MINGW : 1
364- NO_DEBUG_ASSERTIONS : 1
365- NO_LLVM_ASSERTIONS : 1
366356 os : windows-latest-xl
367357 - name : i686-mingw-2
368358 env :
@@ -375,8 +365,6 @@ jobs:
375365 SCRIPT : make ci-mingw-subset-1
376366 RUST_CONFIGURE_ARGS : " --build=x86_64-pc-windows-gnu --enable-profiler"
377367 CUSTOM_MINGW : 1
378- NO_DEBUG_ASSERTIONS : 1
379- NO_LLVM_ASSERTIONS : 1
380368 os : windows-latest-xl
381369 - name : x86_64-mingw-2
382370 env :
Original file line number Diff line number Diff line change @@ -27,6 +27,3 @@ RUN echo "optimize = false" >> /config/nopt-std-config.toml
2727ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
2828ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
2929 && python3 ../x.py --stage 2 test
30-
31- # FIXME(#59637) takes too long on CI right now
32- ENV NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1
Original file line number Diff line number Diff line change @@ -28,6 +28,3 @@ ENV SCRIPT python3 ../x.py --stage 2 test \
2828 --exclude src/test/rustdoc-js \
2929 --exclude src/tools/error_index_generator \
3030 --exclude src/tools/linkchecker
31-
32- # FIXME(#59637) takes too long on CI right now
33- ENV NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1
Original file line number Diff line number Diff line change @@ -22,10 +22,3 @@ RUN sh /scripts/sccache.sh
2222ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --set rust.ignore-git=false
2323ENV SCRIPT python3 ../x.py --stage 2 test distcheck
2424ENV DIST_SRC 1
25-
26- # The purpose of this builder is to test that we can `./x.py --stage 2 test` successfully
27- # from a tarball, not to test LLVM/rustc's own set of assertions. These cause a
28- # significant hit to CI compile time (over a half hour as observed in #61185),
29- # so disable assertions for this builder.
30- ENV NO_LLVM_ASSERTIONS=1
31- ENV NO_DEBUG_ASSERTIONS=1
Original file line number Diff line number Diff line change @@ -57,9 +57,3 @@ ENV SCRIPT python2.7 ../x.py --stage 2 test --exclude src/tools/tidy && \
5757 python2.7 ../x.py --stage 2 test src/test/ui --pass=check && \
5858 # Run tidy at the very end, after all the other tests.
5959 python2.7 ../x.py --stage 2 test src/tools/tidy
60-
61- # The purpose of this container isn't to test with debug assertions and
62- # this is run on all PRs, so let's get speedier builds by disabling these extra
63- # checks.
64- ENV NO_DEBUG_ASSERTIONS=1
65- ENV NO_LLVM_ASSERTIONS=1
Original file line number Diff line number Diff line change @@ -500,9 +500,6 @@ jobs:
500500 env :
501501 RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-profiler
502502 SCRIPT : make ci-subset-1
503- # FIXME(#59637)
504- NO_DEBUG_ASSERTIONS : 1
505- NO_LLVM_ASSERTIONS : 1
506503 << : *job-windows-xl
507504
508505 - name : x86_64-msvc-2
@@ -515,28 +512,19 @@ jobs:
515512 env :
516513 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-msvc
517514 SCRIPT : make ci-subset-1
518- # FIXME(#59637)
519- NO_DEBUG_ASSERTIONS : 1
520- NO_LLVM_ASSERTIONS : 1
521515 << : *job-windows-xl
522516
523517 - name : i686-msvc-2
524518 env :
525519 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-msvc
526520 SCRIPT : make ci-subset-2
527- # FIXME(#59637)
528- NO_DEBUG_ASSERTIONS : 1
529- NO_LLVM_ASSERTIONS : 1
530521 << : *job-windows-xl
531522
532523 - name : x86_64-msvc-cargo
533524 env :
534525 SCRIPT : python x.py --stage 2 test src/tools/cargotest src/tools/cargo
535526 RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-lld
536527 VCVARS_BAT : vcvars64.bat
537- # FIXME(#59637)
538- NO_DEBUG_ASSERTIONS : 1
539- NO_LLVM_ASSERTIONS : 1
540528 << : *job-windows-xl
541529
542530 - name : x86_64-msvc-tools
@@ -566,9 +554,6 @@ jobs:
566554 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu
567555 SCRIPT : make ci-mingw-subset-1
568556 CUSTOM_MINGW : 1
569- # FIXME(#59637)
570- NO_DEBUG_ASSERTIONS : 1
571- NO_LLVM_ASSERTIONS : 1
572557 << : *job-windows-xl
573558
574559 - name : i686-mingw-2
@@ -583,9 +568,6 @@ jobs:
583568 SCRIPT : make ci-mingw-subset-1
584569 RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-gnu --enable-profiler
585570 CUSTOM_MINGW : 1
586- # FIXME(#59637)
587- NO_DEBUG_ASSERTIONS : 1
588- NO_LLVM_ASSERTIONS : 1
589571 << : *job-windows-xl
590572
591573 - name : x86_64-mingw-2
You can’t perform that action at this time.
0 commit comments