Merged third_party/tcmalloc/vendor/src(google-perftools r87) into...

third_party/tcmalloc/chromium/src/tests/sampling_test.sh

Index: third_party/tcmalloc/chromium/src/tests/sampling_test.sh
===================================================================
--- third_party/tcmalloc/chromium/src/tests/sampling_test.sh	(revision 41942)
+++ third_party/tcmalloc/chromium/src/tests/sampling_test.sh	(working copy)
@@ -62,11 +62,11 @@
   SAMPLING_TEST_BINARY="$SAMPLING_TEST_BINARY".exe
 fi
 
-die() {
-    echo "FAILED"
-    echo "reason:"
-    echo "$@"
+die() {    # runs the command given as arguments, and then dies.
+    echo "FAILED.  Output from $@"
     echo "----"
+    "$@"
+    echo "----"
     exit 1
 }
 
@@ -79,16 +79,16 @@
 # 50M to 99M.
 "$SAMPLING_TEST" "$OUTDIR/out"
 
-echo -n "Testing heap output..."
+echo "Testing heap output..."
 "$PPROF" --text "$SAMPLING_TEST_BINARY" "$OUTDIR/out.heap" \
    | grep '^ *[5-9][0-9]\.[0-9][ 0-9.%]*_*AllocateAllocate' >/dev/null \
-   || die `"$PPROF" --text "$SAMPLING_TEST_BINARY" "$OUTDIR/out.heap"`
+   || die "$PPROF" --text "$SAMPLING_TEST_BINARY" "$OUTDIR/out.heap"
 echo "OK"
 
-echo -n "Testing growth output..."
+echo "Testing growth output..."
 "$PPROF" --text "$SAMPLING_TEST_BINARY" "$OUTDIR/out.growth" \
    | grep '^ *[5-9][0-9]\.[0-9][ 0-9.%]*_*AllocateAllocate' >/dev/null \
-   || die `"$PPROF" --text "$SAMPLING_TEST_BINARY" "$OUTDIR/out.growth"`
+   || die "$PPROF" --text "$SAMPLING_TEST_BINARY" "$OUTDIR/out.growth"
 echo "OK"
 
 echo "PASS"