summaryrefslogtreecommitdiff
path: root/bus/config-parser.c
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2009-12-01 11:17:17 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2009-12-01 11:17:40 +0100
commit73b926275f7208f4663771b98a580f10e3aebb18 (patch)
treeeeeba5a8f22221af563a2625cb7a0fd2032aa2a7 /bus/config-parser.c
parent0992fb826d14fb138722feaf60903b58fef72e5e (diff)
downloaddbus-73b926275f7208f4663771b98a580f10e3aebb18.tar.gz
uses tcp based test connections for now
Diffstat (limited to 'bus/config-parser.c')
-rw-r--r--bus/config-parser.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c
index a4a01914..d8ae4590 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -3246,6 +3246,9 @@ static const char *test_session_service_dir_matches[] =
#ifdef DBUS_UNIX
"/testhome/foo/.testlocal/testshare/dbus-1/services",
#endif
+#ifdef DBUS_WIN
+ NULL,
+#endif
NULL
};
@@ -3369,6 +3372,9 @@ static const char *test_system_service_dir_matches[] =
"/testusr/testshare/dbus-1/system-services",
#endif
DBUS_DATADIR"/dbus-1/system-services",
+#ifdef DBUS_WIN
+ NULL,
+#endif
NULL
};
@@ -3498,8 +3504,12 @@ bus_config_parser_test (const DBusString *test_data_dir)
if (!test_default_session_servicedirs())
return FALSE;
+#ifdef DBUS_WIN
+ printf("default system service dir skipped\n");
+#else
if (!test_default_system_servicedirs())
return FALSE;
+#endif
if (!process_test_valid_subdir (test_data_dir, "valid-config-files", VALID))
return FALSE;