OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2013 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 # Only for newlib for now, since the subprogram's library dependencies | 8 # Only for newlib for now, since the subprogram's library dependencies |
9 # and ld.so-as-main would complicate the reverse channel emulation | 9 # and ld.so-as-main would complicate the reverse channel emulation |
10 # quite a bit. Once we have a better handle on how to merge manifests | 10 # quite a bit. Once we have a better handle on how to merge manifests |
(...skipping 18 matching lines...) Expand all Loading... |
29 subprogram_nexe = env.ComponentProgram('subprogram', | 29 subprogram_nexe = env.ComponentProgram('subprogram', |
30 'subprogram.c', | 30 'subprogram.c', |
31 EXTRA_LIBS=['${NONIRT_LIBS}', | 31 EXTRA_LIBS=['${NONIRT_LIBS}', |
32 'srpc', | 32 'srpc', |
33 'platform', | 33 'platform', |
34 'imc', | 34 'imc', |
35 'imc_syscalls', | 35 'imc_syscalls', |
36 '${PTHREAD_LIBS}', | 36 '${PTHREAD_LIBS}', |
37 '${NONIRT_LIBS}']) | 37 '${NONIRT_LIBS}']) |
38 | 38 |
39 if env.ShouldTranslateToNexe(subprogram_nexe): | 39 subprogram_nexe = env.GetTranslatedNexe(subprogram_nexe) |
40 subprogram_nexe = env.GetTranslatedNexe(subprogram_nexe) | |
41 | 40 |
42 if env.Bit('tests_use_irt'): | 41 if env.Bit('tests_use_irt'): |
43 irt_var_flags = [ '--var', 'irt_nexe', env.GetIrtNexe() ] | 42 irt_var_flags = [ '--var', 'irt_nexe', env.GetIrtNexe() ] |
44 else: | 43 else: |
45 irt_var_flags = [] | 44 irt_var_flags = [] |
46 | 45 |
47 node = env.SelUniversalTest('subprocess_test.out', init_nexe, | 46 node = env.SelUniversalTest('subprocess_test.out', init_nexe, |
48 sel_universal_flags=[ | 47 sel_universal_flags=[ |
49 '--uses_reverse_service', | 48 '--uses_reverse_service', |
50 '--var', 'subprogram', subprogram_nexe] | 49 '--var', 'subprogram', subprogram_nexe] |
51 + irt_var_flags, | 50 + irt_var_flags, |
52 stdin=env.File('subprocess_test.stdin'), | 51 stdin=env.File('subprocess_test.stdin'), |
53 filter_regex='"Hello world"', | 52 filter_regex='"Hello world"', |
54 stdout_golden=env.File('subprocess_test.stdout')) | 53 stdout_golden=env.File('subprocess_test.stdout')) |
55 | 54 |
56 env.AddNodeToTestSuite(node, | 55 env.AddNodeToTestSuite(node, |
57 ['small_tests'], | 56 ['small_tests'], |
58 'run_subprocess_test') | 57 'run_subprocess_test') |
OLD | NEW |