crosutils: Detect sym_upload errors by its stdout instead of return value

upload_symbols

 #!/bin/bash
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to upload all debug symbols required for crash reporting
 # purposes.  This script need only be used to upload release builds
 # symbols or to debug crashes on non-release builds (in which case try
 # to only upload the symbols for those executables involved).
 #
@@ skipping 14 matching lines @@
 DEFINE_string breakpad_root "" "Root directory for breakpad symbols."
 DEFINE_boolean official_build ${FLAGS_FALSE} "Point to official symbol server."
 DEFINE_boolean regenerate ${FLAGS_FALSE} "Regenerate all symbols."
 DEFINE_boolean verbose ${FLAGS_FALSE} "Be verbose."
 DEFINE_boolean yes ${FLAGS_FALSE} "Answer yes to all prompts."
 
 SYM_UPLOAD="sym_upload"
 
 ANY_ERRORS=0
 
-ERR_FILE=$(mktemp "/tmp/err.XXXX")
+OUT_DIR=$(mktemp -d "/tmp/err.XXXX")
 
 function cleanup() {
-  rm -f "${ERR_FILE}"
+  rm -rf "${OUT_DIR}"
 }
 
 function really_upload() {
   if [ ${FLAGS_yes} -eq ${FLAGS_TRUE} ]; then
     return 0
   fi
   echo "Uploading symbols for an entire Chromium OS build is really only "
   echo "necessary for release builds and in a few cases for developers "
   echo "to debug problems.  It will take considerable time to run.  For "
   echo "developer debugging purposes, consider instead passing specific files "
   echo "to upload."
   read -p "Are you sure you want to upload all build symbols (y/N)? " SURE
   SURE="${SURE:0:1}" # Get just the first character
   if [ "${SURE}" != "y" ]; then
     echo "Ok, better safe than sorry."
     return 1
   fi
   return 0
 }
 
 # Upload the given symbol file to given URL.
 function upload_file() {
   local upload_file="$1"
   local upload_url="$2"
   if [ ${FLAGS_verbose} -eq ${FLAGS_TRUE} ]; then
     info "Uploading ${upload_file}"
   fi
-  if ! "${SYM_UPLOAD}" "${upload_file}" "${upload_url}" > /dev/null \
-      2> "${ERR_FILE}"; then
+  "${SYM_UPLOAD}" "${upload_file}" "${upload_url}" > "${OUT_DIR}/stdout" \
+    2> "${OUT_DIR}/stderr"
+  if ! grep -q "Successfully sent the symbol file." "${OUT_DIR}/stdout"; then
     error "Unable to upload symbols in ${upload_file}:"
-    cat "${ERR_FILE}"
+    cat "${OUT_DIR}/stderr"
     ANY_ERRORS=1
     return 1
   fi
   if [ ${FLAGS_verbose} -eq ${FLAGS_TRUE} ]; then
     size=$(wc -c "${upload_file}" | cut -d' ' -f1)
     info "Successfully uploaded ${size}B."
   fi
   return 0
 }
 
@@ skipping 51 matching lines @@
     done
   else
     error "Unexpected args ${FLAGS_ARGV}"
   fi
 
   [ ${ANY_ERRORS} -ne 0 ] && die "Encountered problems"
   return 0
 }
 
 main "$@"