Skip to content

Commit 8738c81

Browse files
Merge pull request #63218 from adrian-prantl/verbose-tests
Verbose tests
2 parents f558447 + 0e96efc commit 8738c81

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

utils/build-presets.ini

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ lldb-assertions
300300

301301
[preset: lldb-pull-request]
302302
lldb
303+
lit-args=-v
304+
303305
lldb-use-system-debugserver
304306
release-debuginfo
305307
test
@@ -686,6 +688,22 @@ build-ninja
686688
skip-build-swift
687689
skip-build-cmark
688690

691+
[preset: buildbot_incremental_lldb]
692+
lldb
693+
release
694+
test
695+
696+
lit-args=-v --time-tests
697+
skip-build-benchmarks
698+
no-swift-stdlib-assertions
699+
lldb-use-system-debugserver
700+
701+
skip-early-swift-driver
702+
skip-test-swift
703+
skip-test-cmark
704+
705+
706+
689707
#===------------------------------------------------------------------------===#
690708
# A setting to run a buildbot that passes extra swift args when compiling
691709
# modules that match regexp.

utils/build-script-impl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,9 @@ function set_build_options_for_host() {
810810
swift_cmake_options+=(
811811
-DLLVM_LIT_ARGS="${LLVM_LIT_ARGS} -j ${LIT_JOBS}"
812812
)
813+
lldb_cmake_options+=(
814+
-DLLVM_LIT_ARGS="${LLVM_LIT_ARGS} -j ${LIT_JOBS}"
815+
)
813816

814817
if [[ "${CLANG_PROFILE_INSTR_USE}" ]]; then
815818
llvm_cmake_options+=(
@@ -2908,9 +2911,6 @@ for host in "${ALL_HOSTS[@]}"; do
29082911
LLVM_LIT_FILTER_ARG="${FILTER_SWIFT_OPTION}"
29092912
fi
29102913

2911-
# Record the times test took and report the slowest.
2912-
LLVM_LIT_ARGS="${LLVM_LIT_ARGS} -v --time-tests"
2913-
29142914
echo "--- Running LLDB unit tests ---"
29152915
with_pushd ${lldb_build_dir} \
29162916
call ${NINJA_BIN} -j ${BUILD_JOBS} unittests/LLDBUnitTests
@@ -3554,7 +3554,7 @@ function build_and_test_installable_package() {
35543554
TIMEOUT_ARGS=--timeout=600 # 10 minutes
35553555
fi
35563556
with_pushd "${PKG_TESTS_SOURCE_DIR}" \
3557-
call python3 "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param test-exec-root="${PKG_TESTS_TEMPS}" --param llvm-bin-dir="${LLVM_BIN_DIR}" ${TIMEOUT_ARGS}
3557+
call python3 "${LIT_EXECUTABLE_PATH}" . ${LLVM_LIT_ARGS} --param package-path="${PKG_TESTS_SANDBOX}" --param test-exec-root="${PKG_TESTS_TEMPS}" --param llvm-bin-dir="${LLVM_BIN_DIR}" ${TIMEOUT_ARGS}
35583558
fi
35593559
fi
35603560
}

0 commit comments

Comments
 (0)