diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 13:00:17 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 13:00:17 +0000 |
| commit | 81e0a0d3472499b29be60d6a5c098c144c028904 (patch) | |
| tree | 6ce3fca8c149aae6e708e8b8bb3ae549bb5a29c6 /tools/valgrind/chrome_tests.sh | |
| parent | 84a997e1d76ef36efa761b8a193d0def4c8dcfe9 (diff) | |
| download | chromium_src-81e0a0d3472499b29be60d6a5c098c144c028904.zip chromium_src-81e0a0d3472499b29be60d6a5c098c144c028904.tar.gz chromium_src-81e0a0d3472499b29be60d6a5c098c144c028904.tar.bz2 | |
Revert the chrome_tests.sh changes until the Bash support in the buildsystem is fixed.
TBR=timurrrr
Review URL: http://codereview.chromium.org/7857034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.sh')
| -rwxr-xr-x | tools/valgrind/chrome_tests.sh | 68 |
1 files changed, 13 insertions, 55 deletions
diff --git a/tools/valgrind/chrome_tests.sh b/tools/valgrind/chrome_tests.sh index 2e86bf43..356a63e 100755 --- a/tools/valgrind/chrome_tests.sh +++ b/tools/valgrind/chrome_tests.sh @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/sh -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -8,60 +8,18 @@ export THISDIR=`dirname $0` -TOOL_OPTION=0 -NEEDS_VALGRIND=0 - -# We need to set CHROME_VALGRIND iff using Memcheck or TSan-Valgrind: -# tools/valgrind/chrome_tests.sh --tool memcheck -# or -# tools/valgrind/chrome_tests.sh --tool=memcheck -# (same for "--tool=tsan") -for flag in $@ -do - if [ "$flag" == "--tool" ] - then - TOOL_OPTION=1 - continue - elif [ "$flag" == "--tool=tsan" ] - then - NEEDS_VALGRIND=1 - break - elif [ "$flag" == "--tool=memcheck" ] - then - NEEDS_VALGRIND=1 - break - fi - if [ "$TOOL_OPTION" == "1" ] - then - if [ "$flag" == "memcheck" ] - then - NEEDS_VALGRIND=1 - break - elif [ "$flag" == "tsan" ] - then - NEEDS_VALGRIND=1 - break - else - TOOL_OPTION=0 - fi - fi -done - -if [ "$NEEDS_VALGRIND" == "1" ] +CHROME_VALGRIND=`sh $THISDIR/locate_valgrind.sh` +if [ "$CHROME_VALGRIND" = "" ] then - CHROME_VALGRIND=`sh $THISDIR/locate_valgrind.sh` - if [ "$CHROME_VALGRIND" = "" ] - then - # locate_valgrind.sh failed - exit 1 - fi - echo "Using valgrind binaries from ${CHROME_VALGRIND}" - - PATH="${CHROME_VALGRIND}/bin:$PATH" - # We need to set these variables to override default lib paths hard-coded into - # Valgrind binary. - export VALGRIND_LIB="$CHROME_VALGRIND/lib/valgrind" - export VALGRIND_LIB_INNER="$CHROME_VALGRIND/lib/valgrind" + # locate_valgrind.sh failed + exit 1 fi +echo "Using valgrind binaries from ${CHROME_VALGRIND}" + +PATH="${CHROME_VALGRIND}/bin:$PATH" +# We need to set these variables to override default lib paths hard-coded into +# Valgrind binary. +export VALGRIND_LIB="$CHROME_VALGRIND/lib/valgrind" +export VALGRIND_LIB_INNER="$CHROME_VALGRIND/lib/valgrind" PYTHONPATH=$THISDIR/../python/google "$THISDIR/chrome_tests.py" "$@" |