svn commit: r958554 - in /subversion/trunk/subversion/tests: libsvn_subr/dirent_uri-test.c svn_test_fs.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Jun 28 12:18:40 2010
New Revision: 958554

URL: http://svn.apache.org/viewvc?rev=958554&view=rev
Log:
Reduce platform dependent code in dirent_uri-test.c and svn_test_fs.c, which
should fix some test failures on OS/2.

* subversion/tests/libsvn_subr/dirent_uri-test.c
  (includes): Check for WIN32 and OS/2 for direct.h.

* subversion/tests/svn_test_fs.c
  (includes): Remove direct.h and unistd.h as we can just use apr.
  (svn_test__current_directory_url): Use svn_dirent_get_absolute() to fetch
    the current directory.

Modified:
    subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/trunk/subversion/tests/svn_test_fs.c

Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=958554&r1=958553&r2=958554&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Mon Jun 28 12:18:40 2010
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(WIN32) || defined(__OS2__)
 #include <direct.h>
 #define getcwd _getcwd
 #define getdcwd _getdcwd

Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=958554&r1=958553&r2=958554&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Mon Jun 28 12:18:40 2010
@@ -24,13 +24,6 @@
 #include <string.h>
 #include <apr_pools.h>
 
-#ifdef _MSC_VER
-#include <direct.h>
-#define getcwd _getcwd
-#else
-#include <unistd.h> /* for getcwd() */
-#endif
-
 #include "svn_test.h"
 
 #include "svn_string.h"
@@ -248,18 +241,14 @@ svn_test__current_directory_url(const ch
                                 apr_pool_t *pool)
 {
   /* 8KB is a lot, but it almost guarantees that any path will fit. */
-  char curdir[8192];
-  const char *utf8_ls_curdir, *utf8_is_curdir, *unencoded_url;
-
-  if (! getcwd(curdir, sizeof(curdir)))
-    return svn_error_create(SVN_ERR_BASE, NULL, "getcwd() failed");
+  const char* curdir;
+  const char *unencoded_url;
 
-  SVN_ERR(svn_utf_cstring_to_utf8(&utf8_ls_curdir, curdir, pool));
-  utf8_is_curdir = svn_path_internal_style(utf8_ls_curdir, pool);
+  SVN_ERR(svn_dirent_get_absolute(&curdir, "", pool));
 
   unencoded_url = apr_psprintf(pool, "file://%s%s%s%s",
-                               (utf8_is_curdir[0] != '/') ? "/" : "",
-                               utf8_is_curdir,
+                               (curdir[0] != '/') ? "/" : "",
+                               curdir,
                                (suffix[0] && suffix[0] != '/') ? "/" : "",
                                suffix);