From 06fb5f71a40a5c5a2fd290ac92c843e8e9c4d6ef Mon Sep 17 00:00:00 2001 From: Priyanka Patil Date: Fri, 31 Jul 2026 10:08:59 +0530 Subject: [PATCH] Remove obsolete py_unittest_qnx_test macro and all references --- bazel/unit_tests.bzl | 16 +++------------- score/network/BUILD | 6 ++---- score/network/test/BUILD | 5 ++--- score/os/test/BUILD | 9 +++------ score/os/test/qnx/BUILD | 7 ++----- score/os/utils/qnx/resource_manager/BUILD | 7 +++---- third_party/itf/py_unittest_qnx_test.bzl | 19 ------------------- 7 files changed, 15 insertions(+), 54 deletions(-) delete mode 100644 third_party/itf/py_unittest_qnx_test.bzl diff --git a/bazel/unit_tests.bzl b/bazel/unit_tests.bzl index cf5ab65547..7fe0873287 100644 --- a/bazel/unit_tests.bzl +++ b/bazel/unit_tests.bzl @@ -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): """ @@ -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, ) diff --git a/score/network/BUILD b/score/network/BUILD index 2fd5af88ef..04d2c12cae 100644 --- a/score/network/BUILD +++ b/score/network/BUILD @@ -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", @@ -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__"], ) diff --git a/score/network/test/BUILD b/score/network/test/BUILD index c2526781ed..9dae8804b5 100644 --- a/score/network/test/BUILD +++ b/score/network/test/BUILD @@ -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", @@ -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", diff --git a/score/os/test/BUILD b/score/os/test/BUILD index 7ee3b48299..6e157d017b 100644 --- a/score/os/test/BUILD +++ b/score/os/test/BUILD @@ -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__", @@ -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", @@ -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 = [ diff --git a/score/os/test/qnx/BUILD b/score/os/test/qnx/BUILD index af70c25f49..2c0975f485 100644 --- a/score/os/test/qnx/BUILD +++ b/score/os/test/qnx/BUILD @@ -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 = [ @@ -21,9 +20,9 @@ package( ], ) -py_unittest_qnx_test( +test_suite( name = "unit_tests_qnx", - test_cases = [ + tests = [ ":channel_test", ":channel_impl_test", ":devctl_test", @@ -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 diff --git a/score/os/utils/qnx/resource_manager/BUILD b/score/os/utils/qnx/resource_manager/BUILD index fcc8e2e113..de2ebaca79 100644 --- a/score/os/utils/qnx/resource_manager/BUILD +++ b/score/os/utils/qnx/resource_manager/BUILD @@ -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 = [ @@ -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", diff --git a/third_party/itf/py_unittest_qnx_test.bzl b/third_party/itf/py_unittest_qnx_test.bzl deleted file mode 100644 index 5485119a18..0000000000 --- a/third_party/itf/py_unittest_qnx_test.bzl +++ /dev/null @@ -1,19 +0,0 @@ -# ******************************************************************************* -# Copyright (c) 2025 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# SPDX-License-Identifier: Apache-2.0 -# ******************************************************************************* - -def py_unittest_qnx_test(**kwargs): - # This is intentionally left blank. - # The cc_test_qnx from @score_qnx_unit_tests can be used here, - # but we rely on executing tests on QNX via the run_under approach in this repository. - # See .bazelrc for details. - pass