| 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 platform | 6 import platform |
| 7 | 7 |
| 8 Import('env') | 8 Import('env') |
| 9 | 9 |
| 10 # TODO(robertm): consider adding this to the top level scons files | 10 # TODO(robertm): consider adding this to the top level scons files |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 # http://code.google.com/p/nativeclient/issues/detail?id=1242 | 268 # http://code.google.com/p/nativeclient/issues/detail?id=1242 |
| 269 sel_ldr_env = env.Clone() | 269 sel_ldr_env = env.Clone() |
| 270 if env.Bit('mac'): | 270 if env.Bit('mac'): |
| 271 sel_ldr_env.Append(FRAMEWORKS=['Cocoa']) | 271 sel_ldr_env.Append(FRAMEWORKS=['Cocoa']) |
| 272 | 272 |
| 273 SEL_LDR_NODE = sel_ldr_env.ComponentProgram('sel_ldr', | 273 SEL_LDR_NODE = sel_ldr_env.ComponentProgram('sel_ldr', |
| 274 'sel_main.c', | 274 'sel_main.c', |
| 275 EXTRA_LIBS=['sel', | 275 EXTRA_LIBS=['sel', |
| 276 'env_cleanser', | 276 'env_cleanser', |
| 277 'nacl_error_code', | 277 'nacl_error_code', |
| 278 'manifest_proxy', |
| 278 'simple_service', | 279 'simple_service', |
| 279 'thread_interface', | 280 'thread_interface', |
| 280 'gio_wrapped_desc', | 281 'gio_wrapped_desc', |
| 281 'nonnacl_srpc', | 282 'nonnacl_srpc', |
| 282 'nrd_xfer', | 283 'nrd_xfer', |
| 283 'nacl_perf_counter', | 284 'nacl_perf_counter', |
| 284 'nacl_base', | 285 'nacl_base', |
| 285 'imc', | 286 'imc', |
| 286 'container', | 287 'container', |
| 287 'platform', | 288 'platform', |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 'sel_ldr_test.cc', | 339 'sel_ldr_test.cc', |
| 339 ] | 340 ] |
| 340 | 341 |
| 341 if (not env.CrossToolsBuild() and | 342 if (not env.CrossToolsBuild() and |
| 342 (not env.Bit('coverage_enabled') or not env.Bit('windows'))): | 343 (not env.Bit('coverage_enabled') or not env.Bit('windows'))): |
| 343 unit_tests_exe = gtest_env.ComponentProgram('service_runtime_tests', | 344 unit_tests_exe = gtest_env.ComponentProgram('service_runtime_tests', |
| 344 unittest_inputs, | 345 unittest_inputs, |
| 345 EXTRA_LIBS=['gtest', | 346 EXTRA_LIBS=['gtest', |
| 346 'sel', | 347 'sel', |
| 347 'env_cleanser', | 348 'env_cleanser', |
| 349 'manifest_proxy', |
| 348 'simple_service', | 350 'simple_service', |
| 349 'thread_interface', | 351 'thread_interface', |
| 350 'gio_wrapped_desc', | 352 'gio_wrapped_desc', |
| 351 'nonnacl_srpc', | 353 'nonnacl_srpc', |
| 352 'nrd_xfer', | 354 'nrd_xfer', |
| 353 'nacl_perf_counter', | 355 'nacl_perf_counter', |
| 354 'nacl_base', | 356 'nacl_base', |
| 355 'imc', | 357 'imc', |
| 356 'platform', | 358 'platform', |
| 357 'gio', | 359 'gio', |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 | 393 |
| 392 # Doesn't work on windows under coverage. | 394 # Doesn't work on windows under coverage. |
| 393 # TODO(bradnelson): fix this to work on windows under coverage. | 395 # TODO(bradnelson): fix this to work on windows under coverage. |
| 394 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and | 396 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and |
| 395 not env.CrossToolsBuild()): | 397 not env.CrossToolsBuild()): |
| 396 # NOTE: uses validator | 398 # NOTE: uses validator |
| 397 mmap_test_exe = env.ComponentProgram('mmap_test', | 399 mmap_test_exe = env.ComponentProgram('mmap_test', |
| 398 ['mmap_test.c'], | 400 ['mmap_test.c'], |
| 399 EXTRA_LIBS=['sel', | 401 EXTRA_LIBS=['sel', |
| 400 'env_cleanser', | 402 'env_cleanser', |
| 403 'manifest_proxy', |
| 401 'simple_service', | 404 'simple_service', |
| 402 'thread_interface', | 405 'thread_interface', |
| 403 'gio_wrapped_desc', | 406 'gio_wrapped_desc', |
| 404 'nonnacl_srpc', | 407 'nonnacl_srpc', |
| 405 'nrd_xfer', | 408 'nrd_xfer', |
| 406 'nacl_perf_counter', | 409 'nacl_perf_counter', |
| 407 'nacl_base', | 410 'nacl_base', |
| 408 'imc', | 411 'imc', |
| 409 'platform', | 412 'platform', |
| 410 'gio', | 413 'gio', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 427 | 430 |
| 428 | 431 |
| 429 # also seems to have issues with windows coverage or VMs | 432 # also seems to have issues with windows coverage or VMs |
| 430 # NOTE: uses validator | 433 # NOTE: uses validator |
| 431 is_broken = env.Bit('coverage_enabled') or env.Bit('running_on_vm') | 434 is_broken = env.Bit('coverage_enabled') or env.Bit('running_on_vm') |
| 432 nacl_sync_cond_test_exe = env.ComponentProgram( | 435 nacl_sync_cond_test_exe = env.ComponentProgram( |
| 433 'nacl_sync_cond_test', | 436 'nacl_sync_cond_test', |
| 434 ['nacl_sync_cond_test.c'], | 437 ['nacl_sync_cond_test.c'], |
| 435 EXTRA_LIBS=['sel', | 438 EXTRA_LIBS=['sel', |
| 436 'env_cleanser', | 439 'env_cleanser', |
| 440 'manifest_proxy', |
| 437 'simple_service', | 441 'simple_service', |
| 438 'thread_interface', | 442 'thread_interface', |
| 439 'gio_wrapped_desc', | 443 'gio_wrapped_desc', |
| 440 'nonnacl_srpc', | 444 'nonnacl_srpc', |
| 441 'nrd_xfer', | 445 'nrd_xfer', |
| 442 'nacl_perf_counter', | 446 'nacl_perf_counter', |
| 443 'nacl_base', | 447 'nacl_base', |
| 444 'imc', | 448 'imc', |
| 445 'platform', | 449 'platform', |
| 446 'gio', | 450 'gio', |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 # Doesn't work on windows under coverage. | 615 # Doesn't work on windows under coverage. |
| 612 # TODO(bradnelson): fix this to work on windows under coverage. | 616 # TODO(bradnelson): fix this to work on windows under coverage. |
| 613 # NOTE: uses validator | 617 # NOTE: uses validator |
| 614 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and | 618 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and |
| 615 not env.CrossToolsBuild()): | 619 not env.CrossToolsBuild()): |
| 616 obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ] | 620 obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ] |
| 617 obj_proxy_test = env.ComponentProgram('obj_proxy_test', | 621 obj_proxy_test = env.ComponentProgram('obj_proxy_test', |
| 618 obj_proxy_test_inputs, | 622 obj_proxy_test_inputs, |
| 619 EXTRA_LIBS=['sel', | 623 EXTRA_LIBS=['sel', |
| 620 'env_cleanser', | 624 'env_cleanser', |
| 625 'manifest_proxy', |
| 621 'simple_service', | 626 'simple_service', |
| 622 'thread_interface', | 627 'thread_interface', |
| 623 'gio_wrapped_desc', | 628 'gio_wrapped_desc', |
| 624 'nonnacl_srpc', | 629 'nonnacl_srpc', |
| 625 'nrd_xfer', | 630 'nrd_xfer', |
| 626 'nacl_perf_counter', | 631 'nacl_perf_counter', |
| 627 'nacl_base', | 632 'nacl_base', |
| 628 'imc', | 633 'imc', |
| 629 'platform', | 634 'platform', |
| 630 'gio', | 635 'gio', |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 # More Death Tests | 760 # More Death Tests |
| 756 # ---------------------------------------------------------- | 761 # ---------------------------------------------------------- |
| 757 if (not env.CrossToolsBuild() and | 762 if (not env.CrossToolsBuild() and |
| 758 (not env.Bit('coverage_enabled') or not env.Bit('windows'))): | 763 (not env.Bit('coverage_enabled') or not env.Bit('windows'))): |
| 759 # NOTE: uses validator | 764 # NOTE: uses validator |
| 760 sel_ldr_thread_death_test_exe = env.ComponentProgram( | 765 sel_ldr_thread_death_test_exe = env.ComponentProgram( |
| 761 'sel_ldr_thread_death_test', | 766 'sel_ldr_thread_death_test', |
| 762 ['sel_ldr_thread_death_test.c'], | 767 ['sel_ldr_thread_death_test.c'], |
| 763 EXTRA_LIBS=['sel', | 768 EXTRA_LIBS=['sel', |
| 764 'env_cleanser', | 769 'env_cleanser', |
| 770 'manifest_proxy', |
| 765 'simple_service', | 771 'simple_service', |
| 766 'thread_interface', | 772 'thread_interface', |
| 767 'gio_wrapped_desc', | 773 'gio_wrapped_desc', |
| 768 'nonnacl_srpc', | 774 'nonnacl_srpc', |
| 769 'nrd_xfer', | 775 'nrd_xfer', |
| 770 'nacl_perf_counter', | 776 'nacl_perf_counter', |
| 771 'nacl_base', | 777 'nacl_base', |
| 772 'imc', | 778 'imc', |
| 773 'platform', | 779 'platform', |
| 774 'gio', | 780 'gio', |
| 775 ] + VALIDATOR_LIBS | 781 ] + VALIDATOR_LIBS |
| 776 + DEBUG_LIBS) | 782 + DEBUG_LIBS) |
| 777 | 783 |
| 778 # NaClAbort() behaves differently when code coverage is enabled: it | 784 # NaClAbort() behaves differently when code coverage is enabled: it |
| 779 # calls exit() rather than abort(). | 785 # calls exit() rather than abort(). |
| 780 if env.Bit('coverage_enabled'): | 786 if env.Bit('coverage_enabled'): |
| 781 expected_exit_status = 'naclabort_coverage' | 787 expected_exit_status = 'naclabort_coverage' |
| 782 else: | 788 else: |
| 783 expected_exit_status = 'sigabrt' | 789 expected_exit_status = 'sigabrt' |
| 784 node = env.CommandTest( | 790 node = env.CommandTest( |
| 785 'sel_ldr_thread_death_test.out', | 791 'sel_ldr_thread_death_test.out', |
| 786 command=[sel_ldr_thread_death_test_exe], | 792 command=[sel_ldr_thread_death_test_exe], |
| 787 exit_status=expected_exit_status) | 793 exit_status=expected_exit_status) |
| 788 | 794 |
| 789 # TODO(tuduce): Make it work on windows. | 795 # TODO(tuduce): Make it work on windows. |
| 790 env.AddNodeToTestSuite(node, ['medium_tests'], | 796 env.AddNodeToTestSuite(node, ['medium_tests'], |
| 791 'run_sel_ldr_thread_death_test', | 797 'run_sel_ldr_thread_death_test', |
| 792 is_broken=env.Bit('windows')) | 798 is_broken=env.Bit('windows')) |
| OLD | NEW |