GVariant: support serialising to GVariantVectors

[platform/upstream/glib.git] / glib / tests / mappedfile.c

diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
index f366ee9..ccaea34 100644 (file)
--- a/glib/tests/mappedfile.c
+++ b/glib/tests/mappedfile.c
@@ -1,29 +1,27 @@
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 
-#include <config.h>
 #include <glib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <glib/gstdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
-static const gchar *datapath;
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 static void
 test_basic (void)
 {
   GMappedFile *file;
   GError *error;
-  gchar *path;
 
   error = NULL;
-  path = g_build_filename (datapath, "empty", NULL);
-  file = g_mapped_file_new (path, FALSE, &error);
-  g_free (path);
+  file = g_mapped_file_new (g_test_get_filename (G_TEST_DIST, "empty", NULL), FALSE, &error);
   g_assert_no_error (error);
 
   g_mapped_file_ref (file);
@@ -37,12 +35,9 @@ test_empty (void)
 {
   GMappedFile *file;
   GError *error;
-  gchar *path;
 
   error = NULL;
-  path = g_build_filename (datapath, "empty", NULL);
-  file = g_mapped_file_new (path, FALSE, &error);
-  g_free (path);
+  file = g_mapped_file_new (g_test_get_filename (G_TEST_DIST, "empty", NULL), FALSE, &error);
   g_assert_no_error (error);
 
   g_assert (g_mapped_file_get_contents (file) == NULL);
@@ -59,6 +54,7 @@ test_device (void)
 
   file = g_mapped_file_new ("/dev/null", FALSE, &error);
   g_assert (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_INVAL) ||
+            g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NODEV) ||
             g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM));
   g_assert (file == NULL);
   g_error_free (error);
@@ -87,13 +83,11 @@ test_writable (void)
   gsize len;
   const gchar *old = "MMMMMMMMMMMMMMMMMMMMMMMMM";
   const gchar *new = "abcdefghijklmnopqrstuvxyz";
-  char *srcpath;
   gchar *tmp_copy_path;
 
-  srcpath = g_build_filename (datapath, "4096-random-bytes", NULL);
   tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
 
-  g_file_get_contents (srcpath, &contents, &len, &error);
+  g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
   g_assert_no_error (error);
   g_file_set_contents (tmp_copy_path, contents, len, &error);
   g_assert_no_error (error);
@@ -120,7 +114,6 @@ test_writable (void)
 
   g_mapped_file_free (file);
 
-  g_free (srcpath);
   g_free (tmp_copy_path);
 }
 
@@ -134,13 +127,11 @@ test_writable_fd (void)
   const gchar *new = "abcdefghijklmnopqrstuvxyz";
   gsize len;
   int fd;
-  char *srcpath;
   gchar *tmp_copy_path;
 
-  srcpath = g_build_filename (datapath, "4096-random-bytes", NULL);
   tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
 
-  g_file_get_contents (srcpath, &contents, &len, &error);
+  g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
   g_assert_no_error (error);
   g_file_set_contents (tmp_copy_path, contents, len, &error);
   g_assert_no_error (error);
@@ -172,7 +163,6 @@ test_writable_fd (void)
 
   g_mapped_file_free (file);
 
-  g_free (srcpath);
   g_free (tmp_copy_path);
 }
 
@@ -182,12 +172,9 @@ test_gbytes (void)
   GMappedFile *file;
   GBytes *bytes;
   GError *error;
-  gchar *path;
 
   error = NULL;
-  path = g_build_filename (datapath, "empty", NULL);
-  file = g_mapped_file_new (path, FALSE, &error);
-  g_free (path);
+  file = g_mapped_file_new (g_test_get_filename (G_TEST_DIST, "empty", NULL), FALSE, &error);
   g_assert_no_error (error);
 
   bytes = g_mapped_file_get_bytes (file);
@@ -200,11 +187,6 @@ test_gbytes (void)
 int
 main (int argc, char *argv[])
 {
-  if (g_getenv ("G_TEST_DATA"))
-    datapath = g_getenv ("G_TEST_DATA");
-  else
-    datapath = SRCDIR;
-
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/mappedfile/basic", test_basic);