| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 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 platform | 6 import platform |
| 7 import os | 7 import os |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 744 if env.Bit('target_x86_64') and not env.CrossToolsBuild(): | 744 if env.Bit('target_x86_64') and not env.CrossToolsBuild(): |
| 745 node = env.CommandSelLdrTestNacl( | 745 node = env.CommandSelLdrTestNacl( |
| 746 'hello_x32.out', | 746 'hello_x32.out', |
| 747 env.File(os.path.join(arch_testdata_dir, 'hello_x32.nexe')), | 747 env.File(os.path.join(arch_testdata_dir, 'hello_x32.nexe')), |
| 748 stdout_golden=env.File(os.path.join('${MAIN_DIR}', | 748 stdout_golden=env.File(os.path.join('${MAIN_DIR}', |
| 749 'tests/hello_world', | 749 'tests/hello_world', |
| 750 'hello_world.stdout')) | 750 'hello_world.stdout')) |
| 751 ) | 751 ) |
| 752 env.AddNodeToTestSuite(node, ['small_tests'], 'run_hello_x32_test') | 752 env.AddNodeToTestSuite(node, ['small_tests'], 'run_hello_x32_test') |
| 753 | 753 |
| 754 # Test canned hello_world binary with validator_ragel. |
| 755 if env.Bit('target_x86'): |
| 756 node = env.CommandSelLdrTestNacl( |
| 757 'dfa_hwd.out', |
| 758 env.File(arch_testdata_dir + '/hello_world.nexe'), |
| 759 stdout_golden = env.File('testdata/hello_world.stdout'), |
| 760 stderr_golden = env.File('testdata/dfa_validator_hello.stderr'), |
| 761 filter_regex = '"^(Hello, World!)$|DANGER"', |
| 762 osenv='NACL_DANGEROUS_USE_DFA_VALIDATOR=1', |
| 763 ) |
| 764 env.AddNodeToTestSuite(node, ['medium_tests', 'validator_tests'], |
| 765 'run_dfa_validator_hello_world_test') |
| 766 |
| 754 # ---------------------------------------------------------- | 767 # ---------------------------------------------------------- |
| 755 # Integration Tests | 768 # Integration Tests |
| 756 # ---------------------------------------------------------- | 769 # ---------------------------------------------------------- |
| 757 | 770 |
| 758 # Doesn't work on windows under coverage. | 771 # Doesn't work on windows under coverage. |
| 759 # TODO(bradnelson): fix this to work on windows under coverage. | 772 # TODO(bradnelson): fix this to work on windows under coverage. |
| 760 # NOTE: uses validator | 773 # NOTE: uses validator |
| 761 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and | 774 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and |
| 762 not env.CrossToolsBuild()): | 775 not env.CrossToolsBuild()): |
| 763 obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ] | 776 obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ] |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 # TODO(tuduce): Make it work on windows. | 960 # TODO(tuduce): Make it work on windows. |
| 948 env.AddNodeToTestSuite(node, ['medium_tests'], | 961 env.AddNodeToTestSuite(node, ['medium_tests'], |
| 949 'run_sel_ldr_thread_death_test', | 962 'run_sel_ldr_thread_death_test', |
| 950 is_broken=env.Bit('windows')) | 963 is_broken=env.Bit('windows')) |
| 951 | 964 |
| 952 | 965 |
| 953 # This currently tests linking of sel_main_chrome.c *only*. We do not | 966 # This currently tests linking of sel_main_chrome.c *only*. We do not |
| 954 # expect this program to do anything meaningful when run. | 967 # expect this program to do anything meaningful when run. |
| 955 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], | 968 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], |
| 956 EXTRA_LIBS=sel_ldr_libs) | 969 EXTRA_LIBS=sel_ldr_libs) |
| OLD | NEW |