| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright 2012 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 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 # 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 21 matching lines...) Expand all Loading... |
| 32 # The minimal_test_guest expects fairly minimal code. Without -nostdlib | 32 # The minimal_test_guest expects fairly minimal code. Without -nostdlib |
| 33 # in the TRANSLATEFLAGS, a dummy pnacl shim will be the real entry | 33 # in the TRANSLATEFLAGS, a dummy pnacl shim will be the real entry |
| 34 # point instead of _start, and that will end up doing a bit more work | 34 # point instead of _start, and that will end up doing a bit more work |
| 35 # (e.g., an IRT query for nacl_read_tp). This extra work seems to be okay | 35 # (e.g., an IRT query for nacl_read_tp). This extra work seems to be okay |
| 36 # with --use_separate_thread, but crashes otherwise. | 36 # with --use_separate_thread, but crashes otherwise. |
| 37 env.Replace(TRANSLATEFLAGS=['-nostdlib']) | 37 env.Replace(TRANSLATEFLAGS=['-nostdlib']) |
| 38 # Avoid supporting non-standard linker-related TRANSLATEFLAGS (-nostdlib) with | 38 # Avoid supporting non-standard linker-related TRANSLATEFLAGS (-nostdlib) with |
| 39 # the sandboxed translator. | 39 # the sandboxed translator. |
| 40 if env.Bit('use_sandboxed_translator'): | 40 if env.Bit('use_sandboxed_translator'): |
| 41 Return() | 41 Return() |
| 42 # TODO(stichnot,jvoung): For this special minimal-code test (see comment above), |
| 43 # linking the Subzero generated ELF file results in a nexe that fails |
| 44 # validation. https://code.google.com/p/nativeclient/issues/detail?id=4134 |
| 45 if env.Bit('use_sz'): |
| 46 Return() |
| 42 test_prog = env.GetTranslatedNexe(test_prog) | 47 test_prog = env.GetTranslatedNexe(test_prog) |
| 43 | 48 |
| 44 is_broken = not env.Bit('nacl_static_link') | 49 is_broken = not env.Bit('nacl_static_link') |
| 45 | 50 |
| 46 node = env.CommandTest('minimal_test.out', | 51 node = env.CommandTest('minimal_test.out', |
| 47 env.AddBootstrap(runner, [test_prog]), | 52 env.AddBootstrap(runner, [test_prog]), |
| 48 stdout_golden=env.File('minimal_test.stdout')) | 53 stdout_golden=env.File('minimal_test.stdout')) |
| 49 env.AddNodeToTestSuite(node, ['small_tests'], 'run_minnacl_test', | 54 env.AddNodeToTestSuite(node, ['small_tests'], 'run_minnacl_test', |
| 50 is_broken=is_broken) | 55 is_broken=is_broken) |
| 51 | 56 |
| 52 node = env.CommandTest('minimal_test_separate_thread.out', | 57 node = env.CommandTest('minimal_test_separate_thread.out', |
| 53 env.AddBootstrap(runner, | 58 env.AddBootstrap(runner, |
| 54 ['--use_separate_thread', test_prog]), | 59 ['--use_separate_thread', test_prog]), |
| 55 stdout_golden=env.File('minimal_test.stdout')) | 60 stdout_golden=env.File('minimal_test.stdout')) |
| 56 env.AddNodeToTestSuite(node, ['small_tests'], | 61 env.AddNodeToTestSuite(node, ['small_tests'], |
| 57 'run_minnacl_separate_thread_test', | 62 'run_minnacl_separate_thread_test', |
| 58 is_broken=is_broken) | 63 is_broken=is_broken) |
| OLD | NEW |