For the patchless client, LNET needs to come from it's own branch too.

[fs/lustre-release.git] / libsysio / tests / test_getcwd.c

diff --git a/libsysio/tests/test_getcwd.c b/libsysio/tests/test_getcwd.c
index 340180e..888c9a6 100644 (file)
--- a/libsysio/tests/test_getcwd.c
+++ b/libsysio/tests/test_getcwd.c
@@ -44,19 +44,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef REDSTORM
-#include <getopt.h>
-#else
 #include <unistd.h>
-#endif
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/uio.h>
 #include <sys/queue.h>
 #include <dirent.h>
 
+#if defined(SYSIO_LABEL_NAMES)
 #include "sysio.h"
+#endif
+#include "xtio.h"
 #include "mount.h"
 
 #include "test.h"
@@ -137,7 +137,7 @@ main(int argc, char *const argv[])
        /*
         * Clean up.
         */
-       _sysio_shutdown();
+       _test_sysio_shutdown();
 
        return 0;
 }
@@ -147,11 +147,11 @@ doit(const char *path)
 {
        char    *buf;
 
-       if (chdir(path) != 0) {
+       if (SYSIO_INTERFACE_NAME(chdir)(path) != 0) {
                perror(path);
                return -1;
        }
-       buf = getcwd(NULL, 0);
+       buf = SYSIO_INTERFACE_NAME(getcwd)(NULL, 0);
        if (!buf) {
                perror(path);
                return -1;