diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
| commit | f1c906035c6ea7eb635664835c153aed553dc2e5 (patch) | |
| tree | 7b870b6cef1f902486dc706084124c6964b342a6 /src/tests/config | |
| parent | d6158994abe7b2be73443f933ed7fdcc40954c24 (diff) | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
Merge tag 'debian/1.10.4-1' into bionic
network-manager Debian release 1.10.4-1
Diffstat (limited to 'src/tests/config')
| -rw-r--r-- | src/tests/config/test-config.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 80e17d01..89b22a9f 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -318,6 +318,7 @@ test_config_global_dns (void) g_object_unref (config); } +#if WITH_CONCHECK static void test_config_connectivity_check (void) { @@ -351,6 +352,7 @@ test_config_connectivity_check (void) g_assert (remove (CONFIG_INTERN) == 0); } +#endif static void test_config_no_auto_default (void) @@ -368,7 +370,7 @@ test_config_no_auto_default (void) g_assert_cmpint (nwrote, ==, 18); nwrote = write (fd, "44:44:44:44:44:44\n", 18); g_assert_cmpint (nwrote, ==, 18); - close (fd); + nm_close (fd); config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "", "--no-auto-default", state_file, @@ -1053,7 +1055,9 @@ main (int argc, char **argv) g_test_add_func ("/config/set-values", test_config_set_values); g_test_add_func ("/config/global-dns", test_config_global_dns); +#if WITH_CONCHECK g_test_add_func ("/config/connectivity-check", test_config_connectivity_check); +#endif g_test_add_func ("/config/signal", test_config_signal); |