X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2Fcontext.c;h=bb619b001b15aab04a3ad6e0f8f316737fcac762;hb=6d702d7910b77bf65e8c5ce3120816762b8cc02d;hp=2f5fd37dc955d76151c132884a06cd4d4cc5723e;hpb=5354dee2f7ee99792a38a3a13f85da90c654f7ee;p=platform%2Fupstream%2Flibxkbcommon.git

diff --git a/test/context.c b/test/context.c
index 2f5fd37..bb619b0 100644
--- a/test/context.c
+++ b/test/context.c
@@ -30,15 +30,6 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#ifdef _MSC_VER
-# include <io.h>
-# include <direct.h>
-# ifndef S_ISDIR
-#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-# endif
-#else
-# include <unistd.h>
-#endif
 
 /* keeps a cache of all makedir/maketmpdir directories so we can free and
  * rmdir them in one go, see unmakedirs() */
@@ -82,29 +73,15 @@ static void restore_env(void)
 
 static const char *makedir(const char *parent, const char *path)
 {
-    char *dirname;
-    int err;
-
-    err = asprintf(&dirname, "%s/%s", parent, path);
-    assert(err >= 0);
-    err = mkdir(dirname, 0777);
-    assert(err == 0);
-
+    char *dirname = test_makedir(parent, path);
     dirnames[ndirs++] = dirname;
-
     return dirname;
 }
 
 static const char *maketmpdir(void)
 {
-    const char *template = "/tmp/xkbcommon-test.XXXXXX";
-    char *tmpdir = strdup(template);
-
-    tmpdir = mkdtemp(tmpdir);
-    assert(tmpdir != NULL);
-
+    char *tmpdir = test_maketempdir("xkbcommon-test.XXXXXX");
     dirnames[ndirs++] = tmpdir;
-
     return tmpdir;
 }