| OLD | NEW |
| 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 if 'TRUSTED_ENV' not in env: | 8 if 'TRUSTED_ENV' not in env: |
| 9 Return() | 9 Return() |
| 10 trusted_env = env['TRUSTED_ENV'] | 10 trusted_env = env['TRUSTED_ENV'] |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 'nacl_perf_counter', | 36 'nacl_perf_counter', |
| 37 'nacl_base', | 37 'nacl_base', |
| 38 'imc', | 38 'imc', |
| 39 'container', | 39 'container', |
| 40 'platform', | 40 'platform', |
| 41 'platform_qual_lib', | 41 'platform_qual_lib', |
| 42 'gio', | 42 'gio', |
| 43 ] + VALIDATOR_LIBS + DEBUG_LIBS) | 43 ] + VALIDATOR_LIBS + DEBUG_LIBS) |
| 44 | 44 |
| 45 test_prog = env.ComponentProgram( | 45 test_prog = env.ComponentProgram( |
| 46 'multidomain_test_guest.nexe', ['multidomain_test_guest.c'], | 46 'multidomain_test_guest', ['multidomain_test_guest.c'], |
| 47 EXTRA_LIBS=['imc_syscalls']) | 47 EXTRA_LIBS=['imc_syscalls']) |
| 48 | 48 |
| 49 node = env.CommandTest('multidomain_test.out', [runner, test_prog], | 49 node = env.CommandTest('multidomain_test.out', [runner, test_prog], |
| 50 stdout_golden=env.File('multidomain_test.stdout')) | 50 stdout_golden=env.File('multidomain_test.stdout')) |
| 51 | 51 |
| 52 # This test does not work everywhere: | 52 # This test does not work everywhere: |
| 53 # * NaCl's ARM sandbox does not support multiple sandboxes per | 53 # * NaCl's ARM sandbox does not support multiple sandboxes per |
| 54 # process, so this test is disabled for ARM. | 54 # process, so this test is disabled for ARM. |
| 55 # * This test currently fails on Mac because service_runtime tries to | 55 # * This test currently fails on Mac because service_runtime tries to |
| 56 # enable the Mac outer sandbox twice, which does not work. | 56 # enable the Mac outer sandbox twice, which does not work. |
| 57 # * We disable this on Windows because the test has failed | 57 # * We disable this on Windows because the test has failed |
| 58 # non-deterministically on the Buildbots "xp-bare-m32-n32-opt", | 58 # non-deterministically on the Buildbots "xp-bare-m32-n32-opt", |
| 59 # "xp-m32-n32-opt", "win7-bare-m32-n32-op" and | 59 # "xp-m32-n32-opt", "win7-bare-m32-n32-op" and |
| 60 # "win7-bare-m64-n64-opt". | 60 # "win7-bare-m64-n64-opt". |
| 61 # * multidomain_test_host assumes it is given a statically linked | 61 # * multidomain_test_host assumes it is given a statically linked |
| 62 # executable. Furthermore, statically-linked nacl-glibc does not | 62 # executable. Furthermore, statically-linked nacl-glibc does not |
| 63 # work here because of validation failures which require stubout | 63 # work here because of validation failures which require stubout |
| 64 # mode. | 64 # mode. |
| 65 is_broken = (env.Bit('build_arm') | 65 is_broken = (env.Bit('build_arm') |
| 66 or env.Bit('host_mac') | 66 or env.Bit('host_mac') |
| 67 or env.Bit('host_windows') | 67 or env.Bit('host_windows') |
| 68 or env.Bit('nacl_glibc')) | 68 or env.Bit('nacl_glibc')) |
| 69 | 69 |
| 70 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', | 70 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test', |
| 71 is_broken=is_broken) | 71 is_broken=is_broken) |
| OLD | NEW |