From 511bf3435d698662f4f95fbd4722c9a6052680f8 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sun, 26 May 2019 13:59:48 -0400
Subject: [PATCH] yuzu_tester: Display results in table format
---
src/yuzu_tester/config.cpp | 1 -
src/yuzu_tester/service/yuzutest.cpp | 7 +++-
src/yuzu_tester/yuzu.cpp | 54 ++++++++++++++++++++++------
3 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/src/yuzu_tester/config.cpp b/src/yuzu_tester/config.cpp
index 62407efac..d7e0d408d 100644
--- a/src/yuzu_tester/config.cpp
+++ b/src/yuzu_tester/config.cpp
@@ -93,7 +93,6 @@ void Config::ReadValues() {
// System
Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false);
- Settings::values.enable_nfc = sdl2_config->GetBoolean("System", "enable_nfc", true);
const auto size = sdl2_config->GetInteger("System", "users_size", 0);
Settings::values.current_user = std::clamp<int>(
diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp
index c25ab4aba..a5e5bddb2 100644
--- a/src/yuzu_tester/service/yuzutest.cpp
+++ b/src/yuzu_tester/service/yuzutest.cpp
@@ -57,7 +57,12 @@ private:
}
void StartIndividual(Kernel::HLERequestContext& ctx) {
- LOG_DEBUG(Frontend, "called");
+ const auto name_raw = ctx.ReadBuffer();
+
+ const auto name = Common::StringFromFixedZeroTerminatedBuffer(
+ reinterpret_cast<const char*>(name_raw.data()), name_raw.size());
+
+ LOG_DEBUG(Frontend, "called, name={}", name);
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS);
diff --git a/src/yuzu_tester/yuzu.cpp b/src/yuzu_tester/yuzu.cpp
index 0f7067541..4b4e3d4fc 100644
--- a/src/yuzu_tester/yuzu.cpp
+++ b/src/yuzu_tester/yuzu.cpp
@@ -32,11 +32,6 @@
#include "yuzu_tester/emu_window/emu_window_sdl2_hide.h"
#include "yuzu_tester/service/yuzutest.h"
-#include <getopt.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-
#ifdef _WIN32
// windows.h needs to be included before shellapi.h
#include <windows.h>
@@ -44,6 +39,12 @@
#include <shellapi.h>
#endif
+#undef _UNICODE
+#include <getopt.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+
#ifdef _WIN32
extern "C" {
// tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable
@@ -170,12 +171,45 @@ int main(int argc, char** argv) {
bool finished = false;
int return_value = 0;
- const auto callback = [&finished, &return_value](std::vector<Service::Yuzu::TestResult>) {
+ const auto callback = [&finished,
+ &return_value](std::vector<Service::Yuzu::TestResult> results) {
finished = true;
- return_value = code & 0xFF;
- const auto text = fmt::format("Test Finished [Result Code: {:08X}]\n{}", code, string);
- LOG_INFO(Frontend, text.c_str());
- std::cout << text << std::endl;
+ return_value = 0;
+
+ const auto len =
+ std::max<u64>(std::max_element(results.begin(), results.end(),
+ [](const auto& lhs, const auto& rhs) {
+ return lhs.name.size() < rhs.name.size();
+ })
+ ->name.size(),
+ 9ull);
+
+ std::size_t passed = 0;
+ std::size_t failed = 0;
+
+ std::cout << fmt::format("Result [Res Code] | {:<{}} | Extra Data", "Test Name", len)
+ << std::endl;
+
+ for (const auto& res : results) {
+ const auto main_res = res.code == 0 ? "PASSED" : "FAILED";
+ if (res.code == 0)
+ ++passed;
+ else
+ ++failed;
+ std::cout << fmt::format("{} [{:08X}] | {:<{}} | {}", main_res, res.code, res.name, len,
+ res.data)
+ << std::endl;
+ }
+
+ std::cout << std::endl
+ << fmt::format("{:4d} Passed | {:4d} Failed | {:4d} Total | {:2.2f} Passed Ratio",
+ passed, failed, passed + failed,
+ static_cast<float>(passed) / (passed + failed))
+ << std::endl
+ << (failed == 0 ? "PASSED" : "FAILED") << std::endl;
+
+ if (failed > 0)
+ return_value = -1;
};
Core::System& system{Core::System::GetInstance()};