From b55fc395746995ef13d58c3a9d932c6fee73feea Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 7 Dec 2023 15:49:11 +0000 Subject: [PATCH 1/2] Remove conflict marker Signed-off-by: Michael Carroll --- log/src/Log_TEST.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/log/src/Log_TEST.cc b/log/src/Log_TEST.cc index c33d9255..1faadb31 100644 --- a/log/src/Log_TEST.cc +++ b/log/src/Log_TEST.cc @@ -255,17 +255,7 @@ TEST(Log, NullDescriptorUnopenedLog) TEST(Log, OpenCorruptDatabase) { log::Log logFile; -<<<<<<< HEAD - std::string path = - testing::portablePathUnion(GZ_TRANSPORT_LOG_TEST_PATH, "data"); - path = testing::portablePathUnion(path, "state.tlog"); - - std::cout << path << std::endl; - - logFile.Open(path); -======= logFile.Open(kCorruptDbTestPath); ->>>>>>> gz-transport12 EXPECT_GT(logFile.EndTime(), 0ns) << "logFile.EndTime() == " << logFile.EndTime().count() << "ns";; } From b1b36d002ea37e92e8bebc8ea67c309e8061be50 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Thu, 7 Dec 2023 15:54:00 +0000 Subject: [PATCH 2/2] Fix missing define and header Signed-off-by: Michael Carroll --- log/BUILD.bazel | 1 + src/Node_TEST.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/log/BUILD.bazel b/log/BUILD.bazel index b0760e90..2dd8b610 100644 --- a/log/BUILD.bazel +++ b/log/BUILD.bazel @@ -73,6 +73,7 @@ test_sources = glob( ], defines = [ 'GZ_TRANSPORT_LOG_TEST_PATH=\\"transport/log/test\\"', + 'CORRUPT_DB_TEST_PATH=\\"transport/log/test/data/state.tlog\\"', ], env = { "GZ_BAZEL": "1", diff --git a/src/Node_TEST.cc b/src/Node_TEST.cc index f845fbbc..cb0d3177 100644 --- a/src/Node_TEST.cc +++ b/src/Node_TEST.cc @@ -29,6 +29,7 @@ #include #include "gz/transport/MessageInfo.hh" +#include "gz/transport/Node.hh" #include "gz/transport/TransportTypes.hh" #include