system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 09:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

dispatcher: make test-dispatcher-envp not take an argument

Browse source 
Compile srcdir into test-dispatcher-envp rather than passing it on the
command-line, to make it easier to run by hand, and so we can use
automake's TESTS support.
This commit is contained in:
Dan Winship 2014-09-18 11:34:21 -04:00
parent 1a5cfc1f45
commit 8d26c45184
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
callouts/tests/Makefile.am
View file

@ -7,6 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/callouts \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DSRCDIR=\"$(abs_srcdir)\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
@ -26,8 +27,7 @@ test_dispatcher_envp_LDADD = \
###########################################
check-local: test-dispatcher-envp
$(abs_builddir)/test-dispatcher-envp $(abs_srcdir)
TESTS = test-dispatcher-envp
EXTRA_DIST= \
dispatcher-old-down \

36
callouts/tests/test-dispatcher-envp.c
View file

@ -429,7 +429,7 @@ out:
/*******************************************/
static void
test_generic (const char *path, const char *file, const char *override_vpn_ip_iface)
test_generic (const char *file, const char *override_vpn_ip_iface)
{
GVariant *con_dict = NULL;
GVariant *con_props = NULL;
@ -451,7 +451,7 @@ test_generic (const char *path, const char *file, const char *override_vpn_ip_if
char **denv, **iter;
/* Read in the test file */
p = g_strdup_printf ("%s/%s", path, file);
p = g_build_filename (SRCDIR, file, NULL);
success = get_dispatcher_file (p,
&con_dict,
&con_props,
@ -551,36 +551,36 @@ test_generic (const char *path, const char *file, const char *override_vpn_ip_if
/*******************************************/
static void
test_old_up (const char *path)
test_old_up (void)
{
test_generic (path, "dispatcher-old-up", NULL);
test_generic ("dispatcher-old-up", NULL);
}
static void
test_old_down (const char *path)
test_old_down (void)
{
test_generic (path, "dispatcher-old-down", NULL);
test_generic ("dispatcher-old-down", NULL);
}
static void
test_old_vpn_up (const char *path)
test_old_vpn_up (void)
{
test_generic (path, "dispatcher-old-vpn-up", NULL);
test_generic ("dispatcher-old-vpn-up", NULL);
}
static void
test_old_vpn_down (const char *path)
test_old_vpn_down (void)
{
test_generic (path, "dispatcher-old-vpn-down", NULL);
test_generic ("dispatcher-old-vpn-down", NULL);
}
static void
test_up_empty_vpn_iface (const char *path)
test_up_empty_vpn_iface (void)
{
/* Test that an empty VPN iface variable, like is passed through D-Bus
* from NM, is ignored by the dispatcher environment construction code.
*/
test_generic (path, "dispatcher-old-up", "");
test_generic ("dispatcher-old-up", "");
}
/*******************************************/
@ -588,20 +588,18 @@ test_up_empty_vpn_iface (const char *path)
int
main (int argc, char **argv)
{
g_assert (argc > 1);
g_test_init (&argc, &argv, NULL);
#if !GLIB_CHECK_VERSION (2, 35, 0)
g_type_init ();
#endif
g_test_add_data_func ("/dispatcher/old_up", argv[1], (GTestDataFunc) test_old_up);
g_test_add_data_func ("/dispatcher/old_down", argv[1], (GTestDataFunc) test_old_down);
g_test_add_data_func ("/dispatcher/old_vpn_up", argv[1], (GTestDataFunc) test_old_vpn_up);
g_test_add_data_func ("/dispatcher/old_vpn_down", argv[1], (GTestDataFunc) test_old_vpn_down);
g_test_add_func ("/dispatcher/old_up", test_old_up);
g_test_add_func ("/dispatcher/old_down", test_old_down);
g_test_add_func ("/dispatcher/old_vpn_up", test_old_vpn_up);
g_test_add_func ("/dispatcher/old_vpn_down", test_old_vpn_down);
g_test_add_data_func ("/dispatcher/up_empty_vpn_iface", argv[1], (GTestDataFunc) test_up_empty_vpn_iface);
g_test_add_func ("/dispatcher/up_empty_vpn_iface", test_up_empty_vpn_iface);
return g_test_run ();
}