diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_test_BUILD.gn')
-rw-r--r-- | www/chromium/files/patch-chrome_test_BUILD.gn | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 617c959..1cea591 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2017-03-09 20:04:30 UTC +--- chrome/test/BUILD.gn.orig 2017-04-19 19:06:31 UTC +++ chrome/test/BUILD.gn -@@ -193,7 +193,7 @@ static_library("test_support") { +@@ -190,7 +190,7 @@ static_library("test_support") { ] } @@ -9,7 +9,7 @@ public_deps += [ "//crypto:platform" ] } if (is_mac) { -@@ -451,7 +451,7 @@ if (!is_android) { +@@ -455,7 +455,7 @@ if (!is_android) { "$root_out_dir/test_page.css.mock-http-headers", "$root_out_dir/ui_test.pak", ] @@ -18,7 +18,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -460,7 +460,7 @@ if (!is_android) { +@@ -464,7 +464,7 @@ if (!is_android) { "$root_out_dir/resources.pak", ] } @@ -27,8 +27,8 @@ data += [ "$root_out_dir/libppapi_tests.so" ] } -@@ -577,7 +577,7 @@ if (!is_android) { - "../browser/ui/views/payments/payment_request_interactive_uitest_base.h", +@@ -584,7 +584,7 @@ if (!is_android) { + "../browser/ui/views/payments/payment_sheet_view_controller_interactive_uitest.cc", ] } - if (is_linux) { @@ -36,7 +36,7 @@ if (!is_chromeos) { # Desktop linux. sources -= [ -@@ -2041,14 +2041,14 @@ test("browser_tests") { +@@ -2048,14 +2048,14 @@ test("browser_tests") { sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] deps += [ "//chrome/browser/chromeos" ] data_deps += [ "//third_party/liblouis:liblouis_test_data" ] @@ -53,7 +53,7 @@ sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] } -@@ -2060,7 +2060,7 @@ test("browser_tests") { +@@ -2067,7 +2067,7 @@ test("browser_tests") { configs += [ "//build/config/win:default_large_module_incremental_linking" ] } @@ -62,7 +62,7 @@ data_deps += [ "//components/nacl/loader:nacl_helper" ] if (enable_nacl_nonsfi) { -@@ -2170,7 +2170,7 @@ test("browser_tests") { +@@ -2186,7 +2186,7 @@ test("browser_tests") { } } @@ -71,7 +71,7 @@ # Set rpath to find the CDM adapter even in a non-component build. configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } -@@ -2391,7 +2391,7 @@ test("browser_tests") { +@@ -2412,7 +2412,7 @@ test("browser_tests") { if (toolkit_views) { sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] } @@ -80,7 +80,7 @@ sources += [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } -@@ -2568,7 +2568,7 @@ test("browser_tests") { +@@ -2594,7 +2594,7 @@ test("browser_tests") { "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", ] } @@ -89,8 +89,8 @@ sources += [ # Tests for non mobile and non CrOS (includes Linux, Win, Mac). "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc", -@@ -2746,7 +2746,7 @@ if (!is_android) { - "$root_out_dir/pyproto/", +@@ -2772,7 +2772,7 @@ if (!is_android) { + "//testing/xvfb.py", ] - if (is_linux || is_win) { @@ -98,7 +98,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -3439,7 +3439,7 @@ test("unit_tests") { +@@ -3471,7 +3471,7 @@ test("unit_tests") { "$root_out_dir/resources.pak", ] } @@ -107,7 +107,7 @@ data += [ "$root_out_dir/chrome_200_percent.pak" ] } if (is_win) { -@@ -4177,7 +4177,7 @@ test("unit_tests") { +@@ -4198,7 +4198,7 @@ test("unit_tests") { "//ui/wm", ] } @@ -116,7 +116,7 @@ sources += [ "../browser/password_manager/native_backend_kwallet_x_unittest.cc", "../browser/shell_integration_linux_unittest.cc", -@@ -4197,7 +4197,7 @@ test("unit_tests") { +@@ -4218,7 +4218,7 @@ test("unit_tests") { if (use_gio) { deps += [ "//build/linux/libgio" ] } @@ -125,7 +125,7 @@ deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -4456,18 +4456,18 @@ test("unit_tests") { +@@ -4487,18 +4487,18 @@ test("unit_tests") { "//components/os_crypt:gnome_keyring_direct", ] } @@ -147,7 +147,7 @@ ldflags = [ "-Wl,--strip-debug" ] } if (is_mac) { -@@ -4956,7 +4956,7 @@ if (safe_browsing_mode == 1 && is_mac) { +@@ -4996,7 +4996,7 @@ if (safe_browsing_mode == 1 && is_mac) { } } @@ -156,12 +156,12 @@ # TODO(609855): Make this compile on Android and run on the bots. test("chrome_app_unittests") { sources = [ -@@ -4982,7 +4982,7 @@ if (!is_android) { +@@ -5021,7 +5021,7 @@ if (!is_android) { } } --if (!is_android && !is_ios && !is_chromecast) { -+if (!is_android && !is_ios && !is_chromecast && !is_bsd) { +-if (!is_android && !is_chromecast) { ++if (!is_android && !is_chromecast && !is_bsd) { test("performance_browser_tests") { sources = [ "../app/chrome_version.rc.version", |