| 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 20 matching lines...) Expand all  Loading... | 
| 31 # property of the .isolate format. This permits to define GYP variables but is | 31 # property of the .isolate format. This permits to define GYP variables but is | 
| 32 # a stricter format than GYP so isolate.py can read it. | 32 # a stricter format than GYP so isolate.py can read it. | 
| 33 # | 33 # | 
| 34 # The generated .isolated file will be: | 34 # The generated .isolated file will be: | 
| 35 #   <(PRODUCT_DIR)/foo_test.isolated | 35 #   <(PRODUCT_DIR)/foo_test.isolated | 
| 36 # | 36 # | 
| 37 # See http://dev.chromium.org/developers/testing/isolated-testing/for-swes | 37 # See http://dev.chromium.org/developers/testing/isolated-testing/for-swes | 
| 38 # for more information. | 38 # for more information. | 
| 39 | 39 | 
| 40 { | 40 { | 
|  | 41   'includes': [ | 
|  | 42     '../chrome/version.gypi', | 
|  | 43   ], | 
| 41   'rules': [ | 44   'rules': [ | 
| 42     { | 45     { | 
| 43       'rule_name': 'isolate', | 46       'rule_name': 'isolate', | 
| 44       'extension': 'isolate', | 47       'extension': 'isolate', | 
| 45       'inputs': [ | 48       'inputs': [ | 
| 46         # Files that are known to be involved in this step. | 49         # Files that are known to be involved in this step. | 
| 47         '<(DEPTH)/tools/swarming_client/isolate.py', | 50         '<(DEPTH)/tools/swarming_client/isolate.py', | 
| 48         '<(DEPTH)/tools/swarming_client/run_isolated.py', | 51         '<(DEPTH)/tools/swarming_client/run_isolated.py', | 
| 49 | 52 | 
| 50         # Disable file tracking by the build driver for now. This means the | 53         # Disable file tracking by the build driver for now. This means the | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 70         # like '0' or '1', aren't stripped out by GYP. | 73         # like '0' or '1', aren't stripped out by GYP. | 
| 71         # This list needs to be kept in sync with the cmd line options | 74         # This list needs to be kept in sync with the cmd line options | 
| 72         # in src/build/android/pylib/gtest/setup.py. | 75         # in src/build/android/pylib/gtest/setup.py. | 
| 73         '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', | 76         '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', | 
| 74         '--config-variable', 'OS=<(OS)', | 77         '--config-variable', 'OS=<(OS)', | 
| 75         # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run | 78         # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run | 
| 76         # once support for user-defined config variables is added. | 79         # once support for user-defined config variables is added. | 
| 77         '--config-variable', | 80         '--config-variable', | 
| 78         'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', | 81         'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', | 
| 79         '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', | 82         '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', | 
|  | 83         '--extra-variable', 'version_full=<(version_full)', | 
| 80         '--result', '<@(_outputs)', | 84         '--result', '<@(_outputs)', | 
| 81         '--isolate', '<(RULE_INPUT_PATH)', | 85         '--isolate', '<(RULE_INPUT_PATH)', | 
| 82       ], | 86       ], | 
| 83       'conditions': [ | 87       'conditions': [ | 
| 84         # Note: When gyp merges lists, it appends them to the old value. | 88         # Note: When gyp merges lists, it appends them to the old value. | 
| 85         ['OS=="mac"', { | 89         ['OS=="mac"', { | 
| 86           # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) | 90           # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) | 
| 87           # form. | 91           # form. | 
| 88           'action': [ | 92           'action': [ | 
| 89             '--extra-variable', 'mac_product_name', '<(mac_product_name)', | 93             '--extra-variable', 'mac_product_name', '<(mac_product_name)', | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 103         ['test_isolation_fail_on_missing == 0', { | 107         ['test_isolation_fail_on_missing == 0', { | 
| 104             'action': ['--ignore_broken_items'], | 108             'action': ['--ignore_broken_items'], | 
| 105           }, | 109           }, | 
| 106         ], | 110         ], | 
| 107       ], | 111       ], | 
| 108 | 112 | 
| 109       'msvs_cygwin_shell': 0, | 113       'msvs_cygwin_shell': 0, | 
| 110     }, | 114     }, | 
| 111   ], | 115   ], | 
| 112 } | 116 } | 
| OLD | NEW | 
|---|