| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 | 2 |
| 3 # Copyright (c) 2012 Google Inc. All rights reserved. | 3 # Copyright (c) 2012 Google Inc. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 """ | 7 """ |
| 8 Tests things related to ARCHS. | 8 Tests things related to ARCHS. |
| 9 """ | 9 """ |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 | 43 |
| 44 if test.format != 'make': | 44 if test.format != 'make': |
| 45 # Build all targets except 'exe_32_64_no_sources' that does build | 45 # Build all targets except 'exe_32_64_no_sources' that does build |
| 46 # but should not cause error when generating ninja files | 46 # but should not cause error when generating ninja files |
| 47 targets = [ | 47 targets = [ |
| 48 'static_32_64', 'shared_32_64', 'shared_32_64_bundle', | 48 'static_32_64', 'shared_32_64', 'shared_32_64_bundle', |
| 49 'module_32_64', 'module_32_64_bundle', | 49 'module_32_64', 'module_32_64_bundle', |
| 50 'exe_32_64', 'exe_32_64_bundle', 'precompiled_prefix_header_mm_32_64', | 50 'exe_32_64', 'exe_32_64_bundle', 'precompiled_prefix_header_mm_32_64', |
| 51 ] | 51 ] |
| 52 | 52 |
| 53 test.run_gyp('test-archs-multiarch.gyp', chdir='archs') | 53 test.run_gyp('test-archs-multiarch.gyp', |
| 54 '-G', 'xcode_ninja_target_pattern=^.*$', |
| 55 chdir='archs') |
| 56 |
| 54 for target in targets: | 57 for target in targets: |
| 55 test.build('test-archs-multiarch.gyp', target=target, chdir='archs') | 58 test.build('test-archs-multiarch.gyp', target=target, chdir='archs') |
| 56 | 59 |
| 57 result_file = test.built_file_path( | 60 result_file = test.built_file_path( |
| 58 'static_32_64', chdir='archs', type=test.STATIC_LIB) | 61 'static_32_64', chdir='archs', type=test.STATIC_LIB) |
| 59 test.must_exist(result_file) | 62 test.must_exist(result_file) |
| 60 TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) | 63 TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) |
| 61 | 64 |
| 62 result_file = test.built_file_path( | 65 result_file = test.built_file_path( |
| 63 'shared_32_64', chdir='archs', type=test.SHARED_LIB) | 66 'shared_32_64', chdir='archs', type=test.SHARED_LIB) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 77 | 80 |
| 78 result_file = test.built_file_path( | 81 result_file = test.built_file_path( |
| 79 'exe_32_64', chdir='archs', type=test.EXECUTABLE) | 82 'exe_32_64', chdir='archs', type=test.EXECUTABLE) |
| 80 test.must_exist(result_file) | 83 test.must_exist(result_file) |
| 81 TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) | 84 TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) |
| 82 | 85 |
| 83 result_file = test.built_file_path('Test App.app/Contents/MacOS/Test App', | 86 result_file = test.built_file_path('Test App.app/Contents/MacOS/Test App', |
| 84 chdir='archs') | 87 chdir='archs') |
| 85 test.must_exist(result_file) | 88 test.must_exist(result_file) |
| 86 TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) | 89 TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) |
| OLD | NEW |