From c348901ebb4ed4f1831b44ecc280f0b895196a63 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 28 Nov 2017 23:46:04 +0100 Subject: [PATCH] testsuite: Log to stderr Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/logging.h | 5 +++++ src/libpakfire/libpakfire.sym | 2 ++ tests/libpakfire/main.c | 2 ++ tests/testsuite.c | 13 +++++++++++++ tests/testsuite.h | 1 + 5 files changed, 23 insertions(+) diff --git a/src/libpakfire/include/pakfire/logging.h b/src/libpakfire/include/pakfire/logging.h index ae0d45e5f..96b93d9c2 100644 --- a/src/libpakfire/include/pakfire/logging.h +++ b/src/libpakfire/include/pakfire/logging.h @@ -35,6 +35,11 @@ void pakfire_log_set_function(pakfire_log_function_t func); int pakfire_log_get_priority(); void pakfire_log_set_priority(int priority); +void pakfire_log_stderr(int priority, const char* file, + int line, const char* fn, const char* format, va_list args); +void pakfire_log_syslog(int priority, const char* file, + int line, const char* fn, const char* format, va_list args); + #ifdef PAKFIRE_PRIVATE typedef struct pakfire_logging_config { diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index 470818cf0..addb0a66b 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -104,6 +104,8 @@ global: pakfire_log_get_priority; pakfire_log_set_function; pakfire_log_set_priority; + pakfire_log_stderr; + pakfire_log_syslog; # package pakfire_package_add_conflicts; diff --git a/tests/libpakfire/main.c b/tests/libpakfire/main.c index 4d6108e14..caebf741f 100644 --- a/tests/libpakfire/main.c +++ b/tests/libpakfire/main.c @@ -37,6 +37,8 @@ static int test_init(const test_t* t) { } int main(int argc, char** argv) { + testsuite_init(); + testsuite_t* ts = testsuite_create(1); testsuite_add_test(ts, "test_init", test_init); diff --git a/tests/testsuite.c b/tests/testsuite.c index ca99a1f21..e77388178 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -20,6 +20,19 @@ #include "testsuite.h" +#include +#include + +int testsuite_init() { + // Initialize the pakfire library + int r = pakfire_init(); + if (r) + return r; + + // Log to stderr + pakfire_log_set_function(pakfire_log_stderr); +} + int test_run(const test_t* t) { LOG("running %s\n", t->name); diff --git a/tests/testsuite.h b/tests/testsuite.h index f99bd20c6..406512dd6 100644 --- a/tests/testsuite.h +++ b/tests/testsuite.h @@ -36,6 +36,7 @@ typedef struct testsuite { size_t left; } testsuite_t; +int testsuite_init(); testsuite_t* testsuite_create(size_t n); int testsuite_add_test(testsuite_t* ts, const char* name, test_function_t func); int testsuite_run(testsuite_t* ts); -- 2.39.5