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

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

Issue 9695064: Simplify GetTranslatedNexe() (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Rebase Created 8 years, 9 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 | « site_scons/site_tools/naclsdk.py ('k') | tests/multiple_sandboxes/nacl.scons » ('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 2011 The Native Client Authors. All rights reserved. 2 # Copyright 2011 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()
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'platform_qual_lib', 45 'platform_qual_lib',
46 'gio', 46 'gio',
47 ] + VALIDATOR_LIBS) 47 ] + VALIDATOR_LIBS)
48 48
49 49
50 test_prog = env.ComponentProgram( 50 test_prog = env.ComponentProgram(
51 'minimal_test_guest', 51 'minimal_test_guest',
52 ['minimal_test_guest.c'], 52 ['minimal_test_guest.c'],
53 EXTRA_LINKFLAGS=['-nostdlib']) 53 EXTRA_LINKFLAGS=['-nostdlib'])
54 54
55 extra_deps = []
56 if env.Bit('pnacl_generate_pexe'): 55 if env.Bit('pnacl_generate_pexe'):
57 env.Replace(TRANSLATEFLAGS=['-nostdlib']) 56 env.Replace(TRANSLATEFLAGS=['-nostdlib'])
58 nexe_name, pexe_node = env.GetTranslatedNexe(test_prog) 57 test_prog = env.GetTranslatedNexe(test_prog)
59 test_prog = nexe_name
60 extra_deps = [pexe_node]
61 58
62 test_command = [runner, test_prog] 59 test_command = [runner, test_prog]
63 bootstrap, _ = env.GetBootstrap() 60 bootstrap, _ = env.GetBootstrap()
64 if bootstrap is not None: 61 if bootstrap is not None:
65 test_command = [bootstrap] + test_command 62 test_command = [bootstrap] + test_command
66 63
67 node = env.CommandTest('minimal_test.out', test_command, 64 node = env.CommandTest('minimal_test.out', test_command,
68 stdout_golden=env.File('minimal_test.stdout'), 65 stdout_golden=env.File('minimal_test.stdout'))
69 extra_deps=extra_deps)
70 env.AddNodeToTestSuite(node, ['small_tests'], 'run_minnacl_test', 66 env.AddNodeToTestSuite(node, ['small_tests'], 'run_minnacl_test',
71 is_broken=not env.Bit('nacl_static_link')) 67 is_broken=not env.Bit('nacl_static_link'))
OLDNEW
« no previous file with comments | « site_scons/site_tools/naclsdk.py ('k') | tests/multiple_sandboxes/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698