From 4077fcf351f0cad072911c84dabf2385e5dc8477 Mon Sep 17 00:00:00 2001 From: Darvin Harutyunyan <12006323+DarvinHarutyunyan@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:02:06 +0000 Subject: [PATCH 1/3] Fix: Config file path in ustore_server CLI --- pyproject.toml | 2 +- tests/test_units.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7d2a4dac..a4186784 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ filterwarnings = ["error"] testpaths = ["python/tests"] [tool.cibuildwheel] -build-verbosity = 3 +build-verbosity = 0 #manylinux-x86_64-image = "manylinux_2_28" environment = "CMAKE_ARGS_F=/tmp/cmake_args" diff --git a/tests/test_units.cpp b/tests/test_units.cpp index 63453439..361a50bd 100644 --- a/tests/test_units.cpp +++ b/tests/test_units.cpp @@ -82,7 +82,7 @@ static char const* path() { static std::string config() { auto dir = path(); if (!dir) - return {}; + return ""; return fmt::format(R"({{"version": "1.0", "directory": "{}"}})", dir); } @@ -2281,7 +2281,7 @@ int main(int argc, char** argv) { if (srv_id == 0) { usleep(1); // TODO Any statement is required to be run for successful `execl` run... std::string cli_args = fmt::format("--quiet --config {}", path()); - execl(srv_path.c_str(), srv_path.c_str(), cli_args, (char*)(NULL)); + execl(srv_path.c_str(), srv_path.c_str(), cli_args.c_str(), (char*)(NULL)); exit(0); } usleep(1000000); // 1 sec From 463b35152f6083681a395ecfde4c5f72e045e699 Mon Sep 17 00:00:00 2001 From: Darvin Harutyunyan <12006323+DarvinHarutyunyan@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:20:29 +0000 Subject: [PATCH 2/3] Fix: Terminate 'fmt::v9::format_error' string pointer is null --- tests/test_units.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_units.cpp b/tests/test_units.cpp index 361a50bd..299f76ae 100644 --- a/tests/test_units.cpp +++ b/tests/test_units.cpp @@ -2280,7 +2280,7 @@ int main(int argc, char** argv) { auto srv_id = fork(); if (srv_id == 0) { usleep(1); // TODO Any statement is required to be run for successful `execl` run... - std::string cli_args = fmt::format("--quiet --config {}", path()); + std::string cli_args = fmt::format("--quiet --config {}", path() ? path() : ""); execl(srv_path.c_str(), srv_path.c_str(), cli_args.c_str(), (char*)(NULL)); exit(0); } From 055227f8946d9a8f269864c02b7199077d91755c Mon Sep 17 00:00:00 2001 From: Darvin Harutyunyan <12006323+DarvinHarutyunyan@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:37:31 +0000 Subject: [PATCH 3/3] Fix: Empty space in Server CLI arguments for clipp parser --- tests/test_units.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_units.cpp b/tests/test_units.cpp index 299f76ae..b15f83a9 100644 --- a/tests/test_units.cpp +++ b/tests/test_units.cpp @@ -2280,7 +2280,7 @@ int main(int argc, char** argv) { auto srv_id = fork(); if (srv_id == 0) { usleep(1); // TODO Any statement is required to be run for successful `execl` run... - std::string cli_args = fmt::format("--quiet --config {}", path() ? path() : ""); + std::string cli_args = "--quiet" + (path() ? fmt::format(" --config {}", path()) : ""); execl(srv_path.c_str(), srv_path.c_str(), cli_args.c_str(), (char*)(NULL)); exit(0); }