third_party/tcmalloc/chromium/src/tests/heap-checker-death_unittest.sh - Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/tests/heap-checker-death_unittest.sh

Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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

« no previous file with comments | « third_party/tcmalloc/chromium/src/tests/frag_unittest.cc ('k') | third_party/tcmalloc/chromium/src/tests/heap-checker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/tests/heap-checker-death_unittest.sh

===================================================================

--- third_party/tcmalloc/chromium/src/tests/heap-checker-death_unittest.sh (revision 126022)

+++ third_party/tcmalloc/chromium/src/tests/heap-checker-death_unittest.sh (working copy)

@@ -84,11 +84,11 @@

output="$TMPDIR/output"

ALARM $timeout env "$@" $EXE > "$output" 2>&1

actual_ec=$?

- ec_ok=`expr "$actual_ec" : "$expected_ec$" >/dev/null || echo false`

- matches_ok=`test -z "$expected_regexp" || \

- grep "$expected_regexp" "$output" >/dev/null 2>&1 || echo false`

- negmatches_ok=`test -z "$unexpected_regexp" || \

- ! grep "$unexpected_regexp" "$output" >/dev/null 2>&1 || echo false`

+ ec_ok=$(expr "$actual_ec" : "$expected_ec$" >/dev/null || echo false)

+ matches_ok=$(test -z "$expected_regexp" || \

+ grep -q "$expected_regexp" "$output" || echo false)

+ negmatches_ok=$(test -z "$unexpected_regexp" || \

+ ! grep -q "$unexpected_regexp" "$output" || echo false)

if $ec_ok && $matches_ok && $negmatches_ok; then

echo "PASS"

return 0 # 0: success