diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /src/tests/config | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'src/tests/config')
| -rw-r--r-- | src/tests/config/meson.build | 2 | ||||
| -rw-r--r-- | src/tests/config/test-config.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/tests/config/meson.build b/src/tests/config/meson.build index e3ebfa19..cfe9c615 100644 --- a/src/tests/config/meson.build +++ b/src/tests/config/meson.build @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1+ + test_config_dir = meson.current_source_dir() test_unit = 'test-config' diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 1c28e976..e6c04efd 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -978,7 +978,7 @@ test_config_enable (void) guint match_nm_version = _nm_config_match_nm_version; char *match_env = g_strdup (_nm_config_match_env); - g_clear_pointer (&_nm_config_match_env, g_free); + nm_clear_g_free (&_nm_config_match_env); _nm_config_match_env = g_strdup ("something-else"); _nm_config_match_nm_version = nm_encode_version (1, 3, 4); @@ -992,14 +992,14 @@ test_config_enable (void) g_clear_object (&config); _nm_config_match_nm_version = nm_encode_version (1, 5, 3); - g_clear_pointer (&_nm_config_match_env, g_free); + nm_clear_g_free (&_nm_config_match_env); _nm_config_match_env = g_strdup ("test-match-env-1"); config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL); assert_config_value (nm_config_get_data_orig (config), "test-group-config-enable-1", "key1", "enabled"); g_clear_object (&config); _nm_config_match_nm_version = match_nm_version; - g_clear_pointer (&_nm_config_match_env, g_free); + nm_clear_g_free (&_nm_config_match_env); _nm_config_match_env = match_env; } |