OLD | NEW |
---|---|
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 extra_flags = [] | 8 extra_flags = [] |
9 if env.IsRunningUnderValgrind(): | 9 if env.IsRunningUnderValgrind(): |
10 extra_flags.extend(['-E', 'RUNNING_ON_VALGRIND=1']) | 10 extra_flags.extend(['-E', 'RUNNING_ON_VALGRIND=1']) |
11 mmap_test_nexe = env.ComponentProgram('mmap_test', | 11 mmap_test_nexe = env.ComponentProgram('mmap_test', |
12 'mmap_test.cc', | 12 'mmap_test.cc', |
13 EXTRA_LIBS=['${NONIRT_LIBS}']) | 13 EXTRA_LIBS=['${NONIRT_LIBS}']) |
14 node = env.CommandSelLdrTestNacl( | 14 node = env.CommandSelLdrTestNacl( |
15 'mmap_test.out', | 15 'mmap_test.out', |
16 mmap_test_nexe, | 16 mmap_test_nexe, |
17 args=[env.File('test-file')], | 17 args=[env.File('test-file')], |
18 stdout_golden=env.File('mmap_test.stdout'), | 18 stdout_golden=env.File('mmap_test.stdout'), |
19 # '-a' enables file access for opening the test file. | 19 # '-a' enables file access for opening the test file. |
20 # '-e' enables exception handling for testing unreadable pages. | 20 # '-e' enables exception handling for testing unreadable pages. |
21 sel_ldr_flags=['-a', '-e'] + extra_flags) | 21 sel_ldr_flags=['-a', '-e'] + extra_flags) |
22 | 22 |
23 env.AddNodeToTestSuite(node, | 23 env.AddNodeToTestSuite(node, |
24 ['small_tests', 'sel_ldr_tests'], 'run_mmap_test') | 24 ['small_tests', 'sel_ldr_tests'], 'run_mmap_test', |
Mark Seaborn
2013/02/13 22:14:09
This seems like a more serious case to not work.
petarj
2013/03/05 17:50:04
Works now. Fixed in https://codereview.chromium.or
| |
25 is_broken=env.Bit('target_mips32') and | |
26 env.UsingEmulator()) | |
25 | 27 |
26 mmap_atomicity_nexe = env.ComponentProgram( | 28 mmap_atomicity_nexe = env.ComponentProgram( |
27 'mmap_atomicity', 'mmap_atomicity.c', | 29 'mmap_atomicity', 'mmap_atomicity.c', |
28 EXTRA_LIBS=['${PTHREAD_LIBS}', '${NONIRT_LIBS}']) | 30 EXTRA_LIBS=['${PTHREAD_LIBS}', '${NONIRT_LIBS}']) |
29 node = env.CommandSelLdrTestNacl( | 31 node = env.CommandSelLdrTestNacl( |
30 'mmap_atomicity_test.out', mmap_atomicity_nexe) | 32 'mmap_atomicity_test.out', mmap_atomicity_nexe) |
31 # * This test is extremely slow on the memcheck bot, which eventually | 33 # * This test is extremely slow on the memcheck bot, which eventually |
32 # times out, so it is disabled there. This may be a consequence of | 34 # times out, so it is disabled there. This may be a consequence of |
33 # running under a VM, since running the test on memcheck locally is | 35 # running under a VM, since running the test on memcheck locally is |
34 # fast enough. | 36 # fast enough. |
35 is_broken = env.Bit('running_on_valgrind') | 37 is_broken = env.Bit('running_on_valgrind') |
36 env.AddNodeToTestSuite(node, | 38 env.AddNodeToTestSuite(node, |
37 ['small_tests', 'mmap_race_tests'], | 39 ['small_tests', 'mmap_race_tests'], |
38 'run_mmap_atomicity_test', | 40 'run_mmap_atomicity_test', |
39 is_broken=is_broken) | 41 is_broken=is_broken) |
OLD | NEW |