diff options
| -rw-r--r-- | tests/basic/gfapi/libgfapi-fini-hang.c | 7 | ||||
| -rwxr-xr-x | tests/basic/gfapi/libgfapi-fini-hang.t | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/basic/gfapi/libgfapi-fini-hang.c b/tests/basic/gfapi/libgfapi-fini-hang.c index 81b065ca92..e192751f29 100644 --- a/tests/basic/gfapi/libgfapi-fini-hang.c +++ b/tests/basic/gfapi/libgfapi-fini-hang.c @@ -24,19 +24,20 @@ main (int argc, char *argv[]) int ret = 0, i; glfs_fd_t *fd = NULL; char readbuf[32]; - char *filename = "a1"; + char *logname = NULL; char *hostname = NULL; char *volname = NULL; fprintf (stderr, "Starting libgfapi_fini\n"); - if (argc < 3) { + if (argc < 4) { fprintf (stderr, "Invalid argument\n"); exit(1); } hostname = argv[1]; volname = argv[2]; + logname = argv[3]; fs = glfs_new (volname); if (!fs) { @@ -47,7 +48,7 @@ main (int argc, char *argv[]) ret = glfs_set_volfile_server (fs, "tcp", hostname, 0); LOG_ERR("glfs_set_volfile_server", ret); - ret = glfs_set_logging (fs, "/dev/stderr", 7); + ret = glfs_set_logging (fs, logname, 7); LOG_ERR("glfs_set_logging", ret); /* Do not call glfs_init. diff --git a/tests/basic/gfapi/libgfapi-fini-hang.t b/tests/basic/gfapi/libgfapi-fini-hang.t index 8bbeb84812..7c93987257 100755 --- a/tests/basic/gfapi/libgfapi-fini-hang.t +++ b/tests/basic/gfapi/libgfapi-fini-hang.t @@ -3,7 +3,7 @@ . $(dirname $0)/../../include.rc function check_process () { - pgrep libgfapi-fini-hang + ps -p $1 if [ $? -eq 1 ] ; then echo "Y" else @@ -21,16 +21,18 @@ EXPECT 'Created' volinfo_field $V0 'Status'; TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; +logdir=`gluster --print-logdir` + TEST build_tester -lgfapi $(dirname $0)/libgfapi-fini-hang.c -o $M0/libgfapi-fini-hang TEST cd $M0 - ./libgfapi-fini-hang $H0 $V0 & -lpid=$! + ./libgfapi-fini-hang $H0 $V0 $logdir/libgfapi-fini-hang.log & +PID=$! # check if the process "libgfapi-fini-hang" exits with in $PROCESS_UP_TIMEOUT -EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_process +EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_process $PID # Kill the process if present -TEST ! kill -9 $lpid +TEST ! kill -9 $PID TEST rm -f $M0/libgfapi-fini-hang |