| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 # Get the factory command object to create new steps to the factory. | 75 # Get the factory command object to create new steps to the factory. |
| 76 cmds = chromium_commands.ChromiumCommands(factory, target, self._build_dir, | 76 cmds = chromium_commands.ChromiumCommands(factory, target, self._build_dir, |
| 77 self._target_platform) | 77 self._target_platform) |
| 78 # Override test runner script paths with our own that can run any test and | 78 # Override test runner script paths with our own that can run any test and |
| 79 # have our suppressions configured. | 79 # have our suppressions configured. |
| 80 valgrind_script_path = cmds.PathJoin('src', 'tools', 'valgrind-webrtc') | 80 valgrind_script_path = cmds.PathJoin('src', 'tools', 'valgrind-webrtc') |
| 81 cmds._posix_memory_tests_runner = cmds.PathJoin(valgrind_script_path, | 81 cmds._posix_memory_tests_runner = cmds.PathJoin(valgrind_script_path, |
| 82 'webrtc_tests.sh') | 82 'webrtc_tests.sh') |
| 83 cmds._win_memory_tests_runner = cmds.PathJoin(valgrind_script_path, | 83 cmds._win_memory_tests_runner = cmds.PathJoin(valgrind_script_path, |
| 84 'webrtc_tests.bat') | 84 'webrtc_tests.bat') |
| 85 # Add tests. | 85 cmds.AddWebRTCTests(tests, factory_properties) |
| 86 gyp_defines = factory_properties['gclient_env'].get('GYP_DEFINES', '') | |
| 87 for test in tests: | |
| 88 if 'build_for_tool=memcheck' in gyp_defines: | |
| 89 cmds.AddMemoryTest(test, 'memcheck', | |
| 90 factory_properties=factory_properties) | |
| 91 elif 'build_for_tool=tsan' in gyp_defines: | |
| 92 cmds.AddMemoryTest(test, 'tsan', factory_properties=factory_properties) | |
| 93 else: | |
| 94 cmds.AddAnnotatedGTestTestStep(test, factory_properties) | |
| 95 return factory | 86 return factory |
| OLD | NEW |