| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 98       ], | 98       ], | 
| 99       'conditions': [ | 99       'conditions': [ | 
| 100         # Note: When gyp merges lists, it appends them to the old value. | 100         # Note: When gyp merges lists, it appends them to the old value. | 
| 101         ['OS=="mac"', { | 101         ['OS=="mac"', { | 
| 102           # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) | 102           # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) | 
| 103           # form. | 103           # form. | 
| 104           'action': [ | 104           'action': [ | 
| 105             '--extra-variable', 'mac_product_name', '<(mac_product_name)', | 105             '--extra-variable', 'mac_product_name', '<(mac_product_name)', | 
| 106           ], | 106           ], | 
| 107         }], | 107         }], | 
| 108         ["test_isolation_outdir==''", { | 108         ["test_isolation_outdir!=''", { | 
| 109           # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot | 109           'action': [ '--isolate-server', '<(test_isolation_outdir)' ], | 
| 110           # be provided twice. To work around this behavior, append '/'. |  | 
| 111           # |  | 
| 112           # Also have a space after <(PRODUCT_DIR) or visual studio will |  | 
| 113           # escape the argument wrappping " with the \ and merge it into |  | 
| 114           # the following arguments. |  | 
| 115           'action': [ '--outdir', '<(PRODUCT_DIR)/ ' ], |  | 
| 116         }, { |  | 
| 117           'action': [ '--outdir', '<(test_isolation_outdir)' ], |  | 
| 118         }], | 110         }], | 
| 119         ['test_isolation_fail_on_missing == 0', { | 111         ['test_isolation_fail_on_missing == 0', { | 
| 120             'action': ['--ignore_broken_items'], | 112           'action': ['--ignore_broken_items'], | 
| 121           }, | 113         }], | 
| 122         ], |  | 
| 123       ], | 114       ], | 
| 124     }, | 115     }, | 
| 125   ], | 116   ], | 
| 126 } | 117 } | 
| OLD | NEW | 
|---|