| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This file is meant to be included into a target to provide a rule | 5 # This file is meant to be included into a target to provide a rule |
| 6 # to "build" .isolate files into a .isolated file. | 6 # to "build" .isolate files into a .isolated file. |
| 7 # | 7 # |
| 8 # To use this, create a gyp target with the following form: | 8 # To use this, create a gyp target with the following form: |
| 9 # 'conditions': [ | 9 # 'conditions': [ |
| 10 # ['test_isolation_mode != "noop"', { | 10 # ['test_isolation_mode != "noop"', { |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 '--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)', | 93 '--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)', |
| 94 '--config-variable', 'chromeos=<(chromeos)', | 94 '--config-variable', 'chromeos=<(chromeos)', |
| 95 '--config-variable', 'component=<(component)', | 95 '--config-variable', 'component=<(component)', |
| 96 # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run | 96 # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run |
| 97 # once support for user-defined config variables is added. | 97 # once support for user-defined config variables is added. |
| 98 '--config-variable', | 98 '--config-variable', |
| 99 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', | 99 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', |
| 100 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', | 100 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', |
| 101 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', | 101 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', |
| 102 '--config-variable', 'use_openssl=<(use_openssl)', | 102 '--config-variable', 'use_openssl=<(use_openssl)', |
| 103 '--config-variable', 'target_arch=<(target_arch)', |
| 103 ], | 104 ], |
| 104 'conditions': [ | 105 'conditions': [ |
| 105 # Note: When gyp merges lists, it appends them to the old value. | 106 # Note: When gyp merges lists, it appends them to the old value. |
| 106 ['OS=="mac"', { | 107 ['OS=="mac"', { |
| 107 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) | 108 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) |
| 108 # form. | 109 # form. |
| 109 'action': [ | 110 'action': [ |
| 110 '--extra-variable', 'mac_product_name', '<(mac_product_name)', | 111 '--extra-variable', 'mac_product_name', '<(mac_product_name)', |
| 111 ], | 112 ], |
| 112 }], | 113 }], |
| 113 ["test_isolation_outdir!=''", { | 114 ["test_isolation_outdir!=''", { |
| 114 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], | 115 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], |
| 115 }], | 116 }], |
| 116 ['test_isolation_fail_on_missing == 0', { | 117 ['test_isolation_fail_on_missing == 0', { |
| 117 'action': ['--ignore_broken_items'], | 118 'action': ['--ignore_broken_items'], |
| 118 }], | 119 }], |
| 119 ], | 120 ], |
| 120 }, | 121 }, |
| 121 ], | 122 ], |
| 122 } | 123 } |
| OLD | NEW |