@@ -306,7 +306,7 @@ function build_stage2 {
306
306
-DCMAKE_C_FLAGS=" ${fsanitize_flag} ${cmake_libcxx_cflags} ${fno_sanitize_flag} " \
307
307
-DCMAKE_CXX_FLAGS=" ${fsanitize_flag} ${cmake_libcxx_cflags} ${fno_sanitize_flag} " \
308
308
$LLVM /../runtimes && \
309
- ninja cxx cxxabi && ninja install-cxx install-cxxabi ) || build_failure
309
+ ninja && ninja install) || build_failure
310
310
311
311
local libcxx_so_path=" $( find " ${ROOT} /${libcxx_install_dir} " -name libc++.so) "
312
312
test -f " ${libcxx_so_path} " || build_failure
@@ -405,6 +405,7 @@ function check_stage2 {
405
405
# Very slow, run in background.
406
406
LIT_OPTS+=" --timeout=1500"
407
407
(
408
+ echo @@@BUILD_STEP stage2/$sanitizer_name check-cxx@@@
408
409
# Very slow.
409
410
export LIT_FILTER_OUT=" modules_include.sh.cpp"
410
411
LIT_FILTER_OUT+=" |std/algorithms/alg.modifying.operations/alg.transform/ranges.transform.pass.cpp"
@@ -449,9 +450,12 @@ function check_stage2 {
449
450
LIT_FILTER_OUT+=" |ostream.formatted.print/vprint_unicode.pass.cpp"
450
451
LIT_FILTER_OUT+=" |ra_sign_state.pass.cpp"
451
452
fi
452
- ninja -C libcxx_build_${sanitizer_name} check-cxx check-cxxabi
453
+ ninja -C libcxx_build_${sanitizer_name} check-cxx || exit 1
454
+
455
+ echo @@@BUILD_STEP stage2/$sanitizer_name check-cxxabi@@@
456
+ ninja -C libcxx_build_${sanitizer_name} check-cxxabi || exit 1
453
457
) || build_failure
454
- ) & > check_cxx.log &
458
+ )
455
459
fi
456
460
457
461
echo @@@BUILD_STEP stage2/$sanitizer_name check@@@
@@ -462,13 +466,6 @@ function check_stage2 {
462
466
fi
463
467
ninja -C ${STAGE2_DIR} check-all
464
468
)|| build_failure
465
-
466
- if [[ " ${STAGE2_SKIP_TEST_CXX:- } " != " 1" ]] ; then
467
- echo @@@BUILD_STEP stage2/$sanitizer_name check-cxx@@@
468
- wait
469
- sleep 5
470
- cat check_cxx.log
471
- fi
472
469
}
473
470
474
471
function check_stage2_msan {
0 commit comments