summaryrefslogtreecommitdiff
path: root/guile
diff options
context:
space:
mode:
authorDirk-Jan C. Binnema <djcb@djcbsoftware.nl>2022-08-10 08:20:58 +0300
committerDirk-Jan C. Binnema <djcb@djcbsoftware.nl>2022-08-11 22:55:10 +0300
commit317fe53ff7b045978be1b7286de5b6539ac21b0e (patch)
tree5991348d9df1d33319c5e5eb59873d202021bbc0 /guile
parent84cd6942c46a8bccad1d4dd3f585273aa81a5f2c (diff)
tests: update test helpers and users
Move test-mu-common to mu-test-utils. Use mu_test_init as a wrapper for g_test_init. Update users.
Diffstat (limited to 'guile')
-rw-r--r--guile/tests/meson.build2
-rw-r--r--guile/tests/test-mu-guile.cc10
2 files changed, 3 insertions, 9 deletions
diff --git a/guile/tests/meson.build b/guile/tests/meson.build
index 7cb61f5..dc89051 100644
--- a/guile/tests/meson.build
+++ b/guile/tests/meson.build
@@ -28,4 +28,4 @@ test('test-mu-guile',
'-DGUILE_LOAD_PATH="' + guile_load_path + '"',
'-DGUILE_EXTENSIONS_PATH="' + guile_load_path + '"'
],
- dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
+ dependencies: [glib_dep, lib_mu_dep]))
diff --git a/guile/tests/test-mu-guile.cc b/guile/tests/test-mu-guile.cc
index b7172bf..a630d16 100644
--- a/guile/tests/test-mu-guile.cc
+++ b/guile/tests/test-mu-guile.cc
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <string.h>
-#include "test-mu-common.hh"
+#include "utils/mu-test-utils.hh"
#include <lib/mu-store.hh>
#include <utils/mu-utils.hh>
@@ -116,7 +116,7 @@ main(int argc, char* argv[])
TempDir tempdir;
test_dir = tempdir.path();
- g_test_init(&argc, &argv, NULL);
+ mu_test_init(&argc, &argv);
if (!set_en_us_utf8_locale())
return 0; /* don't error out... */
@@ -125,12 +125,6 @@ main(int argc, char* argv[])
g_test_add_func("/guile/message", test_mu_guile_messages);
g_test_add_func("/guile/stats", test_mu_guile_stats);
- g_log_set_handler(NULL,
- (GLogLevelFlags)(G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING |
- G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION),
- (GLogFunc)black_hole,
- NULL);
-
rv = g_test_run();
return rv;