diff --git a/tests/includes/source/main.cpp b/tests/includes/source/main.cpp index 4fbca68..5439e3c 100644 --- a/tests/includes/source/main.cpp +++ b/tests/includes/source/main.cpp @@ -51,16 +51,8 @@ int main(int argc, char **argv) { runtime.addPragma("pattern_limit", DummyPragmaHandler); runtime.addDefine("__PL_UNIT_TESTS__"); - } - // Execute pattern - if (!runtime.executeString(patternFile.readString())) { - fmt::print("Error during execution!\n"); - - if (const auto &hardError = runtime.getError(); hardError.has_value()) - fmt::print("Hard error: {}:{} - {}\n\n", hardError->line, hardError->column, hardError->message); - - for (const auto &[level, message] : runtime.getConsoleLog()) { + runtime.setLogCallback([](auto level, const std::string &message) { switch (level) { using enum pl::core::LogConsole::Level; case Debug: fmt::print(" [DEBUG] "); break; @@ -70,7 +62,15 @@ int main(int argc, char **argv) { } fmt::print("{}\n", message); - } + }); + } + + // Execute pattern + if (!runtime.executeString(patternFile.readString())) { + fmt::print("Error during execution!\n"); + + if (const auto &hardError = runtime.getError(); hardError.has_value()) + fmt::print("Hard error: {}:{} - {}\n\n", hardError->line, hardError->column, hardError->message); return EXIT_FAILURE; } diff --git a/tests/patterns/source/main.cpp b/tests/patterns/source/main.cpp index db76dbb..94827a5 100644 --- a/tests/patterns/source/main.cpp +++ b/tests/patterns/source/main.cpp @@ -52,16 +52,8 @@ int main(int argc, char **argv) { runtime.setIncludePaths({ includePath }); runtime.addPragma("MIME", DummyPragmaHandler); runtime.addDefine("__PL_UNIT_TESTS__"); - } - - // Execute pattern - if (!runtime.executeString(patternFile.readString())) { - fmt::print("Error during execution!\n"); - - if (const auto &hardError = runtime.getError(); hardError.has_value()) - fmt::print("Hard error: {}:{} - {}\n\n", hardError->line, hardError->column, hardError->message); - - for (const auto &[level, message] : runtime.getConsoleLog()) { + + runtime.setLogCallback([](auto level, const std::string &message) { switch (level) { using enum pl::core::LogConsole::Level; case Debug: fmt::print(" [DEBUG] "); break; @@ -71,7 +63,16 @@ int main(int argc, char **argv) { } fmt::print("{}\n", message); - } + }); + } + + + // Execute pattern + if (!runtime.executeString(patternFile.readString())) { + fmt::print("Error during execution!\n"); + + if (const auto &hardError = runtime.getError(); hardError.has_value()) + fmt::print("Hard error: {}:{} - {}\n\n", hardError->line, hardError->column, hardError->message); return EXIT_FAILURE; }