diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
| commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
| tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/ios/testing | |
| parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
| download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz | |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/ios/testing')
| -rw-r--r-- | chromium/ios/testing/BUILD.gn | 43 | ||||
| -rw-r--r-- | chromium/ios/testing/earl_grey/BUILD.gn | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/chromium/ios/testing/BUILD.gn b/chromium/ios/testing/BUILD.gn index 0d6bc3712bd..8cad15ab09e 100644 --- a/chromium/ios/testing/BUILD.gn +++ b/chromium/ios/testing/BUILD.gn @@ -5,7 +5,15 @@ import("//ios/build/config.gni") import("//testing/test.gni") +group("all_tests") { + testonly = true + deps = [ + ":ocmock_support_unittest", + ] +} + source_set("ios_test_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true deps = [ @@ -19,6 +27,7 @@ source_set("ios_test_support") { } source_set("ocmock_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true deps = [ @@ -52,3 +61,37 @@ test("ocmock_support_unittest") { assert_no_deps = ios_assert_no_deps } + +bundle_data("http_server_bundle_data") { + testonly = true + + sources = [ + "data/http_server_files/autofill_smoke_test.html", + "data/http_server_files/browsing_prevent_default_test_page.html", + "data/http_server_files/chromium_logo.png", + "data/http_server_files/chromium_logo_page.html", + "data/http_server_files/destination.html", + "data/http_server_files/fullscreen.html", + "data/http_server_files/history.html", + "data/http_server_files/history.js", + "data/http_server_files/history_go.html", + "data/http_server_files/history_go.js", + "data/http_server_files/memory_usage.html", + "data/http_server_files/multi_field_form.html", + "data/http_server_files/pony.html", + "data/http_server_files/redirect_refresh.html", + "data/http_server_files/request_desktop_test_page.html", + "data/http_server_files/single_page_wide.pdf", + "data/http_server_files/testpage.pdf", + "data/http_server_files/two_pages.pdf", + "data/http_server_files/window_close.html", + "data/http_server_files/window_location.html", + "data/http_server_files/window_location.js", + "data/http_server_files/window_open.html", + "data/http_server_files/window_proxy.html", + ] + outputs = [ + "{{bundle_resources_dir}}/" + + "{{source_root_relative_dir}}/{{source_file_part}}", + ] +} diff --git a/chromium/ios/testing/earl_grey/BUILD.gn b/chromium/ios/testing/earl_grey/BUILD.gn index 221784c48f0..917583799f8 100644 --- a/chromium/ios/testing/earl_grey/BUILD.gn +++ b/chromium/ios/testing/earl_grey/BUILD.gn @@ -8,6 +8,7 @@ config("earl_grey_support_config") { } source_set("earl_grey_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true deps = [ |