1 files changed, 45 insertions, 22 deletions

diff --git a/deps/v8/test/cctest/BUILD.gn b/deps/v8/test/cctest/BUILD.gn
index fdb281140f..3dae59bac2 100644
--- a/deps/v8/test/cctest/BUILD.gn
+++ b/deps/v8/test/cctest/BUILD.gn
@@ -6,6 +6,34 @@ import("../../gni/v8.gni")
 
 v8_executable("cctest") {
   testonly = true
+  deps = [
+    ":cctest_sources",
+  ]
+  configs = [
+    "../..:external_config",
+    "../..:internal_config_base",
+  ]
+
+  ldflags = []
+
+  # TODO(machenbach): Translate from gyp.
+  #["OS=="aix"", {
+  #  "ldflags": [ "-Wl,-bbigtoc" ],
+  #}],
+
+  # crbug.com/676417: Suppress symbol import warning from linker.
+  if (is_win && is_component_build) {
+    ldflags += [
+      "/ignore:4217",
+      "/ignore:4049",
+    ]
+    remove_configs = [ "//build/config/win:default_incremental_linking" ]
+    configs += [ "//build/config/win:no_incremental_linking" ]
+  }
+}
+
+v8_source_set("cctest_sources") {
+  testonly = true
 
   sources = [
     "$target_gen_dir/resources.cc",
@@ -61,7 +89,6 @@ v8_executable("cctest") {
     "compiler/test-run-wasm-machops.cc",
     "compiler/value-helper.h",
     "expression-type-collector-macros.h",
-    "ffi/test-ffi.cc",
     "gay-fixed.cc",
     "gay-fixed.h",
     "gay-precision.cc",
@@ -119,7 +146,6 @@ v8_executable("cctest") {
     "test-bignum.cc",
     "test-bit-vector.cc",
     "test-circular-queue.cc",
-    "test-code-cache.cc",
     "test-code-layout.cc",
     "test-code-stub-assembler.cc",
     "test-compiler.cc",
@@ -150,7 +176,6 @@ v8_executable("cctest") {
     "test-identity-map.cc",
     "test-inobject-slack-tracking.cc",
     "test-intl.cc",
-    "test-list.cc",
     "test-liveedit.cc",
     "test-lockers.cc",
     "test-log.cc",
@@ -200,13 +225,27 @@ v8_executable("cctest") {
     "wasm/test-run-wasm-relocation.cc",
     "wasm/test-run-wasm-simd.cc",
     "wasm/test-run-wasm.cc",
+    "wasm/test-streaming-compilation.cc",
     "wasm/test-wasm-breakpoints.cc",
     "wasm/test-wasm-interpreter-entry.cc",
     "wasm/test-wasm-stack.cc",
     "wasm/test-wasm-trap-position.cc",
+    "wasm/wasm-run-utils.cc",
     "wasm/wasm-run-utils.h",
   ]
 
+  if (use_jumbo_build) {
+    jumbo_excluded_sources = [
+      # TODO(mostynb@opera.com): figure out the jumbo issues with these source
+      # files, and include them in jumbo compilation units.
+      "interpreter/bytecode-expectations-printer.cc",
+      "interpreter/bytecode-expectations-printer.h",
+      "interpreter/test-bytecode-generator.cc",
+      "test-api.cc",
+      "test-api.h",
+    ]
+  }
+
   if (v8_current_cpu == "arm") {
     sources += [  ### gcmole(arch:arm) ###
       "test-assembler-arm.cc",
@@ -318,14 +357,9 @@ v8_executable("cctest") {
     "../..:internal_config_base",
   ]
 
-  # TODO(machenbach): Translate from gyp.
-  #["OS=="aix"", {
-  #  "ldflags": [ "-Wl,-bbigtoc" ],
-  #}],
-
-  deps = [
+  public_deps = [
     ":resources",
-    "../..:v8_builtins_generators",
+    "../..:v8_initializers",
     "../..:v8_libbase",
     "../..:v8_libplatform",
     "../..:wasm_module_runner",
@@ -334,6 +368,7 @@ v8_executable("cctest") {
   ]
 
   defines = []
+  deps = []
 
   if (is_component_build) {
     # cctest can't be built against a shared library, so we
@@ -351,18 +386,6 @@ v8_executable("cctest") {
   }
 
   cflags = []
-  ldflags = []
-
-  # crbug.com/676417: Suppress symbol import warning from linker.
-  if (is_win && is_component_build) {
-    ldflags += [
-      "/ignore:4217",
-      "/ignore:4049",
-    ]
-    remove_configs = [ "//build/config/win:default_incremental_linking" ]
-    configs += [ "//build/config/win:no_incremental_linking" ]
-  }
-
   if (v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
       v8_current_cpu == "arm" || v8_current_cpu == "arm64" ||
       v8_current_cpu == "s390" || v8_current_cpu == "s390x" ||