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

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

Issue 14122010: NaCl: Enable untrusted hardware exception handling by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove env var Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 # Enable untrusted exception handling (for exception_test).
12 env['ENV']['NACL_UNTRUSTED_EXCEPTION_HANDLING'] = '1'
13
14 env.ComponentLibrary('testrunner_browser', ['test_runner_ppapi.c']) 11 env.ComponentLibrary('testrunner_browser', ['test_runner_ppapi.c'])
15 12
16 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html') 13 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html')
17 env.Replicate('$STAGING_DIR', 14 env.Replicate('$STAGING_DIR',
18 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js') 15 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js')
19 16
20 def AddTest(env, test_name, exe_list, parallel=False): 17 def AddTest(env, test_name, exe_list, parallel=False):
21 test_files = [env.File('${STAGING_DIR}/%s${PROGSUFFIX}' 18 test_files = [env.File('${STAGING_DIR}/%s${PROGSUFFIX}'
22 % env.ProgramNameForNmf(exe_name)) 19 % env.ProgramNameForNmf(exe_name))
23 for exe_name in exe_list] 20 for exe_name in exe_list]
(...skipping 30 matching lines...) Expand all
54 # inbrowser_test_runner_parallel is flaky on 32 bit windows 51 # inbrowser_test_runner_parallel is flaky on 32 bit windows
55 # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?) 52 # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?)
56 parallel) 53 parallel)
57 54
58 if not env.Bit('tests_use_irt'): 55 if not env.Bit('tests_use_irt'):
59 Return() 56 Return()
60 57
61 exe_list = env['TESTS_TO_RUN_INBROWSER'] 58 exe_list = env['TESTS_TO_RUN_INBROWSER']
62 AddTest(env, 'run_inbrowser_test_runner', exe_list, parallel=False) 59 AddTest(env, 'run_inbrowser_test_runner', exe_list, parallel=False)
63 AddTest(env, 'run_inbrowser_test_runner_parallel', exe_list, parallel=True) 60 AddTest(env, 'run_inbrowser_test_runner_parallel', exe_list, parallel=True)
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698