Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Side by Side Diff: ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons

Issue 513273003: Drop NaCl support for posting stdout/stderr to JS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out documentation changes. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 20 matching lines...) Expand all
31 WriteManifestList)[0] 31 WriteManifestList)[0]
32 # Scons does not track the dependency of nmf_list_js on exe_list, so 32 # Scons does not track the dependency of nmf_list_js on exe_list, so
33 # we must always recreate nmf_list_js when it is used. 33 # we must always recreate nmf_list_js when it is used.
34 env.AlwaysBuild(nmf_list_js) 34 env.AlwaysBuild(nmf_list_js)
35 35
36 node = env.PPAPIBrowserTester( 36 node = env.PPAPIBrowserTester(
37 '%s.out' % test_name, url='test_runner.html', 37 '%s.out' % test_name, url='test_runner.html',
38 nmf_names=exe_list, 38 nmf_names=exe_list,
39 files=[env.File('test_runner.html')] + test_files, 39 files=[env.File('test_runner.html')] + test_files,
40 map_files=[('nmf_test_list.js', nmf_list_js)], 40 map_files=[('nmf_test_list.js', nmf_list_js)],
41 test_args=[('parallel', int(parallel))], 41 test_args=[('parallel', int(parallel))])
42 osenv=['NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage',
43 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'])
44 42
45 # Disabled on Valgrind because of multiple nexes. 43 # Disabled on Valgrind because of multiple nexes.
46 # TODO(eugenis): enable when Valgrind learns to autodetect the nexe name 44 # TODO(eugenis): enable when Valgrind learns to autodetect the nexe name
47 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name, 45 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name,
48 disable_irt_suffix=True, 46 disable_irt_suffix=True,
49 is_broken=env.PPAPIBrowserTesterIsBroken() or 47 is_broken=env.PPAPIBrowserTesterIsBroken() or
50 env.Bit('running_on_valgrind') or 48 env.Bit('running_on_valgrind') or
51 # inbrowser_test_runner_parallel is flaky on 32 bit windows 49 # inbrowser_test_runner_parallel is flaky on 32 bit windows
52 # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?) 50 # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?)
53 parallel) 51 parallel)
54 52
55 if not env.Bit('tests_use_irt'): 53 if not env.Bit('tests_use_irt'):
56 Return() 54 Return()
57 55
58 exe_list = env['TESTS_TO_RUN_INBROWSER'] 56 exe_list = env['TESTS_TO_RUN_INBROWSER']
59 AddTest(env, 'run_inbrowser_test_runner', exe_list, parallel=False) 57 AddTest(env, 'run_inbrowser_test_runner', exe_list, parallel=False)
60 AddTest(env, 'run_inbrowser_test_runner_parallel', exe_list, parallel=True) 58 AddTest(env, 'run_inbrowser_test_runner_parallel', exe_list, parallel=True)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698