diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /src/devices/tests | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/devices/tests')
| -rw-r--r-- | src/devices/tests/meson.build | 2 | ||||
| -rw-r--r-- | src/devices/tests/test-acd.c | 2 | ||||
| -rw-r--r-- | src/devices/tests/test-lldp.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/tests/meson.build b/src/devices/tests/meson.build index bb53d1ee..1ddd4f85 100644 --- a/src/devices/tests/meson.build +++ b/src/devices/tests/meson.build @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1+ + test_units = [ 'test-acd', 'test-lldp', diff --git a/src/devices/tests/test-acd.c b/src/devices/tests/test-acd.c index da5e4f2d..32d6f669 100644 --- a/src/devices/tests/test-acd.c +++ b/src/devices/tests/test-acd.c @@ -157,7 +157,7 @@ again: } g_error ("expected check for address #%d (%s) to %s, but it didn't", - i, nm_utils_inet4_ntop (info->addresses[i], sbuf), + i, _nm_utils_inet4_ntop (info->addresses[i], sbuf), info->expected_result[i] ? "detect no duplicated" : "detect a duplicate"); } } diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index bd71c9e3..8fc4ad67 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -501,7 +501,7 @@ test_recv (TestRecvFixture *fixture, gconstpointer user_data) data->check (loop, listener); nm_clear_g_source (&sd_id); - g_clear_pointer (&loop, g_main_loop_unref); + nm_clear_pointer (&loop, g_main_loop_unref); } static void |