From 3a26b49c2cfb50f312bca63b897480c10bc6329c Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 10 Jun 2019 00:31:49 -0400 Subject: [PATCH] yuzutest: Add minor comments --- src/yuzu_tester/service/yuzutest.cpp | 2 +- src/yuzu_tester/yuzu.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp index a5e5bddb26..85d3f436b4 100644 --- a/src/yuzu_tester/service/yuzutest.cpp +++ b/src/yuzu_tester/service/yuzutest.cpp @@ -95,7 +95,7 @@ private: IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); - finish_callback(results); + finish_callback(std::move(results)); } std::string data; diff --git a/src/yuzu_tester/yuzu.cpp b/src/yuzu_tester/yuzu.cpp index 4b4e3d4fce..b589c3de3f 100644 --- a/src/yuzu_tester/yuzu.cpp +++ b/src/yuzu_tester/yuzu.cpp @@ -176,7 +176,10 @@ int main(int argc, char** argv) { finished = true; return_value = 0; - const auto len = + // Find the minimum length needed to fully enclose all test names (and the header field) in + // the fmt::format column by first finding the maximum size of any test name and comparing + // that to 9, the string length of 'Test Name' + const auto needed_length_name = std::max(std::max_element(results.begin(), results.end(), [](const auto& lhs, const auto& rhs) { return lhs.name.size() < rhs.name.size(); @@ -187,7 +190,8 @@ int main(int argc, char** argv) { std::size_t passed = 0; std::size_t failed = 0; - std::cout << fmt::format("Result [Res Code] | {:<{}} | Extra Data", "Test Name", len) + std::cout << fmt::format("Result [Res Code] | {:<{}} | Extra Data", "Test Name", + needed_length_name) << std::endl; for (const auto& res : results) { @@ -196,8 +200,8 @@ int main(int argc, char** argv) { ++passed; else ++failed; - std::cout << fmt::format("{} [{:08X}] | {:<{}} | {}", main_res, res.code, res.name, len, - res.data) + std::cout << fmt::format("{} [{:08X}] | {:<{}} | {}", main_res, res.code, res.name, + needed_length_name, res.data) << std::endl; } @@ -230,9 +234,6 @@ int main(int argc, char** argv) { case Core::System::ResultStatus::ErrorNotInitialized: LOG_CRITICAL(Frontend, "CPUCore not initialized"); return -1; - case Core::System::ResultStatus::ErrorSystemMode: - LOG_CRITICAL(Frontend, "Failed to determine system mode!"); - return -1; case Core::System::ResultStatus::ErrorVideoCore: LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!"); return -1;