Attachment 113377 Details for Bug 83539 – Add manual-paths test executable (update)

[patch] Add manual-paths test executable (update)

0001-Add-manual-paths-test-executable-with-cmake-build-su.patch (text/plain), 4.31 KB, created by Ralf Habacker on 2015-02-11 20:52:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-02-11 20:52:09 UTC

Size: 4.31 KB

patch

obsolete

>From cd6d61368af207bababf2b65f2d26abd827a69ff Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 11 Feb 2015 18:09:14 +0100
>Subject: [PATCH] Add manual-paths test executable with cmake build support.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83539
>Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> cmake/CMakeLists.txt      |  2 ++
> cmake/config.h.cmake      |  1 +
> cmake/test/CMakeLists.txt |  7 +++++
> test/manual-paths.c       | 73 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 83 insertions(+)
> create mode 100644 test/manual-paths.c
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index b997f8b..45b7d06 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -63,6 +63,8 @@ if (NOT DBUS_DATADIR)
>     SET(DBUS_DATADIR ${DATADIR})
> endif()
> 
>+set(DBUS_PREFIX ${DBUS_INSTALL_DIR})
>+
> set(prefix                   ${DBUS_INSTALL_DIR})
> set(exec_prefix              ${prefix})
> set(EXPANDED_LIBDIR          ${DBUS_INSTALL_DIR}/lib)
>diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
>index f718052..cd4720c 100644
>--- a/cmake/config.h.cmake
>+++ b/cmake/config.h.cmake
>@@ -17,6 +17,7 @@
> #cmakedefine DBUS_CONSOLE_AUTH_DIR "@DBUS_CONSOLE_AUTH_DIR@"
> #cmakedefine DBUS_DATADIR  "@DBUS_DATADIR@"
> #cmakedefine DBUS_BINDIR   "@DBUS_BINDIR@"
>+#cmakedefine DBUS_PREFIX "@DBUS_PREFIX@"
> #cmakedefine DBUS_SYSTEM_CONFIG_FILE  "@DBUS_SYSTEM_CONFIG_FILE@"
> #cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
> #cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
>diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
>index 477beb4..c5e73bc 100644
>--- a/cmake/test/CMakeLists.txt
>+++ b/cmake/test/CMakeLists.txt
>@@ -58,6 +58,10 @@ set (manual-tcp_SOURCES
>     ${CMAKE_SOURCE_DIR}/../test/manual-tcp.c
> )
> 
>+set (manual-paths_SOURCES
>+    ${CMAKE_SOURCE_DIR}/../test/manual-paths.c
>+)
>+
> add_helper_executable(manual-dir-iter ${manual-dir-iter_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
> add_helper_executable(test-service ${test-service_SOURCES} dbus-testutils)
> add_helper_executable(test-names ${test-names_SOURCES} dbus-testutils)
>@@ -69,6 +73,9 @@ add_helper_executable(test-exit ${test-exit_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
> add_helper_executable(test-segfault ${test-segfault_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
> add_helper_executable(test-sleep-forever ${test-sleep-forever_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
> add_test_executable(manual-tcp ${manual-tcp_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
>+if(WIN32)
>+    add_helper_executable(manual-paths ${manual-paths_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
>+endif()
> 
> if(DBUS_WITH_GLIB)
>     message(STATUS "with glib test apps")
>diff --git a/test/manual-paths.c b/test/manual-paths.c
>new file mode 100644
>index 0000000..4ce3ffc
>--- /dev/null
>+++ b/test/manual-paths.c
>@@ -0,0 +1,73 @@
>+/*
>+ * Simple manual paths check
>+ *
>+ * syntax:  manual-paths
>+ *
>+*/
>+
>+#include "config.h"
>+#include "dbus/dbus-list.h"
>+#include "dbus/dbus-internals.h"
>+#include "dbus/dbus-sysdeps.h"
>+
>+#include <stdio.h>
>+
>+dbus_bool_t print_install_root()
>+{
>+  char runtime_prefix[1000];
>+
>+  if (!_dbus_get_install_root(runtime_prefix, sizeof(runtime_prefix)))
>+    {
>+      fprintf(stderr, "dbus_get_install_root() failed\n");
>+      return FALSE;
>+    }
>+  fprintf(stdout, "dbus_get_install_root() returned '%s'\n", runtime_prefix);
>+  return TRUE;
>+}
>+
>+dbus_bool_t print_service_dirs()
>+{
>+  DBusList *dirs;
>+  DBusList *link;
>+  dirs = NULL;
>+
>+  if (!_dbus_get_standard_session_servicedirs (&dirs))
>+    _dbus_assert_not_reached ("couldn't get standard dirs");
>+
>+  while ((link = _dbus_list_pop_first_link (&dirs)))
>+    {
>+      printf ("default service dir: %s\n", (char *)link->data);
>+      dbus_free (link->data);
>+      _dbus_list_free_link (link);
>+    }
>+  dbus_free (dirs);
>+  return TRUE;
>+}
>+
>+dbus_bool_t print_replace_install_prefix(const char *s)
>+{
>+  const char *s2 = _dbus_replace_install_prefix(s);
>+  if (!s2)
>+    return FALSE;
>+
>+  fprintf(stdout, "replaced '%s' by '%s'\n", s, s2);
>+  return TRUE;
>+}
>+
>+int
>+main (int argc, char **argv)
>+{
>+  if (!print_install_root())
>+    return -1;
>+
>+  if (!print_service_dirs())
>+    return -2;
>+
>+  if (!print_replace_install_prefix(DBUS_BINDIR "/dbus-daemon"))
>+    return -3;
>+
>+  if (!print_replace_install_prefix("c:\\Windows\\System32\\testfile"))
>+    return -4;
>+
>+  return 0;
>+}
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 83539: 105816 | 106930 | 106931 | 113363 | 113364 | 113377 | 118346 | 118349 | 118350 | 118540 | 118617 | 118618 | 118652

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.