commit 8c8d16a1c53f4a0cf4c03a339f1224966676aed0
author Corentin Wallez <cwallez@chromium.org> Mon Apr 13 21:23:46 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Apr 13 21:23:46 2020 +0000
tree 04422ceed313072b9125f07deca14d18887f5923
parent 582e5284d0f617d73cd37a2a756c802a3216382d

BUILD.gn: Move dawn_end2end_tests to its final location

Bug: chromium:1064305
Change-Id: Ie51377301117a8ffbc6c21dc4c58349871bcf232
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/19285
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index eb7872d..3a134d8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -28,57 +28,6 @@
 }
 
 ###############################################################################
-# Temporary Dawn end2end test target
-###############################################################################
-
-# It is not possible to move a target around with a proxy group without
-# breaking swarming tests. This is a temporary target that is a duplicate of
-# //src/tests:dawn_end2end_tests that's used temporarily so that we can land
-# the split of src/tests/BUILD.gn in a Chromium roll and switch which targets
-# the swarmed tests use.
-
-import("//testing/test.gni")
-
-test("dawn_end2end_tests") {
-  configs += [ "src/common:dawn_internal" ]
-
-  deps = [
-    "src/common",
-    "src/dawn:dawncpp",
-    "src/dawn:libdawn_proc",
-    "src/dawn_native",
-    "src/dawn_wire",
-    "src/tests:dawn_end2end_tests_sources",
-    "src/tests:dawn_white_box_tests_sources",
-    "src/tests:gmock_and_gtest",
-    "src/utils:dawn_utils",
-  ]
-
-  sources = [
-    "src/tests/DawnTest.cpp",
-    "src/tests/DawnTest.h",
-  ]
-
-  libs = []
-
-  # When building inside Chromium, use their gtest main function because it is
-  # needed to run in swarming correctly.
-  if (build_with_chromium) {
-    sources += [ "//gpu/dawn_end2end_tests_main.cc" ]
-  } else {
-    sources += [ "src/tests/End2EndTestsMain.cpp" ]
-  }
-
-  if (dawn_enable_opengl) {
-    deps += [ "src/utils:dawn_glfw" ]
-  }
-
-  if (is_chromeos) {
-    libs += [ "gbm" ]
-  }
-}
-
-###############################################################################
 # Temporary groups
 ###############################################################################
 
@@ -93,7 +42,7 @@
 group("dawn_end2end_tests_temp_group") {
   testonly = true
   public_deps = [
-    ":dawn_end2end_tests",
+    "src/tests:dawn_end2end_tests",
   ]
 }
 

src/tests/BUILD.gn

diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index d5c8916..ce36e25 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -360,6 +360,7 @@
   libs = []
 }
 
+# Temporary target that will be removed once Chromium switches to using the non-_tmp version below
 test("dawn_end2end_tests_tmp") {
   configs += [ "${dawn_root}/src/common:dawn_internal" ]
 
@@ -399,6 +400,45 @@
   }
 }
 
+test("dawn_end2end_tests") {
+  configs += [ "${dawn_root}/src/common:dawn_internal" ]
+
+  deps = [
+    ":dawn_end2end_tests_sources",
+    ":dawn_white_box_tests_sources",
+    ":gmock_and_gtest",
+    "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawncpp",
+    "${dawn_root}/src/dawn:libdawn_proc",
+    "${dawn_root}/src/dawn_native",
+    "${dawn_root}/src/dawn_wire",
+    "${dawn_root}/src/utils:dawn_utils",
+  ]
+
+  sources = [
+    "DawnTest.cpp",
+    "DawnTest.h",
+  ]
+
+  libs = []
+
+  # When building inside Chromium, use their gtest main function because it is
+  # needed to run in swarming correctly.
+  if (build_with_chromium) {
+    sources += [ "//gpu/dawn_end2end_tests_main.cc" ]
+  } else {
+    sources += [ "End2EndTestsMain.cpp" ]
+  }
+
+  if (dawn_enable_opengl) {
+    deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+  }
+
+  if (is_chromeos) {
+    libs += [ "gbm" ]
+  }
+}
+
 ###############################################################################
 # Dawn perf tests
 ###############################################################################