Skip to content

Commit 6709773

Browse files
committed
workaround baselibs integration issues
1 parent efe466d commit 6709773

5 files changed

Lines changed: 28 additions & 5 deletions

File tree

bazel_common/score_modules_target_sw.MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ bazel_dep(name = "score_persistency")
4545
git_override(
4646
module_name = "score_persistency",
4747
commit = "4d1fa1ae3c55d27d0f1e863b8cdf59a148651c5d",
48+
patch_strip = 1,
49+
patches = [
50+
"//patches/persistency:001-fix-string-view-to-string.patch",
51+
],
4852
remote = "https://github.com/eclipse-score/persistency.git",
4953
)
5054

known_good.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"//score/language/safecpp/aborts_upon_exception:abortsuponexception_toolchain_test",
1414
"//score/containers:dynamic_array_test",
1515
"//score/mw/log/configuration:*",
16-
"//score/json/examples:*"
16+
"//score/json/examples:*",
17+
"//score/flatbuffers/examples/config_usecase:demo_app"
1718
],
1819
"langs": [
1920
"cpp"
@@ -48,13 +49,18 @@
4849
"//score/mw/com/impl:runtime_test",
4950
"//score/mw/com/impl/configuration:config_parser_test",
5051
"//score/mw/com/impl/configuration:configuration_test",
51-
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test"
52+
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test",
53+
"//score/mw/com/impl/tracing:tracing_runtime_test",
54+
"//score/mw/com/impl/bindings/lola/tracing:tracing_runtime_test"
5255
]
5356
}
5457
},
5558
"score_persistency": {
5659
"repo": "https://github.com/eclipse-score/persistency.git",
5760
"hash": "4d1fa1ae3c55d27d0f1e863b8cdf59a148651c5d",
61+
"bazel_patches": [
62+
"//patches/persistency:001-fix-string-view-to-string.patch"
63+
],
5864
"metadata": {
5965
"extra_test_config": [
6066
"@score_baselibs_rust//src/log:safety_level=qm",
@@ -112,7 +118,8 @@
112118
"//score/datarouter/test/ut/ut_logging:persistentLogConfigUT",
113119
"//score/datarouter/test/ut/ut_logging:socketserverConfigUT",
114120
"//score/datarouter/test/ut/ut_logging:socketserverUT",
115-
"//score/mw/log/legacy_non_verbose_api:unit_test"
121+
"//score/mw/log/legacy_non_verbose_api:unit_test",
122+
"//score/mw/log/detail/data_router:unit_test"
116123
]
117124
}
118125
},
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/cpp/src/internal/kvs_helper.cpp b/src/cpp/src/internal/kvs_helper.cpp
2+
--- a/src/cpp/src/internal/kvs_helper.cpp
3+
+++ b/src/cpp/src/internal/kvs_helper.cpp
4+
@@ -240,7 +240,7 @@
5+
result = score::MakeUnexpected(ErrorCode::InvalidValueType);
6+
break;
7+
}
8+
- map.emplace(key.GetAsStringView().to_string(),
9+
+ map.emplace(std::string(key.GetAsStringView()),
10+
std::make_shared<KvsValue>(std::move(conv.value())));
11+
}
12+
if (!error)

patches/persistency/BUILD

Whitespace-only changes.

rust_coverage/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ rust_coverage_report(
3232
"linux-x86_64",
3333
"ferrocene-coverage",
3434
],
35-
query = 'kind("rust_test", @score_communication//score/mw/com/impl/...) -@score_communication//score/mw/com/impl:unit_test_runtime_single_exec -@score_communication//score/mw/com/impl:runtime_test -@score_communication//score/mw/com/impl/configuration:config_parser_test -@score_communication//score/mw/com/impl/configuration:configuration_test -@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test',
35+
query = 'kind("rust_test", @score_communication//score/mw/com/impl/...) -@score_communication//score/mw/com/impl:unit_test_runtime_single_exec -@score_communication//score/mw/com/impl:runtime_test -@score_communication//score/mw/com/impl/configuration:config_parser_test -@score_communication//score/mw/com/impl/configuration:configuration_test -@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test -@score_communication//score/mw/com/impl/tracing:tracing_runtime_test -@score_communication//score/mw/com/impl/bindings/lola/tracing:tracing_runtime_test',
3636
visibility = ["//visibility:public"],
3737
)
3838

@@ -82,6 +82,6 @@ rust_coverage_report(
8282
"linux-x86_64",
8383
"ferrocene-coverage",
8484
],
85-
query = 'kind("rust_test", @score_logging//score/...) -@score_logging//score/datarouter/test/ut/ut_logging:dltprotocolUT -@score_logging//score/datarouter/test/ut/ut_logging:persistentLogConfigUT -@score_logging//score/datarouter/test/ut/ut_logging:socketserverConfigUT -@score_logging//score/datarouter/test/ut/ut_logging:socketserverUT -@score_logging//score/mw/log/legacy_non_verbose_api:unit_test',
85+
query = 'kind("rust_test", @score_logging//score/...) -@score_logging//score/datarouter/test/ut/ut_logging:dltprotocolUT -@score_logging//score/datarouter/test/ut/ut_logging:persistentLogConfigUT -@score_logging//score/datarouter/test/ut/ut_logging:socketserverConfigUT -@score_logging//score/datarouter/test/ut/ut_logging:socketserverUT -@score_logging//score/mw/log/legacy_non_verbose_api:unit_test -@score_logging//score/mw/log/detail/data_router:unit_test',
8686
visibility = ["//visibility:public"],
8787
)

0 commit comments

Comments
 (0)