Skip to content

Commit 8d650ca

Browse files
rorthtstellar
authored andcommitted
[Release] Increase test-release.sh verbosity
`test-release.sh` is too silent in some cases: - Only the build proper is run verbosely, but `check-all` is not. - `lit` is run without `-v`, so in case of failures one cannot see what's actually wrong. This patch fixes both issues, running all `${MAKE}` invocations with `$Verbose` (except for `${MAKE} install` where it would only add noise), and running `lit` with `-v`. Tested on `x86_64-pc-linux-gnu` and `arm64-apple-darwin21.6`. Differential Revision: https://reviews.llvm.org/D143249 (cherry picked from commit 8d2d8e0)
1 parent d8f5768 commit 8d650ca

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

llvm/utils/release/test-release.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ function configure_llvmCore() {
426426
-DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
427427
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
428428
-DLLVM_ENABLE_PROJECTS="$project_list" \
429-
-DLLVM_LIT_ARGS="-j $NumJobs" \
429+
-DLLVM_LIT_ARGS="-j $NumJobs $LitVerbose" \
430430
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
431431
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
432432
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
@@ -435,7 +435,7 @@ function configure_llvmCore() {
435435
-DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
436436
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
437437
-DLLVM_ENABLE_PROJECTS="$project_list" \
438-
-DLLVM_LIT_ARGS="-j $NumJobs" \
438+
-DLLVM_LIT_ARGS="-j $NumJobs $LitVerbose" \
439439
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
440440
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
441441
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
@@ -453,6 +453,7 @@ function build_llvmCore() {
453453
if [ ${MAKE} = 'ninja' ]; then
454454
Verbose="-v"
455455
fi
456+
LitVerbose="-v"
456457

457458
redir="/dev/stdout"
458459
if [ $do_silent_log == "yes" ]; then
@@ -486,7 +487,7 @@ function test_llvmCore() {
486487
fi
487488

488489
cd $ObjDir
489-
if ! ( ${MAKE} -j $NumJobs $KeepGoing check-all \
490+
if ! ( ${MAKE} -j $NumJobs $KeepGoing $Verbose check-all \
490491
2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
491492
deferred_error $Phase $Flavor "check-all failed"
492493
fi
@@ -497,7 +498,7 @@ function test_llvmCore() {
497498
cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit \
498499
-DTEST_SUITE_HOST_CC=$build_compiler
499500

500-
if ! ( ${MAKE} -j $NumJobs $KeepGoing check \
501+
if ! ( ${MAKE} -j $NumJobs $KeepGoing $Verbose check \
501502
2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
502503
deferred_error $Phase $Flavor "test suite failed"
503504
fi

0 commit comments

Comments
 (0)