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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/crash/nacl.scons

Issue 7778012: Landing chrome side of nacl change pre-dating ppapi switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 The Native Client 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 # Tests fatal errors that occur after loading. 6 # Tests fatal errors that occur after loading.
7 # (See ppapi_browser/bad for fatal errors that occur during loading). 7 # (See ppapi_browser/bad for fatal errors that occur during loading).
8 # 8 #
9 # The tests use ppapi_test_lib. 9 # The tests use ppapi_test_lib.
10 10
11 Import('env') 11 Import('env')
12 12
13 env.Prepend(CPPDEFINES=['XP_UNIX']) 13 env.Prepend(CPPDEFINES=['XP_UNIX'])
14 env.Replace(
15 TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/crash')
14 16
15 crash_types = ['via_check_failure', 'via_exit_call', 'in_callback'] 17 crash_types = ['via_check_failure', 'via_exit_call', 'in_callback']
16 published_files = [] 18 published_files = []
17 19
20 nmfs = []
18 for crash_type in crash_types: 21 for crash_type in crash_types:
19 nexe = 'ppapi_crash_%s_%s' % (crash_type, env.get('TARGET_FULLARCH')) 22 nexe = 'ppapi_crash_%s_%s' % (crash_type, env.get('TARGET_FULLARCH'))
20 env.Alias('ppapi_crash_%s${PROGSUFFIX}' % crash_type, 23 env.Alias('ppapi_crash_%s${PROGSUFFIX}' % crash_type,
21 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) 24 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
22 25
23 env.ComponentProgram( 26 env.ComponentProgram(
24 nexe, 27 nexe,
25 ['ppapi_crash_%s.cc' % crash_type], 28 ['ppapi_crash_%s.cc' % crash_type],
26 EXTRA_LIBS=['${PPAPI_LIBS}', 29 EXTRA_LIBS=['${PPAPI_LIBS}',
27 'ppapi_test_lib', 30 'ppapi_test_lib',
28 'platform', 31 'platform',
29 'pthread', 32 'pthread',
30 'gio']) 33 'gio'])
31 34
32 # TODO(polina): follow ppapi_browser/bad nacl.scons to publish html only once 35 # TODO(polina): follow ppapi_browser/bad nacl.scons to publish html only once
33 # and to associate all nexes and nmf files with one target that can be 36 # and to associate all nexes and nmf files with one target that can be
34 # referenced in tests/nacl.scons. 37 # referenced in tests/nacl.scons.
38 nmfs.append('${TEST_DIR}/ppapi_crash_%s.nmf' % crash_type)
35 env.Publish(nexe, 'run', 39 env.Publish(nexe, 'run',
36 ['ppapi_crash.html', 40 ['ppapi_crash.html'])
37 'ppapi_crash_%s.nmf' % crash_type ])
38 41
39 published_files.extend(env.ExtractPublishedFiles(nexe)) 42 published_files.extend(env.ExtractPublishedFiles(nexe))
40 43
41 node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out', 44 node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out',
42 url='ppapi_crash.html', 45 url='ppapi_crash.html',
46 nmf=nmfs,
43 files=published_files) 47 files=published_files)
44 48
45 env.AddNodeToTestSuite(node, 49 env.AddNodeToTestSuite(node,
46 ['chrome_browser_tests'], 50 ['chrome_browser_tests'],
47 'run_ppapi_crash_browser_test', 51 'run_ppapi_crash_browser_test',
48 is_broken=env.PPAPIBrowserTesterIsBroken()) 52 is_broken=env.PPAPIBrowserTesterIsBroken() or
53 env.Bit('nacl_glibc'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698