Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

[platform/upstream/dbus.git] / test / shell-test.c

diff --git a/test/shell-test.c b/test/shell-test.c
index 46a387d..d1dc5b5 100644 (file)
--- a/test/shell-test.c
+++ b/test/shell-test.c
@@ -1,11 +1,13 @@
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#define DBUS_COMPILATION
+
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-list.h>
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-shell.h>
 #include <dbus/dbus-string.h>
+#include <dbus/dbus-sysdeps.h>
 
 static dbus_bool_t
 test_command_line (const char *arg1, ...)
@@ -20,7 +22,7 @@ test_command_line (const char *arg1, ...)
   DBusError error;
 
   va_start (var_args, arg1);
-  _dbus_list_append (&list, arg1);
+  _dbus_list_append (&list, (char *)arg1);
   do
     {
       tmp = va_arg (var_args, char *);
@@ -95,7 +97,7 @@ main (int argc, char **argv)
       || !test_command_line ("/opt/gnome/bin/service-start", NULL)
       || !test_command_line ("grep", "-l", "-r", "-i", "'whatever'", "files*.c", NULL)
       || !test_command_line ("/home/boston/johnp/devel-local/dbus/test/test-segfault", NULL)
-      || !test_command_line ("ls", "-l", "-a", "--colors", "/tmp", NULL)
+      || !test_command_line ("ls", "-l", "-a", "--colors", _dbus_get_tmpdir(), NULL)
       || !test_command_line ("rsync-to-server", NULL)
       || !test_command_line ("test-segfault", "--no-segfault", NULL)
       || !test_command_line ("evolution", "mailto:pepe@cuco.com", NULL)