glib-2.0: fix mapped file ptest

The mappedfile ptest was attempting to write into directories that may not exist
on a non-Sato image.  Instead, write into TMPDIR.

(From OE-Core rev: 93b4ecc263947826421d5b4fb1f99fe506b24287)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2014-01-16 13:31:39 +00:00 committed by Richard Purdie
parent 49eaa0fcff
commit e036f2af90
2 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,30 @@
Instead of writing the temporary mapping files in the mappedfile test to the
user runtime directory, write them to $TMP. The runtime directory may not
currently exist if the test is executed on a non-desktop system and the test
doesn't attempt to create the directory structure.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
index 40e0e60..27a24be 100644
--- a/glib/tests/mappedfile.c
+++ b/glib/tests/mappedfile.c
@@ -81,7 +81,7 @@ test_writable (void)
const gchar *new = "abcdefghijklmnopqrstuvxyz";
gchar *tmp_copy_path;
- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
g_assert_no_error (error);
@@ -125,7 +125,7 @@ test_writable_fd (void)
int fd;
gchar *tmp_copy_path;
- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
g_assert_no_error (error);

View File

@ -12,6 +12,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://run-ptest \
file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch \
file://ptest-dbus.patch \
file://ptest-paths.patch \
"
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"