Skip to content

Commit d52815e

Browse files
committed
[libcxx] [ci] Don't use the "-s" flag in LLVM_LIT_ARGS
The "-s" flag gives a nice visual progress bar when running lit, which is useful when running interactively, but makes the log output near illegible. Additionally, by omitting "-s", the CI log becomes much more useful, as it prints the outcome of each individual test (by printing "PASS" or "UNSUPPORTED" or "XFAIL" for each one), making it clearer which tests were executed and which were skipped.
1 parent 754ed95 commit d52815e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

libcxx/utils/ci/run-buildbot

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function generate-cmake-base() {
136136
-DLIBCXX_ENABLE_WERROR=YES \
137137
-DLIBCXXABI_ENABLE_WERROR=YES \
138138
-DLIBUNWIND_ENABLE_WERROR=YES \
139-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
139+
-DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
140140
"${@}"
141141
}
142142

@@ -391,7 +391,7 @@ bootstrapping-build)
391391
-DLLVM_TARGETS_TO_BUILD="host" \
392392
-DRUNTIMES_BUILD_ALLOW_DARWIN=ON \
393393
-DLLVM_ENABLE_ASSERTIONS=ON \
394-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests"
394+
-DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml --timeout=1500 --time-tests"
395395

396396
step "Running the libc++ and libc++abi tests"
397397
${NINJA} -vC "${BUILD_DIR}" check-runtimes
@@ -564,7 +564,7 @@ apple-system-hardened)
564564
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
565565
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
566566
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}/cxx" \
567-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
567+
-DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
568568
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
569569
-DLIBCXX_CXX_ABI=libcxxabi \
570570
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
@@ -580,7 +580,7 @@ apple-system-hardened)
580580
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
581581
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
582582
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}/unwind" \
583-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
583+
-DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
584584
-DLLVM_ENABLE_RUNTIMES="libunwind" \
585585
-DLIBUNWIND_TEST_CONFIG="apple-libunwind-system.cfg.in" \
586586
-DLIBUNWIND_TEST_PARAMS="${params}" \
@@ -610,7 +610,7 @@ apple-system)
610610
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
611611
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
612612
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}/cxx" \
613-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
613+
-DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
614614
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
615615
-DLIBCXX_CXX_ABI=libcxxabi \
616616
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
@@ -626,7 +626,7 @@ apple-system)
626626
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
627627
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
628628
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}/unwind" \
629-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
629+
-DLLVM_LIT_ARGS="-v --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
630630
-DLLVM_ENABLE_RUNTIMES="libunwind" \
631631
-DLIBUNWIND_TEST_CONFIG="apple-libunwind-system.cfg.in" \
632632
-DLIBUNWIND_TEST_PARAMS="${params}" \

0 commit comments

Comments
 (0)