Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / wtf / BUILD.gn

diff --git a/src/third_party/WebKit/Source/wtf/BUILD.gn b/src/third_party/WebKit/Source/wtf/BUILD.gn
index 4852978..92cf560 100644 (file)
--- a/src/third_party/WebKit/Source/wtf/BUILD.gn
+++ b/src/third_party/WebKit/Source/wtf/BUILD.gn
@@ -28,6 +28,8 @@ config("wtf_config") {
       "/wd4344",
       # Conversion from 'size_t' to 'type'.
       "/wd4267",
+      # dtoa, icu, etc. like doing assignment within conditional.
+      "/wd4706",
     ]
 
     if (component_mode == "shared_library") {
@@ -97,6 +99,8 @@ component("wtf") {
 test("wtf_unittests") {
   sources = gypi_values.wtf_unittest_files
 
+  sources += [ "testing/RunAllTests.cpp" ]
+
   if (is_win) {
     cflags = [
       "/wd4068",  # Unknown pragma.
@@ -107,35 +111,18 @@ test("wtf_unittests") {
   configs += [ "//third_party/WebKit/Source:config", ]
 
   deps = [
-    ":run_all_tests",
-    ":unittest_helpers",
+    ":test_support",
     ":wtf",
     "//base",
     "//base/allocator",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
-}
-
-source_set("run_all_tests") {
-  sources = [
-    "testing/RunAllTests.cpp",
-  ]
-
-  configs += [
-    ":wtf_config",
-    "//third_party/WebKit/Source:config",
-    "//third_party/WebKit/Source:non_test_config",
-  ]
-
-  deps = [
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
-component("unittest_helpers") {
+component("test_support") {
+  output_name = "wtf_test_support"
   sources = gypi_values.wtf_unittest_helper_files
   defines = [ "WTF_UNITTEST_HELPERS_IMPLEMENTATION=1" ]