OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import json | 6 import json |
7 import posixpath | 7 import posixpath |
8 | 8 |
9 Import('env') | 9 Import('env') |
10 | 10 |
(...skipping 30 matching lines...) Expand all Loading... |
41 nmf_names=exe_list, | 41 nmf_names=exe_list, |
42 files=[env.File('test_runner.html')] + test_files, | 42 files=[env.File('test_runner.html')] + test_files, |
43 map_files=[('nmf_test_list.js', nmf_list_js)], | 43 map_files=[('nmf_test_list.js', nmf_list_js)], |
44 test_args=[('parallel', int(parallel))], | 44 test_args=[('parallel', int(parallel))], |
45 osenv=['NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage', | 45 osenv=['NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage', |
46 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage']) | 46 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage']) |
47 | 47 |
48 # Disabled on Valgrind because of multiple nexes. | 48 # Disabled on Valgrind because of multiple nexes. |
49 # TODO(eugenis): enable when Valgrind learns to autodetect the nexe name | 49 # TODO(eugenis): enable when Valgrind learns to autodetect the nexe name |
50 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name, | 50 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name, |
51 disable_irt_suffix=True, | |
52 is_broken=env.PPAPIBrowserTesterIsBroken() or | 51 is_broken=env.PPAPIBrowserTesterIsBroken() or |
53 env.Bit('running_on_valgrind') or | 52 env.Bit('running_on_valgrind') or |
54 # inbrowser_test_runner_parallel is flaky on 32 bit windows | 53 # inbrowser_test_runner_parallel is flaky on 32 bit windows |
55 # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?) | 54 # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?) |
56 parallel) | 55 parallel) |
57 | 56 |
58 if not env.Bit('tests_use_irt'): | 57 if not env.Bit('tests_use_irt'): |
59 Return() | 58 Return() |
60 | 59 |
61 exe_list = env['TESTS_TO_RUN_INBROWSER'] | 60 exe_list = env['TESTS_TO_RUN_INBROWSER'] |
62 AddTest(env, 'run_inbrowser_test_runner', exe_list, parallel=False) | 61 AddTest(env, 'run_inbrowser_test_runner', exe_list, parallel=False) |
63 AddTest(env, 'run_inbrowser_test_runner_parallel', exe_list, parallel=True) | 62 AddTest(env, 'run_inbrowser_test_runner_parallel', exe_list, parallel=True) |
OLD | NEW |