OLD | NEW |
---|---|
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'variables': { | 5 'variables': { |
6 'build_angle_deqp_tests%': 0, | 6 'build_angle_deqp_tests%': 0, |
7 'chrome_browser_extensions_test_support_sources': [ | 7 'chrome_browser_extensions_test_support_sources': [ |
8 # A list of sources which is shared between different browser tests. | 8 # A list of sources which is shared between different browser tests. |
9 'browser/apps/app_browsertest_util.cc', | 9 'browser/apps/app_browsertest_util.cc', |
10 'browser/apps/app_browsertest_util.h', | 10 'browser/apps/app_browsertest_util.h', |
(...skipping 1710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1721 # See comment about the same line in chrome/chrome_tests.gypi. | 1721 # See comment about the same line in chrome/chrome_tests.gypi. |
1722 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 1722 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
1723 'conditions' : [ | 1723 'conditions' : [ |
1724 # The browser window can be views or Cocoa on Mac. Test accordingly. | 1724 # The browser window can be views or Cocoa on Mac. Test accordingly. |
1725 ['mac_views_browser==1', { | 1725 ['mac_views_browser==1', { |
1726 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources) ' ], | 1726 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources) ' ], |
1727 # Following tests needs a refactoring to works with mac_views. | 1727 # Following tests needs a refactoring to works with mac_views. |
1728 'sources!': [ | 1728 'sources!': [ |
1729 # Aura depended tests. | 1729 # Aura depended tests. |
1730 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', | 1730 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', |
1731 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc ', | 1731 #'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.c c', |
tapted
2016/03/10 11:51:19
delete rather than commenting out. Also is there a
themblsha
2016/03/10 17:18:58
Exactly, forgot about that, thanks!
| |
1732 ] | 1732 ] |
1733 }, { | 1733 }, { |
1734 'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ], | 1734 'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ], |
1735 }], # mac_views_browser==1 | 1735 }], # mac_views_browser==1 |
1736 ], | 1736 ], |
1737 }, { # Non-Mac. | 1737 }, { # Non-Mac. |
1738 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ], | 1738 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ], |
1739 }], | 1739 }], |
1740 ['notifications == 1', { | 1740 ['notifications == 1', { |
1741 # Common notifications tests. | 1741 # Common notifications tests. |
(...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3533 'browser', | 3533 'browser', |
3534 ], | 3534 ], |
3535 'sources': [ | 3535 'sources': [ |
3536 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3536 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
3537 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3537 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
3538 ], | 3538 ], |
3539 }] | 3539 }] |
3540 }], | 3540 }], |
3541 ], # 'conditions' | 3541 ], # 'conditions' |
3542 } | 3542 } |
OLD | NEW |