Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: third_party/tcmalloc/chromium/src/tests/sampling_test.sh

Issue 1076002: Revert 41938 - Merged third_party/tcmalloc/vendor/src(googleperftools r87) in... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/tests/sampling_test.sh
===================================================================
--- third_party/tcmalloc/chromium/src/tests/sampling_test.sh (revision 41940)
+++ third_party/tcmalloc/chromium/src/tests/sampling_test.sh (working copy)
@@ -62,11 +62,11 @@
SAMPLING_TEST_BINARY="$SAMPLING_TEST_BINARY".exe
fi
-die() { # runs the command given as arguments, and then dies.
- echo "FAILED. Output from $@"
+die() {
+ echo "FAILED"
+ echo "reason:"
+ echo "$@"
echo "----"
- "$@"
- echo "----"
exit 1
}
@@ -79,16 +79,16 @@
# 50M to 99M.
"$SAMPLING_TEST" "$OUTDIR/out"
-echo "Testing heap output..."
+echo -n "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 "Testing growth output..."
+echo -n "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"

Powered by Google App Engine
This is Rietveld 408576698