Roll chromium_revision b032878ebd..e438353b8b (480186:480311)

tools_webrtc/valgrind/webrtc_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 37 matching lines @@
     NEEDS_VALGRIND=1
     ;;
 esac
 
 # For WebRTC, we'll use the locate_valgrind.sh script in Chromium's Valgrind
 # scripts dir to locate the Valgrind framework install
 CHROME_VALGRIND_SCRIPTS=$THISDIR/../../tools/valgrind
 
 if [ "$NEEDS_VALGRIND" == "1" ]
 then
-  CHROME_VALGRIND=`sh $CHROME_VALGRIND_SCRIPTS/locate_valgrind.sh`
+  CHROME_VALGRIND=`sh $THISDIR/locate_valgrind.sh`
   if [ "$CHROME_VALGRIND" = "" ]
   then
     CHROME_VALGRIND=../../src/third_party/valgrind/linux_x64
     echo
     echo "-------------------- WARNING ------------------------"
     echo "locate_valgrind.sh failed."
     echo "Using $CHROME_VALGRIND as a fallback location."
     echo "This might be because:"
     echo "1) This is a swarming bot"
     echo "2) You haven't set up the valgrind binaries correctly."
@@ skipping 24 matching lines @@
   echo "Cleanup /tmp from Valgrind stuff"
   find /tmp -maxdepth 1 \(\
         -name "vgdb-pipe-*" -or -name "vg_logs_*" -or -name "valgrind.*" \
       \) -mtime +1 -print0 | xargs -0 rm -rf
 fi
 
 # Add Chrome's Valgrind scripts dir to the PYTHON_PATH since it contains
 # the scripts that are needed for this script to run
 PYTHONPATH=$THISDIR/../../tools/python/google:$CHROME_VALGRIND_SCRIPTS python \
            "$THISDIR/webrtc_tests.py" $ARGV_COPY