diff options
| author | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
| commit | 743faa81fda27a9c03298e8d6074623dc30db606 (patch) | |
| tree | 28418e92b22530bb05f043084626291ed1e3d46b /src/tests/config | |
| parent | 8dda18a856c2a05cefcab6278469c9d8df30f935 (diff) | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
Update upstream source from tag 'upstream/1.10.2'
Update to upstream version '1.10.2' with Debian dir 41691ea145b392588cd4e9e7496b61d5a95965fb
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); |