From 0a8b85e3a8228c399dde807c3ca781a452a1fc90 Mon Sep 17 00:00:00 2001
From: Poornima G <pgurusid@redhat.com>
Date: Fri, 17 Jun 2016 01:27:31 -0400
Subject: tests: Enable all gfapi test cases

Change-Id: I32bfec4af91348d96dc3e81a9d5c9cad599f821b
Bug: 1358594
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: http://review.gluster.org/14748
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
---
 tests/basic/gfapi/anonymous_fd.sh            | 26 ------------------
 tests/basic/gfapi/anonymous_fd.t             | 26 ++++++++++++++++++
 tests/basic/gfapi/anonymous_fd_read_write.c  | 10 ++++---
 tests/basic/gfapi/bug-1241104.c              | 11 ++++----
 tests/basic/gfapi/bug-1241104.sh             | 30 ---------------------
 tests/basic/gfapi/bug-1241104.t              | 30 +++++++++++++++++++++
 tests/basic/gfapi/bug1283983.c               | 10 +++----
 tests/basic/gfapi/bug1283983.sh              |  6 ++---
 tests/basic/gfapi/bug1291259.c               | 13 ++++-----
 tests/basic/gfapi/bug1291259.sh              | 30 ---------------------
 tests/basic/gfapi/bug1291259.t               | 30 +++++++++++++++++++++
 tests/basic/gfapi/gfapi-dup.c                | 10 ++++---
 tests/basic/gfapi/gfapi-dup.sh               | 27 -------------------
 tests/basic/gfapi/gfapi-dup.t                | 27 +++++++++++++++++++
 tests/basic/gfapi/libgfapi-fini-hang.c       | 16 ++++++-----
 tests/basic/gfapi/libgfapi-fini-hang.sh      | 40 ----------------------------
 tests/basic/gfapi/libgfapi-fini-hang.t       | 40 ++++++++++++++++++++++++++++
 tests/basic/gfapi/seek.c                     | 16 ++++++-----
 tests/basic/gfapi/upcall-cache-invalidate.c  | 13 ++++-----
 tests/basic/gfapi/upcall-cache-invalidate.sh | 37 -------------------------
 tests/basic/gfapi/upcall-cache-invalidate.t  | 37 +++++++++++++++++++++++++
 21 files changed, 249 insertions(+), 236 deletions(-)
 delete mode 100755 tests/basic/gfapi/anonymous_fd.sh
 create mode 100755 tests/basic/gfapi/anonymous_fd.t
 delete mode 100755 tests/basic/gfapi/bug-1241104.sh
 create mode 100755 tests/basic/gfapi/bug-1241104.t
 delete mode 100755 tests/basic/gfapi/bug1291259.sh
 create mode 100755 tests/basic/gfapi/bug1291259.t
 delete mode 100755 tests/basic/gfapi/gfapi-dup.sh
 create mode 100755 tests/basic/gfapi/gfapi-dup.t
 delete mode 100755 tests/basic/gfapi/libgfapi-fini-hang.sh
 create mode 100755 tests/basic/gfapi/libgfapi-fini-hang.t
 delete mode 100755 tests/basic/gfapi/upcall-cache-invalidate.sh
 create mode 100755 tests/basic/gfapi/upcall-cache-invalidate.t

(limited to 'tests/basic/gfapi')

diff --git a/tests/basic/gfapi/anonymous_fd.sh b/tests/basic/gfapi/anonymous_fd.sh
deleted file mode 100755
index 2184f8efc8e..00000000000
--- a/tests/basic/gfapi/anonymous_fd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-logdir=`gluster --print-logdir`
-
-TEST build_tester $(dirname $0)/anonymous_fd_read_write.c -lgfapi -o $(dirname $0)/anonymous_fd
-TEST ./$(dirname $0)/anonymous_fd $V0  $logdir/anonymous_fd.log
-
-cleanup_tester $(dirname $0)/anonymous_fd
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/basic/gfapi/anonymous_fd.t b/tests/basic/gfapi/anonymous_fd.t
new file mode 100755
index 00000000000..bc0fb0fa2f0
--- /dev/null
+++ b/tests/basic/gfapi/anonymous_fd.t
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+logdir=`gluster --print-logdir`
+
+TEST build_tester $(dirname $0)/anonymous_fd_read_write.c -lgfapi -o $(dirname $0)/anonymous_fd
+TEST ./$(dirname $0)/anonymous_fd $H0 $V0  $logdir/anonymous_fd.log
+
+cleanup_tester $(dirname $0)/anonymous_fd
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+
+cleanup;
diff --git a/tests/basic/gfapi/anonymous_fd_read_write.c b/tests/basic/gfapi/anonymous_fd_read_write.c
index 885f0a2b26f..6945dd634f0 100644
--- a/tests/basic/gfapi/anonymous_fd_read_write.c
+++ b/tests/basic/gfapi/anonymous_fd_read_write.c
@@ -30,14 +30,16 @@ main (int argc, char *argv[])
         char                    *filename      = "file.txt";
         char                    *logfile       = NULL;
         char                    *volname       = NULL;
+        char                    *hostname      = NULL;
 
-        if (argc != 3) {
+        if (argc != 4) {
                 fprintf (stderr, "Invalid argument\n");
                 exit(1);
         }
 
-        volname = argv[1];
-        logfile = argv[2];
+        hostname = argv[1];
+        volname = argv[2];
+        logfile = argv[3];
 
         fs = glfs_new (volname);
         if (!fs) {
@@ -45,7 +47,7 @@ main (int argc, char *argv[])
                 ret = -1;
         }
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs, logfile, 7);
diff --git a/tests/basic/gfapi/bug-1241104.c b/tests/basic/gfapi/bug-1241104.c
index 0f1a616bd39..311323f672a 100644
--- a/tests/basic/gfapi/bug-1241104.c
+++ b/tests/basic/gfapi/bug-1241104.c
@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,15 +31,17 @@ main (int argc, char *argv[])
         char      *filename = "file_tmp";
         char      *volname = NULL;
         char      *logfile = NULL;
+        char      *hostname = NULL;
         struct flock lock = {0, };
 
-        if (argc != 3) {
+        if (argc != 4) {
                 fprintf (stderr, "Invalid argument\n");
                 exit(1);
         }
 
-        volname = argv[1];
-        logfile = argv[2];
+        hostname = argv[1];
+        volname = argv[2];
+        logfile = argv[3];
 
         fs = glfs_new (volname);
         if (!fs) {
@@ -48,7 +49,7 @@ main (int argc, char *argv[])
                 return -1;
         }
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs, logfile, 7);
diff --git a/tests/basic/gfapi/bug-1241104.sh b/tests/basic/gfapi/bug-1241104.sh
deleted file mode 100755
index e071835758d..00000000000
--- a/tests/basic/gfapi/bug-1241104.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 localhost:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-logdir=`gluster --print-logdir`
-
-## Enable Upcall cache-invalidation feature
-TEST $CLI volume set $V0 features.cache-invalidation on;
-
-build_tester $(dirname $0)/bug-1241104.c -lgfapi -o $(dirname $0)/bug-1241104
-
-TEST ./$(dirname $0)/bug-1241104 $V0  $logdir/bug-1241104.log
-
-cleanup_tester $(dirname $0)/bug1241104
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/basic/gfapi/bug-1241104.t b/tests/basic/gfapi/bug-1241104.t
new file mode 100755
index 00000000000..e7f4759c3d5
--- /dev/null
+++ b/tests/basic/gfapi/bug-1241104.t
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+logdir=`gluster --print-logdir`
+
+## Enable Upcall cache-invalidation feature
+TEST $CLI volume set $V0 features.cache-invalidation on;
+
+TEST build_tester $(dirname $0)/bug-1241104.c -lgfapi
+
+TEST ./$(dirname $0)/bug-1241104 $H0 $V0 $logdir/bug-1241104.log
+
+cleanup_tester $(dirname $0)/bug-1241104
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+
+cleanup;
diff --git a/tests/basic/gfapi/bug1283983.c b/tests/basic/gfapi/bug1283983.c
index ba0f954cb17..6583097697b 100644
--- a/tests/basic/gfapi/bug1283983.c
+++ b/tests/basic/gfapi/bug1283983.c
@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -48,13 +47,14 @@ main (int argc, char *argv[])
         cbk.reason = 0;
 
         fprintf (stderr, "Starting libgfapi_fini\n");
-        if (argc != 3) {
+        if (argc != 4) {
                 fprintf (stderr, "Invalid argument\n");
                 exit(1);
         }
 
-        volname = argv[1];
-        logfile = argv[2];
+        hostname = argv[1]
+        volname = argv[2];
+        logfile = argv[3];
 
 
         fs = glfs_new (volname);
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
                 return 1;
         }
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs, logfile, 7);
diff --git a/tests/basic/gfapi/bug1283983.sh b/tests/basic/gfapi/bug1283983.sh
index 97f1b01150c..931a0b55935 100755
--- a/tests/basic/gfapi/bug1283983.sh
+++ b/tests/basic/gfapi/bug1283983.sh
@@ -7,7 +7,7 @@ cleanup;
 
 TEST glusterd
 
-TEST $CLI volume create $V0 localhost:$B0/brick1;
+TEST $CLI volume create $V0 $H0:$B0/brick1;
 EXPECT 'Created' volinfo_field $V0 'Status';
 
 TEST $CLI volume start $V0;
@@ -18,9 +18,9 @@ logdir=`gluster --print-logdir`
 ## Enable Upcall cache-invalidation feature
 TEST $CLI volume set $V0 features.cache-invalidation on;
 
-build_tester $(dirname $0)/bug1283983.c -lgfapi -o $(dirname $0)/bug1283983
+build_tester $(dirname $0)/bug1283983.c -lgfapi
 
-TEST ./$(dirname $0)/bug1283983 $V0  $logdir/bug1283983.log
+TEST ./$(dirname $0)/bug1283983 $H0 $V0  $logdir/bug1283983.log
 
 ## There shouldn't be any NULL gfid messages logged
 TEST ! cat $logdir/bug1283983.log | grep "upcall" | grep "00000000-0000-0000-0000-000000000000"
diff --git a/tests/basic/gfapi/bug1291259.c b/tests/basic/gfapi/bug1291259.c
index 333da20f557..98e3b13c63d 100644
--- a/tests/basic/gfapi/bug1291259.c
+++ b/tests/basic/gfapi/bug1291259.c
@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -44,6 +43,7 @@ main (int argc, char *argv[])
         struct    glfs_callback_arg cbk;
         char      *logfile = NULL;
         char      *volname = NULL;
+        char      *hostname = NULL;
         int        cnt = 1;
         int       upcall_received = 0;
         struct glfs_callback_inode_arg *in_arg = NULL;
@@ -54,13 +54,14 @@ main (int argc, char *argv[])
         cbk.reason = 0;
 
         fprintf (stderr, "Starting libgfapi_fini\n");
-        if (argc != 3) {
+        if (argc != 4) {
                 fprintf (stderr, "Invalid argument\n");
                 exit(1);
         }
 
-        volname = argv[1];
-        logfile = argv[2];
+        hostname = argv[1];
+        volname = argv[2];
+        logfile = argv[3];
 
 
         fs = glfs_new (volname);
@@ -69,7 +70,7 @@ main (int argc, char *argv[])
                 return 1;
         }
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs, logfile, 7);
@@ -84,7 +85,7 @@ main (int argc, char *argv[])
                 return 1;
         }
 
-        ret = glfs_set_volfile_server (fs2, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs2, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs2, logfile, 7);
diff --git a/tests/basic/gfapi/bug1291259.sh b/tests/basic/gfapi/bug1291259.sh
deleted file mode 100755
index edbac7e6b12..00000000000
--- a/tests/basic/gfapi/bug1291259.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 localhost:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-logdir=`gluster --print-logdir`
-
-## Enable Upcall cache-invalidation feature
-TEST $CLI volume set $V0 features.cache-invalidation on;
-
-build_tester $(dirname $0)/bug1291259.c -lgfapi -o $(dirname $0)/bug1291259
-
-TEST ./$(dirname $0)/bug1291259 $V0  $logdir/bug1291259.log
-
-cleanup_tester $(dirname $0)/bug1291259
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/basic/gfapi/bug1291259.t b/tests/basic/gfapi/bug1291259.t
new file mode 100755
index 00000000000..2247c567ffc
--- /dev/null
+++ b/tests/basic/gfapi/bug1291259.t
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+logdir=`gluster --print-logdir`
+
+## Enable Upcall cache-invalidation feature
+TEST $CLI volume set $V0 features.cache-invalidation on;
+
+TEST build_tester $(dirname $0)/bug1291259.c -lgfapi
+
+TEST ./$(dirname $0)/bug1291259 $H0 $V0 $logdir/bug1291259.log
+
+cleanup_tester $(dirname $0)/bug1291259
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+
+cleanup;
diff --git a/tests/basic/gfapi/gfapi-dup.c b/tests/basic/gfapi/gfapi-dup.c
index 450fbdc4186..96f133eae33 100644
--- a/tests/basic/gfapi/gfapi-dup.c
+++ b/tests/basic/gfapi/gfapi-dup.c
@@ -22,23 +22,25 @@ main (int argc, char *argv[])
         glfs_fd_t      *fd2 = NULL;
         char           *volname = NULL;
         char           *logfile = NULL;
+        char           *hostname = NULL;
         const char     *filename = "file_tmp";
         const char     *buff = "An opinion should be the result of thought, "
                                 "not a substitute for it.";
 
-        if (argc != 3) {
+        if (argc != 4) {
                 fprintf (stderr, "Invalid argument\n");
                 return 1;
         }
 
-        volname = argv[1];
-        logfile = argv[2];
+        hostname = argv[1];
+        volname = argv[2];
+        logfile = argv[3];
 
         fs = glfs_new (volname);
         if (!fs)
                 VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_new", ret, out);
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
         VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_set_volfile_server", ret, out);
 
         ret = glfs_set_logging (fs, logfile, 7);
diff --git a/tests/basic/gfapi/gfapi-dup.sh b/tests/basic/gfapi/gfapi-dup.sh
deleted file mode 100755
index 6c89e0e473d..00000000000
--- a/tests/basic/gfapi/gfapi-dup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 localhost:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-logdir=`gluster --print-logdir`
-
-build_tester $(dirname $0)/gfapi-dup.c -lgfapi -o $(dirname $0)/gfapi-dup
-
-TEST ./$(dirname $0)/gfapi-dup $V0  $logdir/gfapi-dup.log
-
-cleanup_tester $(dirname $0)/gfapi-dup
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/basic/gfapi/gfapi-dup.t b/tests/basic/gfapi/gfapi-dup.t
new file mode 100755
index 00000000000..849b106f90f
--- /dev/null
+++ b/tests/basic/gfapi/gfapi-dup.t
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+logdir=`gluster --print-logdir`
+
+TEST build_tester $(dirname $0)/gfapi-dup.c -lgfapi
+
+TEST ./$(dirname $0)/gfapi-dup $H0 $V0  $logdir/gfapi-dup.log
+
+cleanup_tester $(dirname $0)/gfapi-dup
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+
+cleanup;
diff --git a/tests/basic/gfapi/libgfapi-fini-hang.c b/tests/basic/gfapi/libgfapi-fini-hang.c
index ee16bd7ce58..81b065ca924 100644
--- a/tests/basic/gfapi/libgfapi-fini-hang.c
+++ b/tests/basic/gfapi/libgfapi-fini-hang.c
@@ -2,12 +2,11 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "api/glfs.h"
-#include "api/glfs-handles.h"
+#include <glusterfs/api/glfs.h>
+#include <glusterfs/api/glfs-handles.h>
 
 #define LOG_ERR(func, ret) do { \
         if (ret != 0) {            \
@@ -26,21 +25,26 @@ main (int argc, char *argv[])
         glfs_fd_t *fd = NULL;
         char       readbuf[32];
         char      *filename = "a1";
+        char      *hostname = NULL;
+        char      *volname = NULL;
 
         fprintf (stderr, "Starting libgfapi_fini\n");
 
-        if (argc < 2) {
+        if (argc < 3) {
                 fprintf (stderr, "Invalid argument\n");
                 exit(1);
         }
 
-        fs = glfs_new (argv[1]);
+        hostname = argv[1];
+        volname = argv[2];
+
+        fs = glfs_new (volname);
         if (!fs) {
                 fprintf (stderr, "glfs_new: returned NULL\n");
                 exit(1);
         }
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 0);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 0);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs, "/dev/stderr", 7);
diff --git a/tests/basic/gfapi/libgfapi-fini-hang.sh b/tests/basic/gfapi/libgfapi-fini-hang.sh
deleted file mode 100755
index 56633288020..00000000000
--- a/tests/basic/gfapi/libgfapi-fini-hang.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-
-function check_process () {
-    pgrep libgfapi-fini-hang
-    if [ $? -eq 1 ] ; then
-        echo "Y"
-    else
-        echo "N"
-    fi
-}
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-build_tester -lgfapi $(dirname $0)/libgfapi-fini-hang.c -o $M0/libgfapi-fini-hang
-TEST cd $M0
- ./libgfapi-fini-hang $V0 &
-lpid=$!
-
-# check if the process "libgfapi-fini-hang" exits with in $PROCESS_UP_TIMEOUT
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_process
-
-# Kill the process if present
-TEST ! kill -9 $lpid
-
-TEST rm -f $M0/libgfapi-fini-hang
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/basic/gfapi/libgfapi-fini-hang.t b/tests/basic/gfapi/libgfapi-fini-hang.t
new file mode 100755
index 00000000000..8bbeb848122
--- /dev/null
+++ b/tests/basic/gfapi/libgfapi-fini-hang.t
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+
+function check_process () {
+    pgrep libgfapi-fini-hang
+    if [ $? -eq 1 ] ; then
+        echo "Y"
+    else
+        echo "N"
+    fi
+}
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+TEST build_tester -lgfapi $(dirname $0)/libgfapi-fini-hang.c -o $M0/libgfapi-fini-hang
+TEST cd $M0
+ ./libgfapi-fini-hang $H0 $V0 &
+lpid=$!
+
+# check if the process "libgfapi-fini-hang" exits with in $PROCESS_UP_TIMEOUT
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_process
+
+# Kill the process if present
+TEST ! kill -9 $lpid
+
+TEST rm -f $M0/libgfapi-fini-hang
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+
+cleanup;
diff --git a/tests/basic/gfapi/seek.c b/tests/basic/gfapi/seek.c
index a0fec7d990a..fb2f6361bf3 100644
--- a/tests/basic/gfapi/seek.c
+++ b/tests/basic/gfapi/seek.c
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <api/glfs.h>
-#include <api/glfs-handles.h>
+#include <glusterfs/api/glfs.h>
+#include <glusterfs/api/glfs-handles.h>
 
 int
 main (int argc, char **argv)
@@ -25,18 +25,20 @@ main (int argc, char **argv)
         glfs_fd_t   *fd       = NULL;
         char        *filename = NULL;
         char        *volname  = NULL;
+        char        *hostname = NULL;
         struct stat  st       = { 0, };
         off_t        hole_start = 0;
         off_t        hole_end   = 0;
 
-        if (argc != 3) {
-                fprintf (stderr, "Invalid argument, use %s <vol> <file>\n",
+        if (argc != 4) {
+                fprintf (stderr, "Invalid argument, use %s <hostname> <vol> <file>\n",
                                  argv[0]);
                 exit (1);
         }
 
-        volname = argv[1];
-        filename = argv[2];
+        hostname = argv[1];
+        volname = argv[2];
+        filename = argv[3];
 
         fs = glfs_new (volname);
         if (!fs) {
@@ -44,7 +46,7 @@ main (int argc, char **argv)
                 return 1;
         }
 
-        if (glfs_set_volfile_server (fs, "tcp", "localhost", 24007)) {
+        if (glfs_set_volfile_server (fs, "tcp", hostname, 24007)) {
                 perror ("glfs_set_volfile_server");
                 return 1;
         }
diff --git a/tests/basic/gfapi/upcall-cache-invalidate.c b/tests/basic/gfapi/upcall-cache-invalidate.c
index deec691bf8e..ea1b5c4a88b 100644
--- a/tests/basic/gfapi/upcall-cache-invalidate.c
+++ b/tests/basic/gfapi/upcall-cache-invalidate.c
@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,17 +40,19 @@ main (int argc, char *argv[])
         struct    glfs_callback_arg cbk;
         char      *logfile = NULL;
         char      *volname = NULL;
+        char      *hostname = NULL;
         struct glfs_callback_inode_arg *in_arg = NULL;
 
         cbk.reason = 0;
 
-        if (argc != 3) {
+        if (argc != 4) {
                 fprintf (stderr, "Invalid argument\n");
                 exit(1);
         }
 
-        volname = argv[1];
-        logfile = argv[2];
+        hostname = argv[1];
+        volname = argv[2];
+        logfile = argv[3];
 
         fs = glfs_new (volname);
         if (!fs) {
@@ -59,7 +60,7 @@ main (int argc, char *argv[])
                 return -1;
         }
 
-        ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server", ret);
 
         ret = glfs_set_logging (fs, logfile, 7);
@@ -74,7 +75,7 @@ main (int argc, char *argv[])
                 return 1;
         }
 
-        ret = glfs_set_volfile_server (fs2, "tcp", "localhost", 24007);
+        ret = glfs_set_volfile_server (fs2, "tcp", hostname, 24007);
         LOG_ERR("glfs_set_volfile_server-fs2", ret);
 
         ret = glfs_set_logging (fs2, logfile, 7);
diff --git a/tests/basic/gfapi/upcall-cache-invalidate.sh b/tests/basic/gfapi/upcall-cache-invalidate.sh
deleted file mode 100755
index f6f59bea752..00000000000
--- a/tests/basic/gfapi/upcall-cache-invalidate.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-# Upcall feature is disable for now. A new xlator option
-# will be introduced to turn it on. Skipping this test
-# till then.
-
-SKIP_TESTS;
-exit 0
-
-TEST glusterd
-
-TEST $CLI volume create $V0 localhost:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-logdir=`gluster --print-logdir`
-
-## Enable Upcall cache-invalidation feature
-TEST $CLI volume set $V0 features.cache-invalidation on;
-
-build_tester $(dirname $0)/upcall-cache-invalidate.c -lgfapi -o $(dirname $0)/upcall-cache-invalidate
-
-TEST ./$(dirname $0)/upcall-cache-invalidate $V0  $logdir/upcall-cache-invalidate.log
-
-cleanup_tester $(dirname $0)/upcall-cache-invalidate
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/basic/gfapi/upcall-cache-invalidate.t b/tests/basic/gfapi/upcall-cache-invalidate.t
new file mode 100755
index 00000000000..6acbab2c51a
--- /dev/null
+++ b/tests/basic/gfapi/upcall-cache-invalidate.t
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+# Upcall feature is disable for now. A new xlator option
+# will be introduced to turn it on. Skipping this test
+# till then.
+
+SKIP_TESTS;
+exit 0
+
+TEST glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+logdir=`gluster --print-logdir`
+
+## Enable Upcall cache-invalidation feature
+TEST $CLI volume set $V0 features.cache-invalidation on;
+
+TEST build_tester $(dirname $0)/upcall-cache-invalidate.c -lgfapi
+
+TEST ./$(dirname $0)/upcall-cache-invalidate $H0 $V0  $logdir/upcall-cache-invalidate.log
+
+cleanup_tester $(dirname $0)/upcall-cache-invalidate
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+
+cleanup;
-- 
cgit