diff options
| author | rnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 17:50:45 +0000 |
|---|---|---|
| committer | rnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 17:50:45 +0000 |
| commit | 6a58bbae49e4580837cb973ec4334c569c9526b5 (patch) | |
| tree | 6498390907a123c6e6cfda51a222e14e98b5a7ef /tools/valgrind/chrome_tests.sh | |
| parent | acf190c79acbaa9266509f9a7e59406fae45599d (diff) | |
| download | chromium_src-6a58bbae49e4580837cb973ec4334c569c9526b5.zip chromium_src-6a58bbae49e4580837cb973ec4334c569c9526b5.tar.gz chromium_src-6a58bbae49e4580837cb973ec4334c569c9526b5.tar.bz2 | |
Make Timur's recent drmemory script changes work on Cygwin.
TBR=timurrrr@chromium.org
Review URL: http://codereview.chromium.org/8821027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.sh')
| -rwxr-xr-x | tools/valgrind/chrome_tests.sh | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tools/valgrind/chrome_tests.sh b/tools/valgrind/chrome_tests.sh index ec2545d..eaa70e0 100755 --- a/tools/valgrind/chrome_tests.sh +++ b/tools/valgrind/chrome_tests.sh @@ -62,19 +62,22 @@ fi if [ "$NEEDS_DRMEMORY" == "1" ] then - export DRMEMORY_PATH=$THISDIR/../../third_party/drmemory - export DRMEMORY_SFX=$DRMEMORY_PATH/drmemory-windows-sfx.exe - if [ ! -f "$DRMEMORY_SFX" ] + if [ -z "$DRMEMORY_COMMAND" ] then - echo "Can't find Dr. Memory executables." - echo "See http://www.chromium.org/developers/how-tos/using-valgrind/dr-memory" - echo "for the instructions on how to get them." - exit 1 - fi + DRMEMORY_PATH="$THISDIR/../../third_party/drmemory" + DRMEMORY_SFX="$DRMEMORY_PATH/drmemory-windows-sfx.exe" + if [ ! -f "$DRMEMORY_SFX" ] + then + echo "Can't find Dr. Memory executables." + echo "See http://www.chromium.org/developers/how-tos/using-valgrind/dr-memory" + echo "for the instructions on how to get them." + exit 1 + fi - chmod +x "$DRMEMORY_SFX" # Cygwin won't run it without +x. - "$DRMEMORY_SFX" -o"$DRMEMORY_PATH/unpacked" -y - export DRMEMORY_COMMAND=$DRMEMORY_PATH/unpacked/bin/drmemory.exe + chmod +x "$DRMEMORY_SFX" # Cygwin won't run it without +x. + "$DRMEMORY_SFX" -o"$DRMEMORY_PATH/unpacked" -y + export DRMEMORY_COMMAND="$DRMEMORY_PATH/unpacked/bin/drmemory.exe" + fi fi PYTHONPATH=$THISDIR/../python/google python \ |