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

tests/gsubprocess: Locate test child binary for installed tests too

Browse Source 
Just use the new g_test_build_filename() rather than assuming
it's in cwd.
This commit is contained in:
Colin Walters 2013-10-17 22:39:48 +01:00
parent f7e2190e74
commit ebd098155b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/tests/gsubprocess.c
View File

@ -17,25 +17,21 @@ get_test_subprocess_args (const char *mode,
...) ...)
{ {
GPtrArray *ret; GPtrArray *ret;
char *cwd; char *path;
char *cwd_path;
const char *binname; const char *binname;
va_list args; va_list args;
gpointer arg; gpointer arg;
ret = g_ptr_array_new_with_free_func (g_free); ret = g_ptr_array_new_with_free_func (g_free);
cwd = g_get_current_dir ();
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
binname = "gsubprocess-testprog.exe"; binname = "gsubprocess-testprog.exe";
#else #else
binname = "gsubprocess-testprog"; binname = "gsubprocess-testprog";
#endif #endif
cwd_path = g_build_filename (cwd, binname, NULL); path = g_test_build_filename (G_TEST_BUILT, binname, NULL);
g_free (cwd); g_ptr_array_add (ret, path);
g_ptr_array_add (ret, cwd_path);
g_ptr_array_add (ret, g_strdup (mode)); g_ptr_array_add (ret, g_strdup (mode));
va_start (args, mode); va_start (args, mode);