| OLD | NEW |
| 1 #!/bin/sh | 1 #!/bin/sh |
| 2 | 2 |
| 3 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # Select the valgrind built by build-valgrind-for-chromium.sh by default, | 7 # Select the valgrind built by build-valgrind-for-chromium.sh by default, |
| 8 # but allow users to override this default without editing scripts and | 8 # but allow users to override this default without editing scripts and |
| 9 # without specifying a commandline option | 9 # without specifying a commandline option |
| 10 | 10 |
| 11 if test x"$CHROME_VALGRIND_BIN" = x | 11 if test x"$CHROME_VALGRIND_BIN" = x |
| 12 then | 12 then |
| 13 # Figure out which valgrind is installed. Use most recent one. | 13 # Figure out which valgrind is installed. Use most recent one. |
| 14 # See build-valgrind-for-chromium.sh and its history for these constants. | 14 # See build-valgrind-for-chromium.sh and its history for these constants. |
| 15 for SVNREV in '10880' '10771' '{2009-07-15}' | 15 for SVNREV in '10880-redzone' '10880' '10771' '{2009-07-15}' |
| 16 do | 16 do |
| 17 SHORTSVNREV=`echo $SVNREV | tr -d '{\-}'` | 17 SHORTSVNREV=`echo $SVNREV | tr -d '{\-}'` |
| 18 CHROME_VALGRIND_BIN=/usr/local/valgrind-$SHORTSVNREV/bin | 18 CHROME_VALGRIND_BIN=/usr/local/valgrind-$SHORTSVNREV/bin |
| 19 test -x $CHROME_VALGRIND_BIN/valgrind && break | 19 test -x $CHROME_VALGRIND_BIN/valgrind && break |
| 20 done | 20 done |
| 21 fi | 21 fi |
| 22 | 22 |
| 23 if ! test -x $CHROME_VALGRIND_BIN/valgrind | 23 if ! test -x $CHROME_VALGRIND_BIN/valgrind |
| 24 then | 24 then |
| 25 echo "Could not find chromium's version of valgrind." | 25 echo "Could not find chromium's version of valgrind." |
| 26 echo "Please run build-valgrind-for-chromium.sh or set CHROME_VALGRIND_BIN." | 26 echo "Please run build-valgrind-for-chromium.sh or set CHROME_VALGRIND_BIN." |
| 27 exit 1 | 27 exit 1 |
| 28 fi | 28 fi |
| 29 PATH="${CHROME_VALGRIND_BIN}:$PATH" | 29 PATH="${CHROME_VALGRIND_BIN}:$PATH" |
| 30 | 30 |
| 31 export THISDIR=`dirname $0` | 31 export THISDIR=`dirname $0` |
| 32 PYTHONPATH=$THISDIR/../../webkit/tools/layout_tests/:$THISDIR/../purify:$THISDIR
/../python "$THISDIR/chrome_tests.py" "$@" | 32 PYTHONPATH=$THISDIR/../../webkit/tools/layout_tests/:$THISDIR/../purify:$THISDIR
/../python "$THISDIR/chrome_tests.py" "$@" |
| OLD | NEW |