From f5adf798f0398da3ed30166e6ce52bac695c6c96 Mon Sep 17 00:00:00 2001
From: Ken Mixter <kmixter@chromium.org>
Date: Thu, 7 Oct 2010 17:54:04 -0700
Subject: [PATCH] crosutils: Detect sym_upload errors by its stdout instead of
 return value

Change-Id: If649d355f3d9cb2650613e4eb6d34813216c0b61

BUG=7516
TEST=Change hardcoded URL to illegal URL and verify symbol sends fail

Review URL: http://codereview.chromium.org/3635001
---
 upload_symbols | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/upload_symbols b/upload_symbols
index 71162a6637..96307b4247 100755
--- a/upload_symbols
+++ b/upload_symbols
@@ -32,10 +32,10 @@ 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() {
@@ -63,10 +63,11 @@ function upload_file() {
   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