test/daemon: SSO_BIN_DIR is used for executables

diff --git a/src/daemon/plugins/plugind/Makefile.am b/src/daemon/plugins/plugind/Makefile.am
index 8e26fe1..06e13ac 100644 (file)
--- a/src/daemon/plugins/plugind/Makefile.am
+++ b/src/daemon/plugins/plugind/Makefile.am
@@ -35,3 +35,8 @@ gsignond_plugind_LDADD = \
     $(GSIGNOND_LIBS) \
     $(NULL)
 
+all-local: slink
+
+slink:
+       $(MKDIR_P) $(abs_top_builddir)/src/daemon/.libs
+       ln -sf $(abs_top_builddir)/src/daemon/plugins/plugind/.libs/gsignond-plugind $(abs_top_builddir)/src/daemon/.libs/gsignond-plugind

diff --git a/src/plugins/digest/Makefile.am b/src/plugins/digest/Makefile.am
index c7e45f8..81ee198 100644 (file)
--- a/src/plugins/digest/Makefile.am
+++ b/src/plugins/digest/Makefile.am
@@ -21,5 +21,5 @@ libdigest_la_SOURCES = \
 all-local: slink
 
 slink:
-       ln -sf $(top_builddir)/src/plugins/digest/.libs/libdigest.so ../.libs/libdigest.so
+       ln -sf $(abs_top_builddir)/src/plugins/digest/.libs/libdigest.so ../.libs/libdigest.so
 

diff --git a/src/plugins/password/Makefile.am b/src/plugins/password/Makefile.am
index 834e961..3c83302 100644 (file)
--- a/src/plugins/password/Makefile.am
+++ b/src/plugins/password/Makefile.am
@@ -21,4 +21,4 @@ libpassword_la_SOURCES = \
 all-local: slink
 
 slink:
-       ln -sf $(top_builddir)/src/plugins/password/.libs/libpassword.so ../.libs/libpassword.so
+       ln -sf $(abs_top_builddir)/src/plugins/password/.libs/libpassword.so ../.libs/libpassword.so

diff --git a/src/plugins/ssotest/Makefile.am b/src/plugins/ssotest/Makefile.am
index f2a9297..c1e8493 100644 (file)
--- a/src/plugins/ssotest/Makefile.am
+++ b/src/plugins/ssotest/Makefile.am
@@ -21,6 +21,6 @@ libssotest_la_SOURCES = \
 all-local: slink
 
 slink:
-       ln -sf $(top_builddir)/src/plugins/ssotest/.libs/libssotest.so ../.libs/libssotest.so
+       ln -sf $(abs_top_builddir)/src/plugins/ssotest/.libs/libssotest.so ../.libs/libssotest.so
     
 

diff --git a/test/daemon/Makefile.am b/test/daemon/Makefile.am
index 89e5198..ad0c305 100644 (file)
--- a/test/daemon/Makefile.am
+++ b/test/daemon/Makefile.am
@@ -1,8 +1,7 @@
 TESTS = daemontest
 
 TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
-       SSO_BIN_DIR=$(top_builddir)/src/daemon/plugins/plugind/.libs \
-    SSO_DAEMON_PATH=$(abs_top_builddir)/src/daemon/gsignond \
+       SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
        LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs" 
 VALGRIND_TESTS_DISABLE=
 

diff --git a/test/daemon/daemon-test.c b/test/daemon/daemon-test.c
index be241b7..cf5b530 100644 (file)
--- a/test/daemon/daemon-test.c
+++ b/test/daemon/daemon-test.c
@@ -91,13 +91,17 @@ setup_daemon (void)
 #   ifdef USE_P2P
     /* start daemon maually */
     gchar *argv[2];
-    const gchar *test_daemon_path = g_getenv("SSO_DAEMON_PATH");
+    gchar *test_daemon_path = g_build_filename (g_getenv("SSO_BIN_DIR"),
+            "gsignond", NULL);
     fail_if (test_daemon_path == NULL, "No SSO daemon path found");
 
-    argv[0] = (gchar*)test_daemon_path ; 
+    argv[0] = test_daemon_path;
     argv[1] = NULL;
-    g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &daemon_pid, &error);
-    fail_if (error != NULL, "Failed to span daemon : %s", error ? error->message : "");
+    g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
+            &daemon_pid, &error);
+    g_free (test_daemon_path);
+    fail_if (error != NULL, "Failed to span daemon : %s",
+            error ? error->message : "");
     g_usleep (500 * 1000);
 #   else
     /* session bus wher no GTestBus support */

diff --git a/test/plugins/Makefile.am b/test/plugins/Makefile.am
index 0b7283d..7638c2d 100644 (file)
--- a/test/plugins/Makefile.am
+++ b/test/plugins/Makefile.am
@@ -1,7 +1,7 @@
 TESTS = digestplugintest passwordplugintest pluginproxytest pluginremotetest
 
 TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
-       SSO_BIN_DIR=$(top_builddir)/src/daemon/plugins/plugind/.libs \
+       SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
        LD_LIBRARY_PATH=$(top_builddir)/src/daemon/plugins/plugind/.libs
 
 VALGRIND_TESTS_DISABLE =