colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: common logging method definition for all testers and helpers

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-08 15:13:53 +02:00
parent f1e930d574
commit e956bac47b
29 changed files with 80 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/cinterion/tests/test-modem-helpers-cinterion.c
View File

@@ -21,7 +21,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-cinterion.h"
@@ -858,27 +858,6 @@ test_ctzu_urc_full (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

22
plugins/huawei/tests/test-modem-helpers-huawei.c
View File

@@ -22,6 +22,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log-test.h"
#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-huawei.h"
@@ -1248,27 +1249,6 @@ test_hcsq (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/icera/tests/test-modem-helpers-icera.c
View File

@@ -24,7 +24,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-icera.h"
@@ -175,27 +175,6 @@ test_ipdpaddr (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/linktop/tests/test-modem-helpers-linktop.c
View File

@@ -21,7 +21,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-linktop.h"
@@ -59,27 +59,6 @@ test_cfun_query_current_modes (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/mbm/tests/test-modem-helpers-mbm.c
View File

@@ -24,7 +24,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-mbm.h"
@@ -253,27 +253,6 @@ test_cfun_query_current_modes (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/sierra/tests/test-modem-helpers-sierra.c
View File

@@ -22,7 +22,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-sierra.h"
@@ -115,27 +115,6 @@ test_scact_read_response_multiple (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/simtech/tests/test-modem-helpers-simtech.c
View File

@@ -21,7 +21,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-simtech.h"
@@ -317,27 +317,6 @@ test_rxdtmf_urc_one_cr (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/telit/tests/test-mm-modem-helpers-telit.c
View File

@@ -23,7 +23,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-telit.h"
@@ -572,27 +572,6 @@ test_telit_parse_qss_query (void)
/******************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/tests/test-keyfiles.c
View File

@@ -23,7 +23,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
/************************************************************/
@@ -64,27 +64,6 @@ test_foxconn_t77w968 (void)
/************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/tests/test-udev-rules.c
View File

@@ -25,7 +25,7 @@
#include <libmm-glib.h>
#include "mm-kernel-device-generic-rules.h"
#include "mm-log.h"
#include "mm-log-test.h"
/************************************************************/
@@ -162,27 +162,6 @@ test_fibocom (void)
/************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
View File

@@ -24,7 +24,7 @@
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-thuraya.h"
#include "mm-log.h"
#include "mm-log-test.h"
/*****************************************************************************/
/* Test CPMS response */
@@ -87,27 +87,6 @@ test_cpms_response_thuraya (void *f, gpointer d)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
#define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (GTestFixtureFunc) t, NULL)
int main (int argc, char **argv)

23
plugins/ublox/tests/test-modem-helpers-ublox.c
View File

@@ -22,7 +22,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-ublox.h"
@@ -979,27 +979,6 @@ test_ugcntrd_response (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
plugins/xmm/tests/test-modem-helpers-xmm.c
View File

@@ -22,7 +22,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-xmm.h"
@@ -754,27 +754,6 @@ test_xlcsslp_queries (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

1
src/Makefile.am
View File

@@ -101,6 +101,7 @@ libhelpers_la_SOURCES = \
mm-log-object.c \
mm-log.c \
mm-log.h \
mm-log-test.h \
mm-error-helpers.c \
mm-error-helpers.h \
mm-modem-helpers.c \

45
src/mm-log-test.h Normal file
View File

@@ -0,0 +1,45 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details:
*
* Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
*/
#ifndef MM_LOG_TEST_H
#define MM_LOG_TEST_H
#include <glib.h>
#include "mm-log.h"
/* This is a common logging method to be used by all test applications */
void
_mm_log (gpointer obj,
const gchar *loc,
const gchar *func,
guint32 level,
const gchar *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
#endif /* MM_LOG_TEST_H */

10
src/mm-log.c
View File

@@ -202,11 +202,11 @@ log_backend_systemd_journal (const char *loc,
#endif
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
MMLogLevel level,
const char *fmt,
_mm_log (gpointer obj,
const gchar *loc,
const gchar *func,
MMLogLevel level,
const gchar *fmt,
...)
{
va_list args;

10
src/mm-log.h
View File

@@ -37,11 +37,11 @@ typedef enum {
#define mm_info(...) mm_obj_info (NULL, ## __VA_ARGS__ )
#define mm_dbg(...) mm_obj_dbg (NULL, ## __VA_ARGS__ )
void _mm_log (gpointer obj,
const char *loc,
const char *func,
MMLogLevel level,
const char *fmt,
void _mm_log (gpointer obj,
const gchar *loc,
const gchar *func,
MMLogLevel level,
const gchar *fmt,
...) __attribute__((__format__ (__printf__, 5, 6)));
gboolean mm_log_set_level (const char *level, GError **error);

23
src/tests/test-at-serial-port.c
View File

@@ -18,7 +18,7 @@
#include <glib.h>
#include "mm-port-serial-at.h"
#include "mm-log.h"
#include "mm-log-test.h"
typedef struct {
const gchar *original;
@@ -64,27 +64,6 @@ at_serial_echo_removal (void)
}
}
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);

23
src/tests/test-charsets.c
View File

@@ -18,7 +18,7 @@
#include <locale.h>
#include "mm-modem-helpers.h"
#include "mm-log.h"
#include "mm-log-test.h"
static void
common_test_gsm7 (const gchar *in_utf8)
@@ -408,27 +408,6 @@ test_charset_can_covert_to (void)
}
}
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

21
src/tests/test-error-helpers.c
View File

@@ -52,27 +52,6 @@ TEST_ERROR_HELPER (MESSAGE_ERROR, message_error, MessageError)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
src/tests/test-modem-helpers-qmi.c
View File

@@ -21,7 +21,7 @@
#include "mm-enums-types.h"
#include "mm-modem-helpers-qmi.h"
#include "mm-log.h"
#include "mm-log-test.h"
static void
test_capabilities_expected (MMQmiCapabilitiesContext *ctx,
@@ -309,27 +309,6 @@ test_gobi3k_cdma (void)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
src/tests/test-modem-helpers.c
View File

@@ -22,7 +22,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-modem-helpers.h"
#include "mm-log.h"
#include "mm-log-test.h"
#define g_assert_cmpfloat_tolerance(val1, val2, tolerance) \
g_assert_cmpfloat (fabs (val1 - val2), <, tolerance)
@@ -4424,27 +4424,6 @@ test_bcd_to_string (void *f, gpointer d)
/*****************************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
#define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (GTestFixtureFunc) t, NULL)
int main (int argc, char **argv)

23
src/tests/test-qcdm-serial-port.c
View File

@@ -34,7 +34,7 @@
#include "libqcdm/src/utils.h"
#include "libqcdm/src/com.h"
#include "libqcdm/src/errors.h"
#include "mm-log.h"
#include "mm-log-test.h"
typedef struct {
int master;
@@ -437,27 +437,6 @@ test_pty_cleanup (TestData *d)
}
}
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
typedef void (*TCFunc) (TestData *, gconstpointer);
#define TESTCASE_PTY(s, t) g_test_add (s, TestData, NULL, (TCFunc)test_pty_create, (TCFunc)t, (TCFunc)test_pty_cleanup);

23
src/tests/test-sms-part-3gpp.c
View File

@@ -24,7 +24,7 @@
#include <libmm-glib.h>
#include "mm-sms-part-3gpp.h"
#include "mm-log.h"
#include "mm-log-test.h"
/********************* PDU PARSER TESTS *********************/
@@ -841,27 +841,6 @@ test_text_split_two_pdu_ucs2 (void)
/************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
src/tests/test-sms-part-cdma.c
View File

@@ -23,7 +23,7 @@
#include <libmm-glib.h>
#include "mm-sms-part-cdma.h"
#include "mm-log.h"
#include "mm-log-test.h"
/********************* PDU PARSER TESTS *********************/
@@ -502,27 +502,6 @@ test_create_pdu_text_unicode_encoding (void)
/************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
src/tests/test-udev-rules.c
View File

@@ -23,7 +23,7 @@
#include <libmm-glib.h>
#include "mm-kernel-device-generic-rules.h"
#include "mm-log.h"
#include "mm-log-test.h"
/************************************************************/
@@ -43,27 +43,6 @@ test_load_cleanup_core (void)
/************************************************************/
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!g_test_verbose ())
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");

23
test/mmrules.c
View File

@@ -23,7 +23,7 @@
#include <glib.h>
#include <gio/gio.h>
#include <mm-log.h>
#include <mm-log-test.h>
#include <mm-kernel-device-generic-rules.h>
#define PROGRAM_NAME "mmrules"
@@ -50,27 +50,6 @@ static GOptionEntry main_entries[] = {
{ NULL }
};
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!verbose_flag)
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
static void
print_version_and_exit (void)
{

23
test/mmsmspdu.c
View File

@@ -26,7 +26,7 @@
#include <ModemManager.h>
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-log-test.h"
#include "mm-sms-part-3gpp.h"
#define PROGRAM_NAME "mmsmspdu"
@@ -163,27 +163,6 @@ show_part_info (MMSmsPart *part)
}
}
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!verbose_flag)
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
static void
print_version_and_exit (void)
{

23
test/mmtty.c
View File

@@ -23,7 +23,7 @@
#include <glib.h>
#include <gio/gio.h>
#include <mm-log.h>
#include <mm-log-test.h>
#include <mm-port-serial.h>
#include <mm-port-serial-at.h>
#include <mm-serial-parsers.h>
@@ -83,27 +83,6 @@ signals_handler (int signum)
}
}
void
_mm_log (gpointer obj,
const char *loc,
const char *func,
guint32 level,
const char *fmt,
...)
{
va_list args;
gchar *msg;
if (!verbose_flag)
return;
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
g_print ("%s\n", msg);
g_free (msg);
}
static void
print_version_and_exit (void)
{