Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1176)

Side by Side Diff: build/common.gypi

Issue 10382238: Change the test_isolation_outdir default from PRODUCT_DIR to PRODUCT_DIR/isolate (Closed) Base URL: bombe.local:src/chrome/src@13_fix_unit_tests_run
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 # e.g. base_unittests_run runs the target base_unittests. The test target 346 # e.g. base_unittests_run runs the target base_unittests. The test target
347 # always calls tools/isolate/isolate.py. See the script's --help for more 347 # always calls tools/isolate/isolate.py. See the script's --help for more
348 # information and the valid --mode values. Meant to be overriden with 348 # information and the valid --mode values. Meant to be overriden with
349 # GYP_DEFINES. 349 # GYP_DEFINES.
350 # TODO(maruel): Converted the default from 'check' to 'noop' so work can 350 # TODO(maruel): Converted the default from 'check' to 'noop' so work can
351 # be done while the builders are being reconfigured to check out test data 351 # be done while the builders are being reconfigured to check out test data
352 # files. 352 # files.
353 'test_isolation_mode%': 'noop', 353 'test_isolation_mode%': 'noop',
354 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise 354 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise
355 # gyp will remove duplicate flags, causing isolate.py to be confused. 355 # gyp will remove duplicate flags, causing isolate.py to be confused.
356 'test_isolation_outdir%': '<(PRODUCT_DIR)/', 356 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate',
357 357
358 # Force rlz to use chrome's networking stack. 358 # Force rlz to use chrome's networking stack.
359 'force_rlz_use_chrome_net%': 1, 359 'force_rlz_use_chrome_net%': 1,
360 360
361 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files', 361 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files',
362 'wix_path%': '<(DEPTH)/third_party/wix', 362 'wix_path%': '<(DEPTH)/third_party/wix',
363 363
364 'conditions': [ 364 'conditions': [
365 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 365 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
366 # the 'conditions' clause. Initial attempts resulted in chromium and 366 # the 'conditions' clause. Initial attempts resulted in chromium and
(...skipping 2731 matching lines...) Expand 10 before | Expand all | Expand 10 after
3098 # settings in target dicts. SYMROOT is a special case, because many other 3098 # settings in target dicts. SYMROOT is a special case, because many other
3099 # Xcode variables depend on it, including variables such as 3099 # Xcode variables depend on it, including variables such as
3100 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3100 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3101 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3101 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3102 # files to appear (when present) in the UI as actual files and not red 3102 # files to appear (when present) in the UI as actual files and not red
3103 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3103 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3104 # and therefore SYMROOT, needs to be set at the project level. 3104 # and therefore SYMROOT, needs to be set at the project level.
3105 'SYMROOT': '<(DEPTH)/xcodebuild', 3105 'SYMROOT': '<(DEPTH)/xcodebuild',
3106 }, 3106 },
3107 } 3107 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698