 Chromium Code Reviews
 Chromium Code Reviews Issue 1515833004:
  Add missing data_deps to webkit_unit_tests  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1515833004:
  Add missing data_deps to webkit_unit_tests  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") | 
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") | 
| 7 import("//third_party/WebKit/Source/bindings/bindings.gni") | 7 import("//third_party/WebKit/Source/bindings/bindings.gni") | 
| 8 import("//third_party/WebKit/Source/config.gni") | 8 import("//third_party/WebKit/Source/config.gni") | 
| 9 import("//third_party/WebKit/Source/core/core.gni") | 9 import("//third_party/WebKit/Source/core/core.gni") | 
| 10 import("//third_party/WebKit/Source/modules/modules.gni") | 10 import("//third_party/WebKit/Source/modules/modules.gni") | 
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 | 99 | 
| 100 # TODO(GYP): Delete this after we've converted everything to GN. | 100 # TODO(GYP): Delete this after we've converted everything to GN. | 
| 101 # The _run targets exist only for compatibility w/ GYP. | 101 # The _run targets exist only for compatibility w/ GYP. | 
| 102 group("webkit_unit_tests_run") { | 102 group("webkit_unit_tests_run") { | 
| 103 testonly = true | 103 testonly = true | 
| 104 deps = [ | 104 deps = [ | 
| 105 ":webkit_unit_tests", | 105 ":webkit_unit_tests", | 
| 106 ] | 106 ] | 
| 107 } | 107 } | 
| 108 | 108 | 
| 109 group("webkit_unit_tests_data") { | |
| 110 data = [ | |
| 111 "tests/data/", | |
| 112 "../core/paint/test_data/", | |
| 
Dirk Pranke
2015/12/10 17:28:36
nit: these should be src-relative paths, like //th
 | |
| 113 | |
| 114 # Required by some image decoder tests. | |
| 115 "../platform/image-decoders/testing/", | |
| 116 "../../LayoutTests/fast/images/resources/", | |
| 117 | |
| 118 # Required by some font tests. | |
| 119 "../platform/testing/data/", | |
| 120 ] | |
| 121 } | |
| 122 | |
| 109 # GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests | 123 # GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests | 
| 110 test("webkit_unit_tests") { | 124 test("webkit_unit_tests") { | 
| 111 visibility = [] # Allow re-assignment of list. | 125 visibility = [] # Allow re-assignment of list. | 
| 112 visibility = [ "*" ] | 126 visibility = [ "*" ] | 
| 113 | 127 | 
| 114 deps = [ | 128 deps = [ | 
| 115 ":test_support", | 129 ":test_support", | 
| 116 ":web", | 130 ":web", | 
| 117 "//base", | 131 "//base", | 
| 118 "//base:i18n", | 132 "//base:i18n", | 
| 119 "//base/test:test_support", | 133 "//base/test:test_support", | 
| 120 "//content/test:test_support", | 134 "//content/test:test_support", | 
| 121 "//testing/gmock", | 135 "//testing/gmock", | 
| 122 "//testing/gtest", | 136 "//testing/gtest", | 
| 123 "//third_party/WebKit/Source/platform:test_support", | 137 "//third_party/WebKit/Source/platform:test_support", | 
| 124 "//third_party/WebKit/Source/wtf", | 138 "//third_party/WebKit/Source/wtf", | 
| 125 "//third_party/WebKit/Source/wtf:test_support", | 139 "//third_party/WebKit/Source/wtf:test_support", | 
| 126 "//third_party/libwebp", | 140 "//third_party/libwebp", | 
| 127 "//third_party/zlib", | 141 "//third_party/zlib", | 
| 128 "//url", | 142 "//url", | 
| 129 "//v8", | 143 "//v8", | 
| 130 ] | 144 ] | 
| 131 | 145 | 
| 146 data_deps = [ | |
| 147 "//content/shell:pak", | |
| 148 ":webkit_unit_tests_data", | |
| 
Dirk Pranke
2015/12/10 17:28:36
and the presubmit check should've complained that
 | |
| 149 ] | |
| 150 | |
| 132 sources = [ | 151 sources = [ | 
| 133 "tests/RunAllTests.cpp", | 152 "tests/RunAllTests.cpp", | 
| 134 ] | 153 ] | 
| 135 | 154 | 
| 136 configs += [ "//third_party/WebKit/Source:config" ] | 155 configs += [ "//third_party/WebKit/Source:config" ] | 
| 137 | 156 | 
| 138 if (!is_component_build) { | 157 if (!is_component_build) { | 
| 139 deps += [ "//third_party/WebKit/Source/core" ] | 158 deps += [ "//third_party/WebKit/Source/core" ] | 
| 140 | 159 | 
| 141 configs += [ "//third_party/WebKit/Source:inside_blink" ] | 160 configs += [ "//third_party/WebKit/Source:inside_blink" ] | 
| 142 | 161 | 
| 143 sources += web_unittest_files | 162 sources += web_unittest_files | 
| 144 sources += bindings_unittest_files | 163 sources += bindings_unittest_files | 
| 145 sources += core_unittest_files | 164 sources += core_unittest_files | 
| 146 sources += modules_unittest_files | 165 sources += modules_unittest_files | 
| 147 sources += platform_unittest_support_files | 166 sources += platform_unittest_support_files | 
| 148 sources += platform_web_unittest_files | 167 sources += platform_web_unittest_files | 
| 149 } | 168 } | 
| 150 | 169 | 
| 151 if (is_android) { | 170 if (is_android) { | 
| 152 deps += [ | 171 deps += [ | 
| 153 "//base:base_java", | 172 "//base:base_java", | 
| 154 "//content/shell/android:content_shell_assets", | 173 "//content/shell/android:content_shell_assets", | 
| 155 "//net/android:net_java", | 174 "//net/android:net_java", | 
| 156 ] | 175 ] | 
| 157 } | 176 } | 
| 158 } | 177 } | 
| OLD | NEW |