| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from master.factory import chromium_factory | 5 from master.factory import chromium_factory |
| 6 from master.factory import gclient_factory | 6 from master.factory import gclient_factory |
| 7 from master.factory import chromium_commands | 7 from master.factory import chromium_commands |
| 8 | 8 |
| 9 import config | 9 import config |
| 10 | 10 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 # Get the factory command object to create new steps to the factory. | 66 # Get the factory command object to create new steps to the factory. |
| 67 cmds = chromium_commands.ChromiumCommands(factory, target, self._build_dir, | 67 cmds = chromium_commands.ChromiumCommands(factory, target, self._build_dir, |
| 68 self._target_platform) | 68 self._target_platform) |
| 69 # Override test runner script paths with our own that can run any test and | 69 # Override test runner script paths with our own that can run any test and |
| 70 # have our suppressions configured. | 70 # have our suppressions configured. |
| 71 valgrind_script_path = cmds.PathJoin('src', 'tools', 'valgrind-webrtc') | 71 valgrind_script_path = cmds.PathJoin('src', 'tools', 'valgrind-webrtc') |
| 72 cmds._posix_memory_tests_runner = cmds.PathJoin(valgrind_script_path, | 72 cmds._posix_memory_tests_runner = cmds.PathJoin(valgrind_script_path, |
| 73 'webrtc_tests.sh') | 73 'webrtc_tests.sh') |
| 74 cmds._win_memory_tests_runner = cmds.PathJoin(valgrind_script_path, | 74 cmds._win_memory_tests_runner = cmds.PathJoin(valgrind_script_path, |
| 75 'webrtc_tests.bat') | 75 'webrtc_tests.bat') |
| 76 # Add tests. | 76 cmds.AddWebRTCTests(tests, factory_properties) |
| 77 gyp_defines = factory_properties['gclient_env'].get('GYP_DEFINES', '') | |
| 78 for test in tests: | |
| 79 if 'build_for_tool=memcheck' in gyp_defines: | |
| 80 cmds.AddMemoryTest(test, 'memcheck', | |
| 81 factory_properties=factory_properties) | |
| 82 elif 'build_for_tool=tsan' in gyp_defines: | |
| 83 cmds.AddMemoryTest(test, 'tsan', factory_properties=factory_properties) | |
| 84 else: | |
| 85 cmds.AddAnnotatedGTestTestStep(test, factory_properties) | |
| 86 return factory | 77 return factory |
| OLD | NEW |