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

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

Issue 10070010: validator_ragel: Link into TCB, use under env var (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: . Created 8 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
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright 2011 The Native Client Authors. All rights reserved. 2 # Copyright 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can 3 # Use of this source code is governed by a BSD-style license that can
4 # be found in the LICENSE file. 4 # be found in the LICENSE file.
5 5
6 Import('env') 6 Import('env')
7 7
8 # valgrind has problems with minimal_test_guest 8 # valgrind has problems with minimal_test_guest
9 if env.IsRunningUnderValgrind(): 9 if env.IsRunningUnderValgrind():
10 Return() 10 Return()
11 11
12 # This test case tests an experimental profile of NaCl. If you make a 12 # This test case tests an experimental profile of NaCl. If you make a
13 # change which breaks this test which is difficult to fix, you can 13 # change which breaks this test which is difficult to fix, you can
14 # disable the test, but please CC mseaborn,krasin. 14 # disable the test, but please CC mseaborn,krasin.
15 15
16 if 'TRUSTED_ENV' not in env: 16 if 'TRUSTED_ENV' not in env:
17 Return() 17 Return()
18 trusted_env = env['TRUSTED_ENV'] 18 trusted_env = env['TRUSTED_ENV']
19 19
20 # This duplicates the library list in src/trusted/service_runtime/build.scons. 20 # This duplicates the library list in src/trusted/service_runtime/build.scons.
21 # We would not have to do this if we could get Scons to track dependencies 21 # We would not have to do this if we could get Scons to track dependencies
22 # between libraries. 22 # between libraries.
23 VALIDATOR_LIBS = [] 23 VALIDATOR_LIBS = []
24 if trusted_env.Bit('target_x86'): 24 if trusted_env.Bit('target_x86'):
25 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate')] 25 VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate'),
Mark Seaborn 2012/04/19 22:11:39 Can you put this information into site_scons/site_
pasko-google - do not use 2012/04/20 14:30:38 looking forward to merging it with your cleanup
26 trusted_env.NaClTargetArchSuffix('dfa_validate_caller'),
27 trusted_env.NaClTargetArchSuffix('dfa_validate'),
28 ]
26 elif trusted_env.Bit('target_arm'): 29 elif trusted_env.Bit('target_arm'):
27 VALIDATOR_LIBS += ['ncvalidate_arm_v2'] 30 VALIDATOR_LIBS += ['ncvalidate_arm_v2']
28 31
29 runner = trusted_env.ComponentProgram( 32 runner = trusted_env.ComponentProgram(
30 'minimal_test_host', ['minimal_test_host.c'], 33 'minimal_test_host', ['minimal_test_host.c'],
31 EXTRA_LIBS=['sel', 34 EXTRA_LIBS=['sel',
32 'sel_debug_dummy', 35 'sel_debug_dummy',
33 'manifest_proxy', 36 'manifest_proxy',
34 'simple_service', 37 'simple_service',
35 'thread_interface', 38 'thread_interface',
(...skipping 22 matching lines...) Expand all
58 61
59 test_command = [runner, test_prog] 62 test_command = [runner, test_prog]
60 bootstrap, _ = env.GetBootstrap() 63 bootstrap, _ = env.GetBootstrap()
61 if bootstrap is not None: 64 if bootstrap is not None:
62 test_command = [bootstrap] + test_command 65 test_command = [bootstrap] + test_command
63 66
64 node = env.CommandTest('minimal_test.out', test_command, 67 node = env.CommandTest('minimal_test.out', test_command,
65 stdout_golden=env.File('minimal_test.stdout')) 68 stdout_golden=env.File('minimal_test.stdout'))
66 env.AddNodeToTestSuite(node, ['small_tests'], 'run_minnacl_test', 69 env.AddNodeToTestSuite(node, ['small_tests'], 'run_minnacl_test',
67 is_broken=not env.Bit('nacl_static_link')) 70 is_broken=not env.Bit('nacl_static_link'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698