ThreadSanitizer and Dr Memory for Windows
Added new wrapper script webrtc_tests.bat for executing memory/threading tests on Windows. Updated webrtc_tests.sh to include modifications in chrome_tests.sh that has happened since we copied it. To setup TSAN for Windows, see http://www.chromium.org/developers/how-tos/using-valgrind/threadsanitizer I did like this: 1. Added "third_party/tsan": "http://src.chromium.org/chrome/trunk/deps/third_party/tsan" to custom_deps in my .gclient file 2. gclient sync 3. SET GYP_DEFINES=build_with_tool=tsan && gclient runhooks 4. Compiled. 5. Ran the test using the wrapper script (see below). To setup Dr Memory for Windows, see http://www.chromium.org/developers/how-tos/using-drmemory I did like this: 1. Added "third_party/drmemory": "http://src.chromium.org/svn/trunk/deps/third_party/drmemory", to custom_deps in my .gclient file (using the drmemory.DEPS as described on Chromium's wiki ends up in the wrong location) 2. gclient sync 3. SET GYP_DEFINES=build_with_tool=drmemory && gclient runhooks 4. Compiled. 5. Ran the test using the wrapper script (see below). TEST= On Windows: tools\valgrind-webrtc\webrtc_tests.bat --tool=tsan --test build\Debug\voice_engine_unittests.exe tools\valgrind-webrtc\webrtc_tests.bat --tool=drmemory_light --test build\Debug\voice_engine_unittests.exe tools\valgrind-webrtc\webrtc_tests.bat --tool=drmemory_full --test build\Debug\voice_engine_unittests.exe On Linux: tools/valgrind-webrtc/webrtc_tests.sh --tool=memcheck --test out/Release/test_support_unittests tools/valgrind-webrtc/webrtc_tests.sh --tool=tsan --test out/Release/test_support_unittests tools/valgrind-webrtc/webrtc_tests.sh --tool=asan --test out/Release/test_support_unittests Review URL: https://webrtc-codereview.appspot.com/845004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2846 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
parent
1101278a17
commit
d1e7a9a90c
79
tools/valgrind-webrtc/webrtc_tests.bat
Normal file
79
tools/valgrind-webrtc/webrtc_tests.bat
Normal file
@ -0,0 +1,79 @@
|
||||
@echo off
|
||||
:: Copyright (c) 2012 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.
|
||||
|
||||
:: This script is a copy of chrome_tests.bat with the following changes:
|
||||
:: - Invokes webrtc_tests.py instead of chrome_tests.py
|
||||
:: - Chromium's Valgrind scripts directory is added to the PYTHONPATH to make
|
||||
:: it possible to execute the Python scripts properly.
|
||||
|
||||
:: TODO(timurrrr): batch files 'export' all the variables to the parent shell
|
||||
set THISDIR=%~dp0
|
||||
set TOOL_NAME="unknown"
|
||||
|
||||
:: Get the tool name and put it into TOOL_NAME {{{1
|
||||
:: NB: SHIFT command doesn't modify %*
|
||||
:PARSE_ARGS_LOOP
|
||||
if %1 == () GOTO:TOOLNAME_NOT_FOUND
|
||||
if %1 == --tool GOTO:TOOLNAME_FOUND
|
||||
SHIFT
|
||||
goto :PARSE_ARGS_LOOP
|
||||
|
||||
:TOOLNAME_NOT_FOUND
|
||||
echo "Please specify a tool (tsan or drmemory) by using --tool flag"
|
||||
exit /B 1
|
||||
|
||||
:TOOLNAME_FOUND
|
||||
SHIFT
|
||||
set TOOL_NAME=%1
|
||||
:: }}}
|
||||
if "%TOOL_NAME%" == "drmemory" GOTO :SETUP_DRMEMORY
|
||||
if "%TOOL_NAME%" == "drmemory_light" GOTO :SETUP_DRMEMORY
|
||||
if "%TOOL_NAME%" == "drmemory_full" GOTO :SETUP_DRMEMORY
|
||||
if "%TOOL_NAME%" == "drmemory_pattern" GOTO :SETUP_DRMEMORY
|
||||
if "%TOOL_NAME%" == "tsan" GOTO :SETUP_TSAN
|
||||
echo "Unknown tool: `%TOOL_NAME%`! Only tsan and drmemory are supported."
|
||||
exit /B 1
|
||||
|
||||
:SETUP_DRMEMORY
|
||||
if NOT "%DRMEMORY_COMMAND%"=="" GOTO :RUN_TESTS
|
||||
:: Set up DRMEMORY_COMMAND to invoke Dr. Memory {{{1
|
||||
set DRMEMORY_PATH=%THISDIR%..\..\third_party\drmemory
|
||||
set DRMEMORY_SFX=%DRMEMORY_PATH%\drmemory-windows-sfx.exe
|
||||
if EXIST %DRMEMORY_SFX% GOTO DRMEMORY_BINARY_OK
|
||||
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 /B 1
|
||||
|
||||
:DRMEMORY_BINARY_OK
|
||||
%DRMEMORY_SFX% -o%DRMEMORY_PATH%\unpacked -y
|
||||
set DRMEMORY_COMMAND=%DRMEMORY_PATH%\unpacked\bin\drmemory.exe
|
||||
:: }}}
|
||||
goto :RUN_TESTS
|
||||
|
||||
:SETUP_TSAN
|
||||
:: Set up PIN_COMMAND to invoke TSan {{{1
|
||||
set TSAN_PATH=%THISDIR%..\..\third_party\tsan
|
||||
set TSAN_SFX=%TSAN_PATH%\tsan-x86-windows-sfx.exe
|
||||
if EXIST %TSAN_SFX% GOTO TSAN_BINARY_OK
|
||||
echo "Can't find ThreadSanitizer executables."
|
||||
echo "See http://www.chromium.org/developers/how-tos/using-valgrind/threadsanitizer/threadsanitizer-on-windows"
|
||||
echo "for the instructions on how to get them."
|
||||
exit /B 1
|
||||
|
||||
:TSAN_BINARY_OK
|
||||
%TSAN_SFX% -o%TSAN_PATH%\unpacked -y
|
||||
set PIN_COMMAND=%TSAN_PATH%\unpacked\tsan-x86-windows\tsan.bat
|
||||
:: }}}
|
||||
goto :RUN_TESTS
|
||||
|
||||
:RUN_TESTS
|
||||
set PYTHONPATH=%THISDIR%..\python\google;%THISDIR%..\valgrind
|
||||
set RUNNING_ON_VALGRIND=yes
|
||||
python %THISDIR%webrtc_tests.py %*
|
||||
@ -22,9 +22,9 @@ export THISDIR=`dirname $0`
|
||||
ARGV_COPY="$@"
|
||||
|
||||
# We need to set CHROME_VALGRIND iff using Memcheck or TSan-Valgrind:
|
||||
# tools/valgrind/chrome_tests.sh --tool memcheck
|
||||
# tools/valgrind-webrtc/webrtc_tests.sh --tool memcheck
|
||||
# or
|
||||
# tools/valgrind/chrome_tests.sh --tool=memcheck
|
||||
# tools/valgrind-webrtc/webrtc_tests.sh --tool=memcheck
|
||||
# (same for "--tool=tsan")
|
||||
tool="memcheck" # Default to memcheck.
|
||||
while (( "$#" ))
|
||||
@ -48,9 +48,14 @@ case "$tool" in
|
||||
NEEDS_VALGRIND=1
|
||||
;;
|
||||
"tsan" | "tsan_rv")
|
||||
NEEDS_VALGRIND=1
|
||||
if [ "`uname -s`" == CYGWIN* ]
|
||||
then
|
||||
NEEDS_PIN=1
|
||||
else
|
||||
NEEDS_VALGRIND=1
|
||||
fi
|
||||
;;
|
||||
"drmemory" | "drmemory_light" | "drmemory_full")
|
||||
"drmemory" | "drmemory_light" | "drmemory_full" | "drmemory_pattern")
|
||||
NEEDS_DRMEMORY=1
|
||||
;;
|
||||
esac
|
||||
@ -74,6 +79,16 @@ then
|
||||
# Valgrind binary.
|
||||
export VALGRIND_LIB="$CHROME_VALGRIND/lib/valgrind"
|
||||
export VALGRIND_LIB_INNER="$CHROME_VALGRIND/lib/valgrind"
|
||||
|
||||
# Clean up some /tmp directories that might be stale due to interrupted
|
||||
# chrome_tests.py execution.
|
||||
# FYI:
|
||||
# -mtime +1 <- only print files modified more than 24h ago,
|
||||
# -print0/-0 are needed to handle possible newlines in the filenames.
|
||||
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
|
||||
|
||||
if [ "$NEEDS_DRMEMORY" == "1" ]
|
||||
@ -96,6 +111,28 @@ then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$NEEDS_PIN" == "1" ]
|
||||
then
|
||||
if [ -z "$PIN_COMMAND" ]
|
||||
then
|
||||
# Set up PIN_COMMAND to invoke TSan.
|
||||
TSAN_PATH="$THISDIR/../../third_party/tsan"
|
||||
TSAN_SFX="$TSAN_PATH/tsan-x86-windows-sfx.exe"
|
||||
echo "$TSAN_SFX"
|
||||
if [ ! -f $TSAN_SFX ]
|
||||
then
|
||||
echo "Can't find ThreadSanitizer executables."
|
||||
echo "See http://www.chromium.org/developers/how-tos/using-valgrind/threadsanitizer/threadsanitizer-on-windows"
|
||||
echo "for the instructions on how to get them."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
chmod +x "$TSAN_SFX" # Cygwin won't run it without +x.
|
||||
"$TSAN_SFX" -o"$TSAN_PATH"/unpacked -y
|
||||
export PIN_COMMAND="$TSAN_PATH/unpacked/tsan-x86-windows/tsan.bat"
|
||||
fi
|
||||
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/../python/google:$CHROME_VALGRIND_SCRIPTS python \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user