Skip to content

Commit

Permalink
Build evergreen specific test targets only for non-windows platforms (#…
Browse files Browse the repository at this point in the history
…1918)

Reverts #1873 partially
Internal failures have been fixed.

Note: For disabling evergreen specific tests for all non-evergreen
platforms b/309493306 needs to be fixed.
As a step in the right direction we are just disabling building
disabling evergreen specific tests for windows platforms at the moment.

b/302008891

(cherry picked from commit 34c46ca)
  • Loading branch information
niranjanyardi authored and anonymous1-me committed Nov 6, 2023
1 parent 2539292 commit b19dc1f
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 65 deletions.
52 changes: 28 additions & 24 deletions starboard/elf_loader/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import("//starboard/build/config/os_definitions.gni")

_elf_loader_sources = [
"dynamic_section.cc",
"dynamic_section.h",
Expand Down Expand Up @@ -88,7 +90,7 @@ if (sb_is_evergreen_compatible) {
}
}

if (current_toolchain == starboard_toolchain) {
if (current_toolchain == starboard_toolchain && !is_host_win) {
target(starboard_level_final_executable_type, "elf_loader_sandbox") {
data_deps = [ "//third_party/icu:icudata" ]
if (cobalt_font_package == "empty") {
Expand Down Expand Up @@ -152,31 +154,33 @@ 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",
]

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 (!is_host_win) {
target(gtest_target_type, "elf_loader_test") {
testonly = true
sources = [ "//starboard/common/test_main.cc" ]
deps = [
"//starboard",
"//testing/gmock",
"//testing/gtest",
]

data_deps = [ ":copy_elf_loader_testdata" ]
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" ]
}
}
}

Expand Down
90 changes: 49 additions & 41 deletions starboard/loader_app/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import("//starboard/build/config/os_definitions.gni")

_common_loader_app_sources = [
"loader_app.cc",
"loader_app_switches.cc",
Expand Down Expand Up @@ -247,20 +249,22 @@ static_library("installation_manager") {
]
}

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",
]
if (!is_host_win) {
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") {
Expand All @@ -285,22 +289,24 @@ static_library("slot_management") {
}
}

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",
]
if (!is_host_win) {
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") {
Expand Down Expand Up @@ -332,15 +338,17 @@ static_library("reset_evergreen_update") {
deps = [ "//starboard" ]
}

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",
]
if (!is_host_win) {
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",
]
}
}

0 comments on commit b19dc1f

Please sign in to comment.