Revert "Separate out modular and evergreen test targets" (#1873)

Reverts youtube/cobalt#1662 `elf_loader_test` is needed by non-evergreen test runs too, though it shouldn't contain any tests. b/302008891
youtube · Oct 30, 2023 · f64375a · f64375a
1 parent 0d1b171
commit f64375a
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 73 deletions.
diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn
@@ -88,7 +88,7 @@ if (sb_is_evergreen_compatible) {
   }
 }
 
-if (current_toolchain == starboard_toolchain && sb_is_evergreen_compatible) {
+if (current_toolchain == starboard_toolchain) {
   target(starboard_level_final_executable_type, "elf_loader_sandbox") {
     data_deps = [ "//third_party/icu:icudata" ]
     if (cobalt_font_package == "empty") {
@@ -155,33 +155,31 @@ if (sb_is_evergreen_compatible) {
   }
 }
 
-if (sb_is_evergreen_compatible) {
-  target(gtest_target_type, "elf_loader_test") {
-    testonly = true
-    sources = [ "//starboard/common/test_main.cc" ]
-    deps = [
-      "//starboard",
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
+target(gtest_target_type, "elf_loader_test") {
+  testonly = true
+  sources = [ "//starboard/common/test_main.cc" ]
+  deps = [
+    "//starboard",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
 
-    if (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm" ||
-        target_cpu == "arm64") {
-      sources += [
-        "dynamic_section_test.cc",
-        "elf_header_test.cc",
-        "elf_loader_test.cc",
-        "lz4_file_impl_test.cc",
-        "program_table_test.cc",
-        "relocations_test.cc",
-      ]
-      deps += [
-        ":copy_elf_loader_testdata",
-        ":elf_loader",
-      ]
+  if (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm" ||
+      target_cpu == "arm64") {
+    sources += [
+      "dynamic_section_test.cc",
+      "elf_header_test.cc",
+      "elf_loader_test.cc",
+      "lz4_file_impl_test.cc",
+      "program_table_test.cc",
+      "relocations_test.cc",
+    ]
+    deps += [
+      ":copy_elf_loader_testdata",
+      ":elf_loader",
+    ]
 
-      data_deps = [ ":copy_elf_loader_testdata" ]
-    }
+    data_deps = [ ":copy_elf_loader_testdata" ]
   }
 }
 

diff --git a/starboard/loader_app/BUILD.gn b/starboard/loader_app/BUILD.gn
@@ -235,22 +235,20 @@ static_library("installation_manager") {
   ]
 }
 
-if (sb_is_evergreen || sb_is_evergreen_compatible) {
-  target(gtest_target_type, "installation_manager_test") {
-    testonly = true
-    sources = [
-      "//starboard/common/test_main.cc",
-      "installation_manager_test.cc",
-      "pending_restart_test.cc",
-    ]
-    deps = [
-      ":installation_manager",
-      ":installation_store_proto",
-      ":pending_restart",
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
-  }
+target(gtest_target_type, "installation_manager_test") {
+  testonly = true
+  sources = [
+    "//starboard/common/test_main.cc",
+    "installation_manager_test.cc",
+    "pending_restart_test.cc",
+  ]
+  deps = [
+    ":installation_manager",
+    ":installation_store_proto",
+    ":pending_restart",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
 }
 
 static_library("slot_management") {
@@ -275,24 +273,22 @@ static_library("slot_management") {
   }
 }
 
-if (sb_is_evergreen || sb_is_evergreen_compatible) {
-  target(gtest_target_type, "slot_management_test") {
-    testonly = true
-    sources = [
-      "//starboard/common/test_main.cc",
-      "slot_management_test.cc",
-    ]
-    deps = [
-      ":app_key_files",
-      ":drain_file",
-      ":installation_manager",
-      ":installation_store_proto",
-      ":slot_management",
-      "//starboard/elf_loader:sabi_string",
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
-  }
+target(gtest_target_type, "slot_management_test") {
+  testonly = true
+  sources = [
+    "//starboard/common/test_main.cc",
+    "slot_management_test.cc",
+  ]
+  deps = [
+    ":app_key_files",
+    ":drain_file",
+    ":installation_manager",
+    ":installation_store_proto",
+    ":slot_management",
+    "//starboard/elf_loader:sabi_string",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
 }
 
 static_library("pending_restart") {
@@ -324,17 +320,15 @@ static_library("reset_evergreen_update") {
   deps = [ "//starboard" ]
 }
 
-if (sb_is_evergreen || sb_is_evergreen_compatible) {
-  target(gtest_target_type, "reset_evergreen_update_test") {
-    testonly = true
-    sources = [
-      "//starboard/common/test_main.cc",
-      "reset_evergreen_update_test.cc",
-    ]
-    deps = [
-      ":reset_evergreen_update",
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
-  }
+target(gtest_target_type, "reset_evergreen_update_test") {
+  testonly = true
+  sources = [
+    "//starboard/common/test_main.cc",
+    "reset_evergreen_update_test.cc",
+  ]
+  deps = [
+    ":reset_evergreen_update",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
 }