From f279e792b7c23a9fabce7c56c53c01fcf4e87547 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Thu, 4 Apr 2019 18:05:57 -0400 Subject: [PATCH] yuzutest: Support multiple tests per executable --- .../emu_window/emu_window_sdl2_hide.cpp | 13 ++-- src/yuzu_tester/service/yuzutest.cpp | 59 ++++++++++--------- src/yuzu_tester/service/yuzutest.h | 8 ++- src/yuzu_tester/yuzu.cpp | 2 +- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp index 3775a51e0..e7fe8decf 100644 --- a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp +++ b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp @@ -63,13 +63,12 @@ EmuWindow_SDL2_Hide::EmuWindow_SDL2_Hide() { std::string window_title = fmt::format("yuzu-tester {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); - render_window = - SDL_CreateWindow(window_title.c_str(), - SDL_WINDOWPOS_UNDEFINED, // x position - SDL_WINDOWPOS_UNDEFINED, // y position - Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height, - SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); - SDL_HideWindow(render_window); + render_window = SDL_CreateWindow(window_title.c_str(), + SDL_WINDOWPOS_UNDEFINED, // x position + SDL_WINDOWPOS_UNDEFINED, // y position + Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height, + SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | + SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_HIDDEN); if (render_window == nullptr) { LOG_CRITICAL(Frontend, "Failed to create SDL2 window! {}", SDL_GetError()); diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp index 026582027..c25ab4aba 100644 --- a/src/yuzu_tester/service/yuzutest.cpp +++ b/src/yuzu_tester/service/yuzutest.cpp @@ -11,20 +11,21 @@ namespace Service::Yuzu { -constexpr u64 SERVICE_VERSION = 1; +constexpr u64 SERVICE_VERSION = 0x00000002; class YuzuTest final : public ServiceFramework { public: - explicit YuzuTest(std::string data, std::function finish_callback) + explicit YuzuTest(std::string data, + std::function)> finish_callback) : ServiceFramework{"yuzutest"}, data(std::move(data)), finish_callback(std::move(finish_callback)) { static const FunctionInfo functions[] = { {0, &YuzuTest::Initialize, "Initialize"}, {1, &YuzuTest::GetServiceVersion, "GetServiceVersion"}, {2, &YuzuTest::GetData, "GetData"}, - {3, &YuzuTest::SetResultCode, "SetResultCode"}, - {4, &YuzuTest::SetResultData, "SetResultData"}, - {5, &YuzuTest::Finish, "Finish"}, + {10, &YuzuTest::StartIndividual, "StartIndividual"}, + {20, &YuzuTest::FinishIndividual, "FinishIndividual"}, + {100, &YuzuTest::ExitProgram, "ExitProgram"}, }; RegisterHandlers(functions); @@ -55,49 +56,51 @@ private: rb.Push(write_size); } - void SetResultCode(Kernel::HLERequestContext& ctx) { + void StartIndividual(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Frontend, "called"); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + + void FinishIndividual(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; + const auto code = rp.PopRaw(); - LOG_INFO(Frontend, "called with result_code={:08X}", code); - result_code = code; + const auto result_data_raw = ctx.ReadBuffer(); + const auto test_name_raw = ctx.ReadBuffer(1); + + const auto data = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(result_data_raw.data()), result_data_raw.size()); + const auto test_name = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(test_name_raw.data()), test_name_raw.size()); + + LOG_INFO(Frontend, "called, result_code={:08X}, data={}, name={}", code, data, test_name); + + results.push_back({code, data, test_name}); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); } - void SetResultData(Kernel::HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto buffer = ctx.ReadBuffer(); - std::string data = Common::StringFromFixedZeroTerminatedBuffer( - reinterpret_cast(buffer.data()), buffer.size()); - - LOG_INFO(Frontend, "called with string={}", data); - result_string = data; - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(RESULT_SUCCESS); - } - - void Finish(Kernel::HLERequestContext& ctx) { + void ExitProgram(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Frontend, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); - finish_callback(result_code, result_string); + finish_callback(results); } std::string data; - u32 result_code = 0; - std::string result_string; - - std::function finish_callback; + std::vector results; + std::function)> finish_callback; }; void InstallInterfaces(SM::ServiceManager& sm, std::string data, - std::function finish_callback) { + std::function)> finish_callback) { std::make_shared(data, finish_callback)->InstallAsService(sm); } diff --git a/src/yuzu_tester/service/yuzutest.h b/src/yuzu_tester/service/yuzutest.h index e68a24544..eca129c8c 100644 --- a/src/yuzu_tester/service/yuzutest.h +++ b/src/yuzu_tester/service/yuzutest.h @@ -13,7 +13,13 @@ class ServiceManager; namespace Service::Yuzu { +struct TestResult { + u32 code; + std::string data; + std::string name; +}; + void InstallInterfaces(SM::ServiceManager& sm, std::string data, - std::function finish_callback); + std::function)> finish_callback); } // namespace Service::Yuzu diff --git a/src/yuzu_tester/yuzu.cpp b/src/yuzu_tester/yuzu.cpp index 84d277fcf..0f7067541 100644 --- a/src/yuzu_tester/yuzu.cpp +++ b/src/yuzu_tester/yuzu.cpp @@ -170,7 +170,7 @@ int main(int argc, char** argv) { bool finished = false; int return_value = 0; - const auto callback = [&finished, &return_value](u32 code, std::string string) { + const auto callback = [&finished, &return_value](std::vector) { finished = true; return_value = code & 0xFF; const auto text = fmt::format("Test Finished [Result Code: {:08X}]\n{}", code, string);