summaryrefslogtreecommitdiff
path: root/test/buildtool
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-02-20 13:15:38 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-02-20 16:24:25 +0100
commit04765b75fd186329755695a9afba906edfcda135 (patch)
treed67671a95a478780358ee40c3b87fda38c42efb0 /test/buildtool
parent413d9ee4211a78a35e753bb7d6b21211ae928fbd (diff)
downloadjustbuild-04765b75fd186329755695a9afba906edfcda135.tar.gz
Separate off id generation to a separate library
... and rename appropriately to reflect contents more precisely than the generic "common". This separation also disentangles dependencies a bit.
Diffstat (limited to 'test/buildtool')
-rw-r--r--test/buildtool/execution_api/bazel/TARGETS1
-rw-r--r--test/buildtool/execution_api/bazel/bytestream_client.test.cpp2
-rw-r--r--test/buildtool/execution_api/common/TARGETS1
-rw-r--r--test/buildtool/execution_api/common/bytestream_utils.test.cpp2
-rw-r--r--test/buildtool/storage/TARGETS1
-rw-r--r--test/buildtool/storage/large_object_cas.test.cpp2
6 files changed, 6 insertions, 3 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index a5ddbc77..7b1a139e 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -58,6 +58,7 @@
, ["@", "src", "src/buildtool/crypto", "hash_function"]
, ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
+ , ["@", "src", "src/buildtool/execution_api/common", "ids"]
, ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
, ["@", "src", "src/buildtool/execution_api/remote", "config"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
diff --git a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
index fa50eb0a..07d85671 100644
--- a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
@@ -26,7 +26,7 @@
#include "src/buildtool/common/remote/remote_common.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
#include "src/buildtool/execution_api/common/bytestream_utils.hpp"
-#include "src/buildtool/execution_api/common/execution_common.hpp"
+#include "src/buildtool/execution_api/common/ids.hpp"
#include "src/buildtool/execution_api/remote/config.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index 864a5e7c..2990c7e7 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -34,6 +34,7 @@
, ["@", "src", "src/buildtool/crypto", "hash_function"]
, ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
+ , ["@", "src", "src/buildtool/execution_api/common", "ids"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
, ["@", "src", "src/utils/cpp", "expected"]
, ["", "catch-main"]
diff --git a/test/buildtool/execution_api/common/bytestream_utils.test.cpp b/test/buildtool/execution_api/common/bytestream_utils.test.cpp
index 82faef38..4c20b7f2 100644
--- a/test/buildtool/execution_api/common/bytestream_utils.test.cpp
+++ b/test/buildtool/execution_api/common/bytestream_utils.test.cpp
@@ -21,7 +21,7 @@
#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/common/artifact_digest_factory.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
-#include "src/buildtool/execution_api/common/execution_common.hpp"
+#include "src/buildtool/execution_api/common/ids.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "src/utils/cpp/expected.hpp"
#include "test/utils/hermeticity/test_hash_function_type.hpp"
diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS
index d6119462..a941ea56 100644
--- a/test/buildtool/storage/TARGETS
+++ b/test/buildtool/storage/TARGETS
@@ -60,6 +60,7 @@
, "bazel_msg_factory"
]
, ["@", "src", "src/buildtool/execution_api/common", "common"]
+ , ["@", "src", "src/buildtool/execution_api/common", "ids"]
, ["@", "src", "src/buildtool/file_system", "file_system_manager"]
, ["@", "src", "src/buildtool/file_system", "object_type"]
, ["@", "src", "src/buildtool/storage", "config"]
diff --git a/test/buildtool/storage/large_object_cas.test.cpp b/test/buildtool/storage/large_object_cas.test.cpp
index 76ee7f88..64dba3d6 100644
--- a/test/buildtool/storage/large_object_cas.test.cpp
+++ b/test/buildtool/storage/large_object_cas.test.cpp
@@ -30,7 +30,7 @@
#include "src/buildtool/common/protocol_traits.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
#include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
-#include "src/buildtool/execution_api/common/execution_common.hpp"
+#include "src/buildtool/execution_api/common/ids.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "src/buildtool/storage/config.hpp"