test-release.sh: Defer test errors until the end

[hans]

Summary

This makes the script run to the end and produce tarballs even on test failures, and then highlights any errors afterwards.

(I first tried just storing the errors in a global variable, but that didn't work as the "test_llvmCore" function invocation is actually running as a sub-shell.)

[agnat]

LGTM with one nit.

utils/release/test-release.sh

563 ↗

(On Diff #30530)

Just skip the error section if there are none.

[hans]

utils/release/test-release.sh

563 ↗

(On Diff #30530)

I figured printing "Errors:\nNone" would be more clear - then there's no question whether the script exited early or something.

[dsanders]

LGTM. I'll try the script over the weekend since I need to pick up the addition of libunwind too.

utils/release/test-release.sh

218 ↗

(On Diff #30530)

Optional nit: If we're deferring full messages rather than just 'something failed' then I'd be inclined to echo to both stdout and the deferred error log. This allows you to search the main log for the message and find the origin of the failure.

[hans]

utils/release/test-release.sh

218 ↗

(On Diff #30530)

Makes sense. Done.

[dsanders]

Just to let you know, the build using this updated script worked nicely for me. I'm having some trouble with libunwind dependencies but that's a separate issue.

[hans]

In D11478#213362, @dsanders wrote:

Just to let you know, the build using this updated script worked nicely for me. I'm having some trouble with libunwind dependencies but that's a separate issue.

Great.

Two libunwind patches were just merged in 243436 and 243437. Not sure if that's related to the issues you're seeing though.

llvm/trunk/utils/release/test-release.sh

 
 # Final package name.
 Package=clang+llvm-$Release
 if [ $RC != "final" ]; then
   Package=$Package-$RC
 fi
 Package=$Package-$Triple
 
+# Errors to be highlighted at the end are written to this file.
+echo -n > $LogDir/deferred_errors.log
+
+function deferred_error() {
+  Phase="$1"
+  Flavor="$2"
+  Msg="$3"
+  echo "[${Flavor} Phase${Phase}] ${Msg}" | tee -a $LogDir/deferred_errors.log
+}
+
 # Make sure that a required program is available
 function check_program_exists() {
   local program="$1"
   if ! type -P $program > /dev/null 2>&1 ; then
     echo "program '$1' not found !"
     exit 1
   fi
 }

 }
 
 function test_llvmCore() {
     Phase="$1"
     Flavor="$2"
     ObjDir="$3"
 
     cd $ObjDir
-    ${MAKE} -j $NumJobs -k check-all \
-        2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log
+    if ! ( ${MAKE} -j $NumJobs -k check-all \
+        2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
+      deferred_error $Phase $Flavor "check-all failed"
+    fi
 
     if [ "$use_autoconf" = "yes" ]; then
         # In the cmake build, unit tests are run as part of check-all.
-        ${MAKE} -k unittests \
-            2>&1 | tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log
+        if ! ( ${MAKE} -k unittests 2>&1 | \
+            tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log ) ; then
+          deferred_error $Phase $Flavor "unittests failed"
+        fi
     fi
 
     cd $BuildDir
 }
 
 # Clean RPATH. Libtool adds the build directory to the search path, which is
 # not necessary --- and even harmful --- for the binary packages we release.
 function clean_RPATH() {

 # Woo hoo!
 echo "### Testing Finished ###"
 if [ "$use_gzip" = "yes" ]; then
   echo "### Package: $Package.tar.gz"
 else
   echo "### Package: $Package.tar.xz"
 fi
 echo "### Logs: $LogDir"
+
+echo "### Errors:"
+if [ -s "$LogDir/deferred_errors.log" ]; then
+  cat "$LogDir/deferred_errors.log"
+  exit 1
+else
+  echo "None."
+fi
+
 exit 0