luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-04 16:33:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix make check with builddir != srcdir

Browse Source 
This broke when the tests were converted to be installable.
My apologies.
This commit is contained in:
Matthias Clasen
2013-05-27 21:20:10 -04:00
parent 4ec32e6fa8
commit 98a921045c
10 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gio/tests/appinfo.c
View File

@@ -6,6 +6,7 @@
#include <gio/gdesktopappinfo.h>
static const gchar *datapath;
static const gchar *binpath;
static void
test_launch (void)
@@ -165,7 +166,7 @@ test_commandline (void)
gchar *cmdline;
gchar *cmdline_out;
cmdline = g_strconcat (datapath, "/appinfo-test --option", NULL);
cmdline = g_strconcat (binpath, "/appinfo-test --option", NULL);
cmdline_out = g_strconcat (cmdline, " %u", NULL);
error = NULL;
@@ -211,7 +212,7 @@ test_launch_context (void)
gchar *str;
gchar *cmdline;
cmdline = g_strconcat (datapath, "/appinfo-test --option", NULL);
cmdline = g_strconcat (binpath, "/appinfo-test --option", NULL);
context = g_app_launch_context_new ();
appinfo = g_app_info_create_from_commandline (cmdline,
@@ -263,7 +264,7 @@ test_launch_context_signals (void)
GError *error = NULL;
gchar *cmdline;
cmdline = g_strconcat (datapath, "/appinfo-test --option", NULL);
cmdline = g_strconcat (binpath, "/appinfo-test --option", NULL);
context = g_app_launch_context_new ();
g_signal_connect (context, "launched", G_CALLBACK (launched), NULL);
@@ -312,7 +313,7 @@ test_associations (void)
GList *list;
gchar *cmdline;
cmdline = g_strconcat (datapath, "/appinfo-test --option", NULL);
cmdline = g_strconcat (binpath, "/appinfo-test --option", NULL);
appinfo = g_app_info_create_from_commandline (cmdline,
"cmdline-app-test",
G_APP_INFO_CREATE_SUPPORTS_URIS,
@@ -485,9 +486,12 @@ int
main (int argc, char *argv[])
{
if (g_getenv ("G_TEST_DATA"))
datapath = g_getenv ("G_TEST_DATA");
datapath = binpath = g_getenv ("G_TEST_DATA");
else
datapath = SRCDIR;
{
datapath = SRCDIR;
binpath = BUILDDIR;
}
g_test_init (&argc, &argv, NULL);