Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions bazel/unit_tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# *******************************************************************************

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

def cc_unit_test_suites_for_host_and_qnx(name, cc_unit_tests = None, visibility = None, test_suites_from_sub_packages = None, excluded_tests_filter = None):
"""
Expand Down Expand Up @@ -48,21 +47,12 @@ def cc_unit_test_suites_for_host_and_qnx(name, cc_unit_tests = None, visibility
visibility = visibility,
)

if cc_unit_tests:
py_unittest_qnx_test(
name = name + "_qnx_cases",
testonly = True,
test_cases = cc_unit_tests,
excluded_tests_filter = excluded_tests_filter,
)

_qnx_test_suites_from_sub_packages = [test_suite + "_qnx" for test_suite in test_suites_from_sub_packages] if test_suites_from_sub_packages else []
_qnx_test_suites = [":" + name + "_qnx_cases"] + _qnx_test_suites_from_sub_packages if cc_unit_tests else _qnx_test_suites_from_sub_packages
_qnx_tests = (cc_unit_tests if cc_unit_tests else []) + _qnx_test_suites_from_sub_packages

py_unittest_qnx_test(
native.test_suite(
name = name + "_qnx",
tags = ["manual"],
test_suites = _qnx_test_suites,
tests = _qnx_tests,
visibility = visibility,
)

Expand Down
6 changes: 2 additions & 4 deletions score/network/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# *******************************************************************************

load("@rules_cc//cc:defs.bzl", "cc_library")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

test_suite(
name = "unit_tests",
Expand All @@ -22,10 +21,9 @@ test_suite(
visibility = ["//platform/aas/lib:__pkg__"],
)

py_unittest_qnx_test(
test_suite(
name = "unit_tests_qnx",
tags = ["manual"],
test_suites = ["@score_baselibs//score/network/test:unit_tests_qnx"],
tests = ["@score_baselibs//score/network/test:unit_tests_qnx"],
visibility = ["//platform/aas/lib:__pkg__"],
)

Expand Down
5 changes: 2 additions & 3 deletions score/network/test/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# *******************************************************************************

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

test_suite(
name = "unit_tests",
Expand All @@ -24,9 +23,9 @@ test_suite(
visibility = ["@score_baselibs//score/network:__pkg__"],
)

py_unittest_qnx_test(
test_suite(
name = "unit_tests_qnx",
test_cases = [
tests = [
":ipv4_address_test",
":netutils_qnx_test",
":udp_socket_test",
Expand Down
9 changes: 3 additions & 6 deletions score/os/test/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@score_baselibs//score/os:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

package(default_visibility = [
"@score_baselibs//score/os/test:__subpackages__",
Expand Down Expand Up @@ -62,16 +61,16 @@ test_suite(
],
)

py_unittest_qnx_test(
test_suite(
name = "unit_tests_qnx",
test_cases = [
tests = [
":acl_test",
":arpa_inet_test",
":asil_qm_test",
":capability_test",
":cpuid_test",
":dlfcn_impl_test",
":dirent_test",
":dlfcn_impl_test",
":errno_test",
":fcntl_test",
":file_stream_test",
Expand Down Expand Up @@ -110,8 +109,6 @@ py_unittest_qnx_test(
":time_test",
":uname_test",
":version_test",
],
test_suites = [
"@score_baselibs//score/os/test/qnx:unit_tests_qnx",
],
visibility = [
Expand Down
7 changes: 2 additions & 5 deletions score/os/test/qnx/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@score_baselibs//score/os:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

package(
default_visibility = [
"@score_baselibs//score/os/test/qnx:__subpackages__",
],
)

py_unittest_qnx_test(
test_suite(
name = "unit_tests_qnx",
test_cases = [
tests = [
":channel_test",
":channel_impl_test",
":devctl_test",
Expand Down Expand Up @@ -51,8 +50,6 @@ py_unittest_qnx_test(
":pcap_test",
":sigevent_qnx_test",
":qnx_version_test",
],
test_suites = [
"@score_baselibs//score/os/utils/qnx/resource_manager:unit_tests_qnx",
],
visibility = ["//visibility:public"], # platform_only
Expand Down
7 changes: 3 additions & 4 deletions score/os/utils/qnx/resource_manager/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
load("@score_baselibs//score/os:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")

package(
default_visibility = [
Expand All @@ -33,14 +32,14 @@ test_suite(
],
)

py_unittest_qnx_test(
test_suite(
name = "unit_tests_qnx",
test_cases = [
tests = [
":error_test",
":resource_manager_test",
":resource_test",
":static_c_wrappers_test",
":simple_read_function_test",
":static_c_wrappers_test",
],
visibility = [
"//visibility:public",
Expand Down
19 changes: 0 additions & 19 deletions third_party/itf/py_unittest_qnx_test.bzl

This file was deleted.

Loading