[llvm-branch-commits] [llvm] 8d650ca - [Release] Increase test-release.sh verbosity

[Tom Stellard via llvm-branch-commits]

Author: Rainer Orth
Date: 2023-02-06T11:45:07-08:00
New Revision: 8d650ca44a324b2509bec6eebaf63ea8222221ff

URL: https://github.com/llvm/llvm-project/commit/8d650ca44a324b2509bec6eebaf63ea8222221ff
DIFF: https://github.com/llvm/llvm-project/commit/8d650ca44a324b2509bec6eebaf63ea8222221ff.diff

LOG: [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 8d2d8e022e3c709a17b97d351b529e40ac28f4df)

Added: 
    

Modified: 
    llvm/utils/release/test-release.sh

Removed: 
    


################################################################################
diff  --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh
index dad4dbff4d994..6975a5da8ddec 100755
--- a/llvm/utils/release/test-release.sh
+++ b/llvm/utils/release/test-release.sh
@@ -426,7 +426,7 @@ function configure_llvmCore() {
         -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
         -DLLVM_ENABLE_PROJECTS="$project_list" \
-        -DLLVM_LIT_ARGS="-j $NumJobs" \
+        -DLLVM_LIT_ARGS="-j $NumJobs $LitVerbose" \
         -DLLVM_ENABLE_RUNTIMES="$runtime_list" \
         $ExtraConfigureFlags $BuildDir/llvm-project/llvm \
         2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
@@ -435,7 +435,7 @@ function configure_llvmCore() {
         -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
         -DLLVM_ENABLE_PROJECTS="$project_list" \
-        -DLLVM_LIT_ARGS="-j $NumJobs" \
+        -DLLVM_LIT_ARGS="-j $NumJobs $LitVerbose" \
         -DLLVM_ENABLE_RUNTIMES="$runtime_list" \
         $ExtraConfigureFlags $BuildDir/llvm-project/llvm \
         2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
@@ -453,6 +453,7 @@ function build_llvmCore() {
     if [ ${MAKE} = 'ninja' ]; then
       Verbose="-v"
     fi
+    LitVerbose="-v"
 
     redir="/dev/stdout"
     if [ $do_silent_log == "yes" ]; then
@@ -486,7 +487,7 @@ function test_llvmCore() {
     fi
 
     cd $ObjDir
-    if ! ( ${MAKE} -j $NumJobs $KeepGoing check-all \
+    if ! ( ${MAKE} -j $NumJobs $KeepGoing $Verbose check-all \
         2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
       deferred_error $Phase $Flavor "check-all failed"
     fi
@@ -497,7 +498,7 @@ function test_llvmCore() {
           cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit \
                 -DTEST_SUITE_HOST_CC=$build_compiler
 
-      if ! ( ${MAKE} -j $NumJobs $KeepGoing check \
+      if ! ( ${MAKE} -j $NumJobs $KeepGoing $Verbose check \
           2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
         deferred_error $Phase $Flavor "test suite failed"
       fi