luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 16:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix running fileutils test in cwd which is a symlink

Browse Source 
If the fileutils test was run in a directory which is a symlink (for
example, on macOS, /tmp is often a symlink to /private/tmp), a path
comparison was failing. Compare the paths as inodes instead.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://gitlab.gnome.org/GNOME/glib/issues/889
This commit is contained in:
Philip Withnall 2018-07-11 15:43:22 +02:00
parent ad3947c42e
commit d1d17e83c6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/tests/fileutils.c
View File

@ -887,6 +887,7 @@ test_stdio_wrappers (void)
gint ret;
struct utimbuf ut;
GError *error = NULL;
GStatBuf path_statbuf, cwd_statbuf;
/* The permissions tests here don’t work when running as root. */
#ifdef G_OS_UNIX
@ -920,7 +921,13 @@ test_stdio_wrappers (void)
ret = g_chdir (path);
g_assert_cmpint (ret, ==, 0);
cwd = g_get_current_dir ();
g_assert_true (g_str_equal (cwd, path));
/* We essentially want to check that cwd == path, but we can’t compare the
* paths directly since the tests might be running under a symlink (for
* example, /tmp is sometimes a symlink). Compare the inode numbers instead. */
g_assert_cmpint (g_stat (cwd, &cwd_statbuf), ==, 0);
g_assert_cmpint (g_stat (path, &path_statbuf), ==, 0);
g_assert_true (cwd_statbuf.st_dev == path_statbuf.st_dev &&
cwd_statbuf.st_ino == path_statbuf.st_ino);
g_free (cwd);
g_free (path);