diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fe-common/core/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/fe-common/core/test-formats.c | 4 | ||||
| -rw-r--r-- | tests/irc/core/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/irc/core/test-irc.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am index 070b6052..f048e95c 100644 --- a/tests/fe-common/core/Makefile.am +++ b/tests/fe-common/core/Makefile.am @@ -21,8 +21,7 @@ test_formats_LDADD = \ ../../../src/fe-common/core/libfe_common_core.a \ ../../../src/core/libcore.a \ ../../../src/lib-config/libirssi_config.a \ - @GLIB_LIBS@ \ - @OPENSSL_LIBS@ + @PROG_LIBS@ test_formats_SOURCES = \ test-formats.c diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c index 9ef23fd6..aee5a219 100644 --- a/tests/fe-common/core/test-formats.c +++ b/tests/fe-common/core/test-formats.c @@ -15,7 +15,7 @@ format_real_length_test_case const format_real_length_fixtures[] = { { .description = "", .input = "%4%w ", - .result = { 0, 5, 5, -1 }, + .result = { 4, 5, 5, -1 }, }, }; @@ -31,7 +31,9 @@ int main(int argc, char **argv) g_free(name); } +#if GLIB_CHECK_VERSION(2,38,0) g_test_set_nonfatal_assertions(); +#endif return g_test_run(); } diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am index ccc6aa97..86f1d547 100644 --- a/tests/irc/core/Makefile.am +++ b/tests/irc/core/Makefile.am @@ -22,8 +22,7 @@ test_irc_LDADD = \ ../../../src/irc/core/libirc_core.a \ ../../../src/core/libcore.a \ ../../../src/lib-config/libirssi_config.a \ - @GLIB_LIBS@ \ - @OPENSSL_LIBS@ + @PROG_LIBS@ test_irc_SOURCES = \ test-irc.c diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c index c96956df..3eaf7020 100644 --- a/tests/irc/core/test-irc.c +++ b/tests/irc/core/test-irc.c @@ -197,7 +197,9 @@ int main(int argc, char **argv) g_free(name); } +#if GLIB_CHECK_VERSION(2,38,0) g_test_set_nonfatal_assertions(); +#endif return g_test_run(); } |