Merge pull request eclipse-score#26 from qorix-group/prabakaran_bazel_remove_cargo_deps

bazel: Remove usage of .from_cargo in bzlmod

Author: qor-lb

BUILD

@@ -27,7 +27,6 @@ copyright_checker(
         "component_integration_tests",
         "docs",
         "internal_docs",
-        "patches",
         "scripts",
         "src",
         "tests",

Cargo.lock

@@ -78,4 +78,7 @@ alloc_instead_of_core = "warn"
 
 
 [workspace.lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(feature, values("bazel_build_iceoryx2_qnx8"))',
+    'cfg(loom)',
+] }

Cargo.toml

@@ -45,7 +45,18 @@ bazel_dep(name = "custom_qemu", version = "1.0.0", dev_dependency = True)
 
 bazel_dep(name = "googletest", version = "1.14.0")
 
+bazel_dep(name = "score_test_scenarios", version = "0.3.1", dev_dependency = True)
+
+# S-CORE crates
+bazel_dep(name = "score_crates")
+
 # Overrides
+git_override(
+    module_name = "score_test_scenarios",
+    commit = "2367017e92a65cf4dd2cebeee6d6db3b4d6a1447",
+    remote = "https://github.com/qorix-group/testing_tools.git",
+)
+
 git_override(
     module_name = "score_platform",
     commit = "bcab25561cdce7bd4eeebdb20b0ba4e2a4becc12",
@@ -70,6 +81,12 @@ git_override(
     remote = "https://github.com/qorix-group/score_virtualization.git",
 )
 
+git_override(
+    module_name = "score_crates",
+    commit = "dcbc6a4d36c9293549397893650c3a7068b0682d",
+    remote = "https://github.com/eclipse-score/score-crates.git",
+)
+
 archive_override(
     module_name = "rust_qnx8_toolchain",
     strip_prefix = "qnx8",
@@ -140,44 +157,3 @@ register_toolchains(
     "@toolchains_qnx_ifs//:ifs_aarch64",
     dev_dependency = True,
 )
-
-# Module deps
-
-# Crate configs
-crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
-crate.from_cargo(
-    name = "score_kyron_crates",
-    cargo_lockfile = "//:Cargo.lock",
-    manifests = [
-        "//:Cargo.toml",
-        "//:src/kyron-foundation/Cargo.toml",
-        "//:src/kyron/Cargo.toml",
-        "//src/kyron-macros:Cargo.toml",
-        "//:src/kyron-testing/Cargo.toml",
-        "//src/kyron-testing-macros:Cargo.toml",
-        "//:src/logging_tracing/Cargo.toml",
-        "//:src/xtask/Cargo.toml",
-        "//component_integration_tests/rust_test_scenarios:Cargo.toml",
-    ],
-
-    # This shall not be here but rules_rust 0.61.0 or even 0.67.0 does not correct finds out that when we use out platform it shall append
-    # aarch64-unknown-nto-qnx710 or best aarch64-unknown-nto-qnx800 which is not fully supported in any rust_rules version for now (even if rustc 1.86.0 already supports it)
-    supported_platform_triples = [
-        "aarch64-unknown-nto-qnx710",  # This enables also QNX8 becasue OS and CPU for platform matches....
-        "x86_64-unknown-linux-gnu",
-        "x86_64-unknown-none",
-    ],
-)
-crate.annotation(
-    crate = "iceoryx2-bb-derive-macros",
-    patches = ["//patches:iceoryx2_bb_derive_macros_readme.patch"],
-    repositories = ["score_kyron_crates"],
-)
-
-#iceoryx2 does not yet support QNX8 correctly
-crate.annotation(
-    crate = "iceoryx2-pal-posix",
-    patches = ["//patches:qnx8_iceoryx2.patch"],
-    repositories = ["score_kyron_crates"],
-)
-use_repo(crate, "score_kyron_crates")

MODULE.bazel

@@ -22,3 +22,7 @@ markers =
     root_required: root permissions are required for this test.
     do_not_repeat: do not repeat this test when using pytest-repeat.
     only_nightly: run this test only in nightly runs.
+
+filterwarnings =
+    ignore::pytest.PytestWarning
+    ignore::pytest.PytestExperimentalApiWarning

component_integration_tests/python_test_cases/pytest.ini

@@ -229,7 +229,7 @@ def pytest_runtest_makereport(item, call):
             command.append(token)
     report.command = " ".join(command)
     # If bazel is used, modify command
-    if "BAZEL_VERSION" in os.environ:
+    if "BAZEL_TEST" in os.environ:
         report.command = report.command.replace(
             "component_integration_tests/rust_test_scenarios/rust_test_scenarios",
             "bazel run //component_integration_tests/rust_test_scenarios:rust_test_scenarios --",

component_integration_tests/python_test_cases/tests/conftest.py

@@ -11,7 +11,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@rules_rust//rust:defs.bzl", "rust_binary")
-load("@score_kyron_crates//:defs.bzl", "all_crate_deps")
 
 rust_binary(
     name = "rust_test_scenarios",
@@ -23,7 +22,12 @@ rust_binary(
     deps = [
         "//src/kyron:libkyron",
         "//src/kyron-foundation:libkyron_foundation",
-    ] + all_crate_deps(
-        normal = True,
-    ),
+        "@score_crates//:futures",
+        "@score_crates//:libc",
+        "@score_crates//:serde",
+        "@score_crates//:serde_json",
+        "@score_crates//:tracing",
+        "@score_crates//:tracing_subscriber",
+        "@score_test_scenarios//test_scenarios_rust",
+    ],
 )

component_integration_tests/rust_test_scenarios/BUILD

@@ -12,7 +12,7 @@ libc.workspace = true
 futures = "0.3.31"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-test_scenarios_rust = { git = "https://github.com/eclipse-score/testing_tools.git", tag = "v0.3.0" }
+test_scenarios_rust = { git = "https://github.com/qorix-group/testing_tools.git", rev = "2367017e92a65cf4dd2cebeee6d6db3b4d6a1447" }
 
 [lints.clippy]
 unwrap_used = "deny"

component_integration_tests/rust_test_scenarios/Cargo.toml

@@ -1,12 +1,15 @@
 mod internals;
 mod tests;
 
-use test_scenarios_rust::cli::run_cli_app;
+use test_scenarios_rust::cli::{create_tracing_subscriber, run_cli_app};
 use test_scenarios_rust::test_context::TestContext;
 
 use crate::tests::root_scenario_group;
 
 fn main() -> Result<(), String> {
+    let subscriber = create_tracing_subscriber();
+    tracing::subscriber::set_global_default(subscriber).expect("Setting default subscriber failed!");
+
     let raw_arguments: Vec<String> = std::env::args().collect();
 
     // Root group.