OLD | NEW |
---|---|
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2014 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 if not env.Bit('bitcode'): | 8 if not env.Bit('bitcode'): |
9 Return() | 9 Return() |
10 # Translating the PSO to an ELF DSO doesn't work on x86-64 yet. The | 10 # Translating the PSO to an ELF DSO doesn't work on x86-64 yet. The |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
136 pll_loader_test = env.ComponentProgram( | 136 pll_loader_test = env.ComponentProgram( |
137 'pll_loader_test', ['pll_loader_test.cc'], | 137 'pll_loader_test', ['pll_loader_test.cc'], |
138 EXTRA_LIBS=['${NONIRT_LIBS}', 'pll_loader_lib']) | 138 EXTRA_LIBS=['${NONIRT_LIBS}', 'pll_loader_lib']) |
139 | 139 |
140 node = env.CommandSelLdrTestNacl( | 140 node = env.CommandSelLdrTestNacl( |
141 'pll_loader_test.out', pll_loader_test, | 141 'pll_loader_test.out', pll_loader_test, |
142 [Dir('.').abspath, 'test_pll_a.so', 'test_pll_b.so', 'test_pll_tls.so'], | 142 [Dir('.').abspath, 'test_pll_a.so', 'test_pll_b.so', 'test_pll_tls.so'], |
143 # Add '-a' to enable filesystem access for opening DSOs. | 143 # Add '-a' to enable filesystem access for opening DSOs. |
144 sel_ldr_flags=['-a'], | 144 sel_ldr_flags=['-a'], |
145 extra_deps=[test_pll_a, test_pll_b, test_pll_tls, test_pll_tls_dependency]) | 145 extra_deps=[test_pll_a, test_pll_b, test_pll_tls, test_pll_tls_dependency]) |
146 # TODO: Fix on arm panda hardware. | |
147 on_arm_hw = not env.Bit('running_on_vm') and env.Bit('build_arm') | |
Mark Seaborn
2016/10/15 00:16:29
I'm pretty sure running_on_vm is not what you want
| |
146 env.AddNodeToTestSuite( | 148 env.AddNodeToTestSuite( |
147 node, ['small_tests', 'toolchain_tests'], | 149 node, ['small_tests', 'toolchain_tests'], |
148 'run_pll_loader_test', is_broken=is_broken) | 150 'run_pll_loader_test', is_broken=is_broken or on_arm_hw) |
149 | 151 |
150 | 152 |
151 pll_libc_nonfinal = env.Command( | 153 pll_libc_nonfinal = env.Command( |
152 'libc${OBJSUFFIX}', | 154 'libc${OBJSUFFIX}', |
153 # libnacl should come first so that it can override definitions in libc. | 155 # libnacl should come first so that it can override definitions in libc. |
154 [env.File('${LIB_DIR}/libnacl.a'), | 156 [env.File('${LIB_DIR}/libnacl.a'), |
155 env.File('${NACL_SDK_LIB}/libc.a'), | 157 env.File('${NACL_SDK_LIB}/libc.a'), |
156 env.ComponentObject('libc_entry.c')], | 158 env.ComponentObject('libc_entry.c')], |
157 '${CC} -shared -Wl,--whole-archive -Wl,--allow-multiple-definition ' + | 159 '${CC} -shared -Wl,--whole-archive -Wl,--allow-multiple-definition ' + |
158 '${SOURCES} -o ${TARGET}') | 160 '${SOURCES} -o ${TARGET}') |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
195 node = env.CommandSelLdrTestNacl( | 197 node = env.CommandSelLdrTestNacl( |
196 'pll_dependencies_test.out', pll_loader, | 198 'pll_dependencies_test.out', pll_loader, |
197 [Dir('.').abspath, pll_dependencies_test], | 199 [Dir('.').abspath, pll_dependencies_test], |
198 # Add '-a' to enable filesystem access for opening DSOs. | 200 # Add '-a' to enable filesystem access for opening DSOs. |
199 sel_ldr_flags=['-a'], | 201 sel_ldr_flags=['-a'], |
200 extra_deps=[pll_libc, test_pll_a, test_pll_b, test_pll_c, | 202 extra_deps=[pll_libc, test_pll_a, test_pll_b, test_pll_c, |
201 pll_dependencies_test]) | 203 pll_dependencies_test]) |
202 env.AddNodeToTestSuite( | 204 env.AddNodeToTestSuite( |
203 node, ['small_tests', 'toolchain_tests'], 'run_pll_dependencies_test', | 205 node, ['small_tests', 'toolchain_tests'], 'run_pll_dependencies_test', |
204 is_broken=is_broken) | 206 is_broken=is_broken) |
OLD | NEW |