diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-08 21:56:42 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-08 21:56:42 +0000 |
| commit | 26788a65a7f9094a0acd44ea69c3cdbea5b1f498 (patch) | |
| tree | 86157cd8ec540bf1d7a606df77f46abbbef86121 /tools/valgrind/chrome_tests.py | |
| parent | 0d5a3df2a5d0b89305bbad7c0efe8532e1cccb40 (diff) | |
| download | chromium_src-26788a65a7f9094a0acd44ea69c3cdbea5b1f498.zip chromium_src-26788a65a7f9094a0acd44ea69c3cdbea5b1f498.tar.gz chromium_src-26788a65a7f9094a0acd44ea69c3cdbea5b1f498.tar.bz2 | |
wine_valgrind: Use common Valgrind scripts to run Wine/Valgrind tests.
Use test and valgrind suppressions from the same locations as the other valgrind bots.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/561045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index b62fdf7..c94aa77 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -124,15 +124,19 @@ class ChromeTests: self._data_dirs.append(os.path.join(module_dir, "data", "valgrind")) if not self._options.build_dir: - dirs = [ - os.path.join(self._source_dir, "xcodebuild", "Debug"), - os.path.join(self._source_dir, "sconsbuild", "Debug"), - os.path.join(self._source_dir, "out", "Debug"), - ] - if exe: - self._options.build_dir = FindDirContainingNewestFile(dirs, exe) + if common.IsWine(): + self._options.build_dir = os.path.join( + self._source_dir, "chrome", "Debug") else: - self._options.build_dir = FindNewestDir(dirs) + dirs = [ + os.path.join(self._source_dir, "xcodebuild", "Debug"), + os.path.join(self._source_dir, "sconsbuild", "Debug"), + os.path.join(self._source_dir, "out", "Debug"), + ] + if exe: + self._options.build_dir = FindDirContainingNewestFile(dirs, exe) + else: + self._options.build_dir = FindNewestDir(dirs) cmd = list(self._command_preamble) for directory in self._data_dirs: @@ -156,6 +160,9 @@ class ChromeTests: for arg in valgrind_test_args: cmd.append(arg) if exe: + if common.IsWine(): + cmd.append(os.environ.get('WINE')) + exe = exe + '.exe' cmd.append(os.path.join(self._options.build_dir, exe)) # Valgrind runs tests slowly, so slow tests hurt more; show elapased time # so we can find the slowpokes. |