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

Side by Side Diff: net/net.gyp

Issue 10828061: Remove target chromium_swarm_tests when test_isolate_mode == noop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1733 'dependencies': [ 1733 'dependencies': [
1734 'net', 1734 'net',
1735 '../base/base.gyp:base', 1735 '../base/base.gyp:base',
1736 ], 1736 ],
1737 'sources': [ 1737 'sources': [
1738 'tools/net_watcher/net_watcher.cc', 1738 'tools/net_watcher/net_watcher.cc',
1739 ], 1739 ],
1740 }, 1740 },
1741 ], 1741 ],
1742 'conditions': [ 1742 'conditions': [
1743 ['inside_chromium_build==1', {
1744 'targets': [
1745 # This target depends on dependencies not fetched by WebKit's DEPS.
1746 # In particular, ..\chrome\test\data and ..\third_party\python_26 on
1747 # Windows.
1748 {
1749 'target_name': 'net_unittests_run',
1750 'type': 'none',
1751 'dependencies': [
1752 'net_unittests',
1753 ],
1754 'includes': [
1755 'net_unittests.isolate',
1756 ],
1757 'actions': [
1758 {
1759 'action_name': 'isolate',
1760 'inputs': [
1761 'net_unittests.isolate',
1762 '<@(isolate_dependency_tracked)',
1763 ],
1764 'outputs': [
1765 '<(PRODUCT_DIR)/net_unittests.results',
1766 ],
1767 'action': [
1768 'python',
1769 '../tools/isolate/isolate.py',
1770 '<(test_isolation_mode)',
1771 '--outdir', '<(test_isolation_outdir)',
1772 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
1773 '--variable', 'OS', '<(OS)',
1774 '--result', '<@(_outputs)',
1775 '--isolate', 'net_unittests.isolate',
1776 ],
1777 },
1778 ],
1779 },
1780 ],
1781 }],
1782 ['os_posix == 1 and OS != "mac" and OS != "android"', { 1743 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1783 'targets': [ 1744 'targets': [
1784 { 1745 {
1785 'target_name': 'flip_in_mem_edsm_server', 1746 'target_name': 'flip_in_mem_edsm_server',
1786 'type': 'executable', 1747 'type': 'executable',
1787 'cflags': [ 1748 'cflags': [
1788 '-Wno-deprecated', 1749 '-Wno-deprecated',
1789 ], 1750 ],
1790 'dependencies': [ 1751 'dependencies': [
1791 '../base/base.gyp:base', 1752 '../base/base.gyp:base',
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1974 'tools/dump_cache/dump_files.cc', 1935 'tools/dump_cache/dump_files.cc',
1975 'tools/dump_cache/upgrade.cc', 1936 'tools/dump_cache/upgrade.cc',
1976 'tools/dump_cache/url_to_filename_encoder.cc', 1937 'tools/dump_cache/url_to_filename_encoder.cc',
1977 'tools/dump_cache/url_to_filename_encoder.h', 1938 'tools/dump_cache/url_to_filename_encoder.h',
1978 'tools/dump_cache/url_utilities.h', 1939 'tools/dump_cache/url_utilities.h',
1979 'tools/dump_cache/url_utilities.cc', 1940 'tools/dump_cache/url_utilities.cc',
1980 ], 1941 ],
1981 }, 1942 },
1982 ], 1943 ],
1983 }], 1944 }],
1945 ['test_isolation_mode != "noop"', {
1946 'targets': [
1947 {
1948 'target_name': 'net_unittests_run',
1949 'type': 'none',
1950 'dependencies': [
1951 'net_unittests',
1952 ],
1953 'includes': [
1954 'net_unittests.isolate',
1955 ],
1956 'actions': [
1957 {
1958 'action_name': 'isolate',
1959 'inputs': [
1960 'net_unittests.isolate',
1961 '<@(isolate_dependency_tracked)',
1962 ],
1963 'outputs': [
1964 '<(PRODUCT_DIR)/net_unittests.results',
1965 ],
1966 'action': [
1967 'python',
1968 '../tools/isolate/isolate.py',
1969 '<(test_isolation_mode)',
1970 '--outdir', '<(test_isolation_outdir)',
1971 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
1972 '--variable', 'OS', '<(OS)',
1973 '--result', '<@(_outputs)',
1974 '--isolate', 'net_unittests.isolate',
1975 ],
1976 },
1977 ],
1978 },
1979 ],
1980 }],
1984 ], 1981 ],
1985 } 1982 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698