diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 20:31:16 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 20:31:16 +0000 |
| commit | d8d5b28057e44f43826c04bce419af560d34d378 (patch) | |
| tree | 3065caf409cda05280b314fe04e8107d19db8611 /tools/valgrind | |
| parent | 1dbafaf7d28dfe0961f1ad2df46bfd85f2e78e92 (diff) | |
| download | chromium_src-d8d5b28057e44f43826c04bce419af560d34d378.zip chromium_src-d8d5b28057e44f43826c04bce419af560d34d378.tar.gz chromium_src-d8d5b28057e44f43826c04bce419af560d34d378.tar.bz2 | |
Make valgrind.sh and chrome_tests.sh actually find valgrind-10880-redzone
(oops)
Also say which valgrind is being used
Review URL: http://codereview.chromium.org/233003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind')
| -rwxr-xr-x | tools/valgrind/chrome_tests.sh | 6 | ||||
| -rwxr-xr-x | tools/valgrind/valgrind.sh | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tools/valgrind/chrome_tests.sh b/tools/valgrind/chrome_tests.sh index 3371fcd..6fe4bc5 100755 --- a/tools/valgrind/chrome_tests.sh +++ b/tools/valgrind/chrome_tests.sh @@ -12,10 +12,9 @@ if test x"$CHROME_VALGRIND_BIN" = x then # Figure out which valgrind is installed. Use most recent one. # See build-valgrind-for-chromium.sh and its history for these constants. - for SVNREV in '10880-redzone' '10880' '10771' '{2009-07-15}' + for SVNREV in '10880-redzone' '10880' '10771' '20090715' do - SHORTSVNREV=`echo $SVNREV | tr -d '{\-}'` - CHROME_VALGRIND_BIN=/usr/local/valgrind-$SHORTSVNREV/bin + CHROME_VALGRIND_BIN=/usr/local/valgrind-$SVNREV/bin test -x $CHROME_VALGRIND_BIN/valgrind && break done fi @@ -26,6 +25,7 @@ then echo "Please run build-valgrind-for-chromium.sh or set CHROME_VALGRIND_BIN." exit 1 fi +echo "Using ${CHROME_VALGRIND_BIN}/valgrind" PATH="${CHROME_VALGRIND_BIN}:$PATH" export THISDIR=`dirname $0` diff --git a/tools/valgrind/valgrind.sh b/tools/valgrind/valgrind.sh index 3f4c07e..ebc1098 100755 --- a/tools/valgrind/valgrind.sh +++ b/tools/valgrind/valgrind.sh @@ -72,10 +72,9 @@ if test x"$CHROME_VALGRIND_BIN" = x then # Figure out which valgrind is installed. Use most recent one. # See build-valgrind-for-chromium.sh and its history for these constants. - for SVNREV in '10880' '10771' '{2009-07-15}' + for SVNREV in 10880-redzone 10880 10771 20090715 do - SHORTSVNREV=`echo $SVNREV | tr -d '{\-}'` - CHROME_VALGRIND_BIN=/usr/local/valgrind-$SHORTSVNREV/bin + CHROME_VALGRIND_BIN=/usr/local/valgrind-$SVNREV/bin test -x $CHROME_VALGRIND_BIN/valgrind && break done fi |