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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: tests/manifest_file/nacl.scons

Issue 7745047: Enable browser tests with glibc. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
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
« no previous file with comments | « tests/manifest_file/irt_manifest_file_test.html ('k') | tests/manifest_file/pm_manifest_file.nmf » ('j') | 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) 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 Import('env') 6 Import('env')
7 7
8 srpc_mf_obj = env.ComponentObject('srpc_manifest_file_test.o', 8 srpc_mf_obj = env.ComponentObject('srpc_manifest_file_test.o',
9 'srpc_manifest_file_test.c') 9 'srpc_manifest_file_test.c')
10 srpc_mf_nexe_name = 'srpc_manifest_file_test_%s' % env.get('TARGET_FULLARCH') 10 srpc_mf_nexe_name = 'srpc_manifest_file_test_%s' % env.get('TARGET_FULLARCH')
11 srpc_mf_nexe = env.ComponentProgram(srpc_mf_nexe_name, 11 srpc_mf_nexe = env.ComponentProgram(srpc_mf_nexe_name,
12 srpc_mf_obj, 12 srpc_mf_obj,
13 EXTRA_LIBS=[ 13 EXTRA_LIBS=[
14 'srpc', 14 'srpc',
15 'platform', 15 'platform',
16 'gio', 16 'gio',
17 'imc', 17 'imc',
18 'imc_syscalls', 18 'imc_syscalls',
19 '${PTHREAD_LIBS}', 19 '${PTHREAD_LIBS}',
20 '${NON_PPAPI_BROWSER_LIBS}']) 20 '${NON_PPAPI_BROWSER_LIBS}'])
21 env.Publish(srpc_mf_nexe_name, 'run', 21 env.Publish(srpc_mf_nexe_name, 'run',
22 ['srpc_manifest_file_test.html', 22 ['srpc_manifest_file_test.html', 'test_file.txt'])
23 'srpc_manifest_file.nmf'])
24 23
25 # chrome_browser_tests 24 # chrome_browser_tests
26 25
27 node = env.PPAPIBrowserTester( 26 node = env.PPAPIBrowserTester(
28 'srpc_mf_browser_test.out', 27 'srpc_mf_browser_test.out',
29 url='srpc_manifest_file_test.html', 28 url='srpc_manifest_file_test.html',
29 nmfs=['srpc_manifest_file.nmf'],
30 files=env.ExtractPublishedFiles(srpc_mf_nexe_name), 30 files=env.ExtractPublishedFiles(srpc_mf_nexe_name),
31 args=['--debug', '--enable_experimental_js'], 31 args=['--debug', '--enable_experimental_js'],
32 # osenv=['NACLVERBOSITY=4'] 32 # osenv=['NACLVERBOSITY=4']
33 ) 33 )
34 34
35 env.AddNodeToTestSuite(node, 35 env.AddNodeToTestSuite(node,
36 ['chrome_browser_tests'], 36 ['chrome_browser_tests'],
37 'run_srpc_manifest_file_chrome_browser_test', 37 'run_srpc_manifest_file_chrome_browser_test',
38 is_broken=env.PPAPIBrowserTesterIsBroken()) 38 is_broken=env.PPAPIBrowserTesterIsBroken() or
39 env.Bit('nacl_glibc'))
39 40
40 # post message version 41 # post message version
41 42
42 pm_mf_obj = env.ComponentObject('pm_manifest_file_test.o', 43 pm_mf_obj = env.ComponentObject('pm_manifest_file_test.o',
43 'pm_manifest_file_test.cc') 44 'pm_manifest_file_test.cc')
44 pm_mf_nexe_name = 'pm_manifest_file_test_%s' % env.get('TARGET_FULLARCH') 45 pm_mf_nexe_name = 'pm_manifest_file_test_%s' % env.get('TARGET_FULLARCH')
45 pm_mf_nexe = env.ComponentProgram(pm_mf_nexe_name, 46 pm_mf_nexe = env.ComponentProgram(pm_mf_nexe_name,
46 pm_mf_obj, 47 pm_mf_obj,
47 EXTRA_LIBS=['nacl_ppapi_util', 48 EXTRA_LIBS=['nacl_ppapi_util',
48 'weak_ref', 49 'weak_ref',
49 'ppapi_cpp', 50 'ppapi_cpp',
50 '${PPAPI_LIBS}', 51 '${PPAPI_LIBS}',
51 'pthread', 52 'pthread',
52 'srpc', 53 'srpc',
53 'platform', 54 'platform',
54 'gio', 55 'gio',
55 'imc', 56 'imc',
56 'imc_syscalls', 57 'imc_syscalls',
57 ]) 58 ])
58 env.Publish(pm_mf_nexe_name, 'run', 59 env.Publish(pm_mf_nexe_name, 'run',
59 ['pm_manifest_file_test.html', 60 ['pm_manifest_file_test.html', 'test_file.txt'])
60 'pm_manifest_file.nmf'])
61 61
62 # chrome_browser_tests 62 # chrome_browser_tests
63 63
64 node = env.PPAPIBrowserTester( 64 node = env.PPAPIBrowserTester(
65 'pm_mf_browser_test.out', 65 'pm_mf_browser_test.out',
66 url='pm_manifest_file_test.html', 66 url='pm_manifest_file_test.html',
67 nmfs=['pm_manifest_file.nmf'],
67 files=env.ExtractPublishedFiles(pm_mf_nexe_name), 68 files=env.ExtractPublishedFiles(pm_mf_nexe_name),
68 args=['--debug'], 69 args=['--debug'],
69 # osenv=['NACLVERBOSITY=4,pp_weak_ref=4,weak_ref=4'] 70 # osenv=['NACLVERBOSITY=4,pp_weak_ref=4,weak_ref=4']
70 ) 71 )
71 72
72 env.AddNodeToTestSuite(node, 73 env.AddNodeToTestSuite(node,
73 ['chrome_browser_tests'], 74 ['chrome_browser_tests'],
74 'run_pm_manifest_file_chrome_browser_test', 75 'run_pm_manifest_file_chrome_browser_test',
75 is_broken=env.PPAPIBrowserTesterIsBroken()) 76 is_broken=env.PPAPIBrowserTesterIsBroken() or
77 env.Bit('nacl_glibc'))
76 78
77 79
78 # post message, pre-init version 80 # post message, pre-init version
79 81
80 pm_pi_mf_obj = env.ComponentObject('pm_pre_init_manifest_file_test.o', 82 pm_pi_mf_obj = env.ComponentObject('pm_pre_init_manifest_file_test.o',
81 'pm_pre_init_manifest_file_test.cc') 83 'pm_pre_init_manifest_file_test.cc')
82 pm_pi_mf_nexe_name = ('pm_pre_init_manifest_file_test_%s' 84 pm_pi_mf_nexe_name = ('pm_pre_init_manifest_file_test_%s'
83 % env.get('TARGET_FULLARCH')) 85 % env.get('TARGET_FULLARCH'))
84 pm_pi_mf_nexe = env.ComponentProgram(pm_pi_mf_nexe_name, 86 pm_pi_mf_nexe = env.ComponentProgram(pm_pi_mf_nexe_name,
85 pm_pi_mf_obj, 87 pm_pi_mf_obj,
86 EXTRA_LIBS=['nacl_ppapi_util', 88 EXTRA_LIBS=['nacl_ppapi_util',
87 'weak_ref', 89 'weak_ref',
88 'ppapi_cpp', 90 'ppapi_cpp',
89 '${PPAPI_LIBS}', 91 '${PPAPI_LIBS}',
90 'pthread', 92 'pthread',
91 'srpc', 93 'srpc',
92 'platform', 94 'platform',
93 'gio', 95 'gio',
94 'imc', 96 'imc',
95 'imc_syscalls', 97 'imc_syscalls',
96 ]) 98 ])
97 env.Publish(pm_pi_mf_nexe_name, 'run', 99 env.Publish(pm_pi_mf_nexe_name, 'run',
98 ['pm_pre_init_manifest_file_test.html', 100 ['pm_pre_init_manifest_file_test.html', 'test_file.txt'])
99 'pm_pre_init_manifest_file.nmf'])
100 101
101 # chrome_browser_tests 102 # chrome_browser_tests
102 103
103 node = env.PPAPIBrowserTester( 104 node = env.PPAPIBrowserTester(
104 'pm_pi_mf_browser_test.out', 105 'pm_pi_mf_browser_test.out',
105 url='pm_pre_init_manifest_file_test.html', 106 url='pm_pre_init_manifest_file_test.html',
107 nmfs=['pm_pre_init_manifest_file.nmf'],
106 files=env.ExtractPublishedFiles(pm_pi_mf_nexe_name), 108 files=env.ExtractPublishedFiles(pm_pi_mf_nexe_name),
107 args=['--debug'], 109 args=['--debug'],
108 # osenv=['NACLVERBOSITY=4,pp_weak_ref=4,weak_ref=4'] 110 # osenv=['NACLVERBOSITY=4,pp_weak_ref=4,weak_ref=4']
109 ) 111 )
110 112
111 if not env.Bit('irt'): 113 if not env.Bit('irt'):
112 env.AddNodeToTestSuite(node, 114 env.AddNodeToTestSuite(node,
113 ['chrome_browser_tests'], 115 ['chrome_browser_tests'],
114 'run_pm_pi_manifest_file_chrome_browser_test', 116 'run_pm_pi_manifest_file_chrome_browser_test',
115 is_broken=env.PPAPIBrowserTesterIsBroken()) 117 is_broken=env.PPAPIBrowserTesterIsBroken() or
118 env.Bit('nacl_glibc'))
116 else: 119 else:
117 # This test cannot be built under irt=0 because it uses __nacl_irt_query, 120 # This test cannot be built under irt=0 because it uses __nacl_irt_query,
118 # which is not available in the private libraries. 121 # which is not available in the private libraries.
119 irt_mf_nexe_name = 'irt_manifest_file_test_%s' % env.get('TARGET_FULLARCH') 122 irt_mf_nexe_name = 'irt_manifest_file_test_%s' % env.get('TARGET_FULLARCH')
120 irt_mf_nexe = env.ComponentProgram(irt_mf_nexe_name, 123 irt_mf_nexe = env.ComponentProgram(irt_mf_nexe_name,
121 'irt_manifest_file_test.cc', 124 'irt_manifest_file_test.cc',
122 EXTRA_LIBS=['nacl_ppapi_util', 125 EXTRA_LIBS=['nacl_ppapi_util',
123 'weak_ref', 126 'weak_ref',
124 'ppapi_cpp', 127 'ppapi_cpp',
125 '${PPAPI_LIBS}', 128 '${PPAPI_LIBS}',
126 'pthread', 129 'pthread',
127 'srpc', 130 'srpc',
128 'platform', 131 'platform',
129 'gio', 132 'gio',
130 'imc', 133 'imc',
131 'imc_syscalls', 134 'imc_syscalls',
132 'nacl', 135 'nacl',
133 ]) 136 ])
134 env.Publish(irt_mf_nexe_name, 'run', 137 env.Publish(irt_mf_nexe_name, 'run',
135 ['irt_manifest_file_test.html', 138 ['irt_manifest_file_test.html', 'test_file.txt'])
136 'irt_manifest_file.nmf'])
137 node = env.PPAPIBrowserTester( 139 node = env.PPAPIBrowserTester(
138 'irt_mf_browser_test.out', 140 'irt_mf_browser_test.out',
139 url='irt_manifest_file_test.html', 141 url='irt_manifest_file_test.html',
142 nmfs=['irt_manifest_file.nmf'],
140 files=env.ExtractPublishedFiles(irt_mf_nexe_name), 143 files=env.ExtractPublishedFiles(irt_mf_nexe_name),
141 args=['--debug'], 144 args=['--debug'],
142 ) 145 )
143 env.AddNodeToTestSuite(node, 146 env.AddNodeToTestSuite(node,
144 ['chrome_browser_tests'], 147 ['chrome_browser_tests'],
145 'run_irt_manifest_file_chrome_browser_test', 148 'run_irt_manifest_file_chrome_browser_test',
146 is_broken=env.PPAPIBrowserTesterIsBroken()) 149 is_broken=env.PPAPIBrowserTesterIsBroken() or
150 env.Bit('nacl_glibc'))
OLDNEW
« no previous file with comments | « tests/manifest_file/irt_manifest_file_test.html ('k') | tests/manifest_file/pm_manifest_file.nmf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698