diff options
author | Rajesh Joseph <rjoseph@redhat.com> | 2016-09-14 06:08:39 +0530 |
---|---|---|
committer | Raghavendra Talur <rtalur@redhat.com> | 2016-09-21 03:18:32 -0700 |
commit | d4e16452c82fcf6a71292aa91f5d7424a31b7b0f (patch) | |
tree | 90b07a00b1d6bb28f1a26033bd00a5aadab556bd /tests/bugs | |
parent | e9478b620fbcbc2bdca9e8a34e5b47e93926f0d2 (diff) |
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>
Bug: 1375990
Change-Id: I87f6c7d20959e2d4bbe8c064767a9fed004e8c4a
Signed-off-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-on: http://review.gluster.org/15499
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>
Diffstat (limited to 'tests/bugs')
-rw-r--r-- | tests/bugs/ec/bug-1161886.c | 4 | ||||
-rw-r--r-- | tests/bugs/ec/bug-1161886.t | 2 | ||||
-rw-r--r-- | tests/bugs/gfapi/bug-1032894.t (renamed from tests/bugs/libgfapi/bug-1032894.t) | 0 | ||||
-rw-r--r-- | tests/bugs/gfapi/bug-1093594.c (renamed from tests/bugs/libgfapi/bug-1093594.c) | 18 | ||||
-rwxr-xr-x | tests/bugs/gfapi/bug-1093594.t (renamed from tests/bugs/libgfapi/bug-1093594.sh) | 4 | ||||
-rwxr-xr-x | tests/bugs/gfapi/bug-1319374-THIS-crash.t (renamed from tests/bugs/libgfapi/bug-1319374-THIS-crash.sh) | 4 | ||||
-rw-r--r-- | tests/bugs/gfapi/bug-1319374.c (renamed from tests/bugs/libgfapi/bug-1319374.c) | 20 | ||||
-rw-r--r-- | tests/bugs/gfapi/glfs_vol_set_IO_ERR.c (renamed from tests/bugs/libgfapi/glfs_vol_set_IO_ERR.c) | 12 | ||||
-rwxr-xr-x | tests/bugs/gfapi/glfs_vol_set_IO_ERR.t (renamed from tests/bugs/libgfapi/glfs_vol_set_IO_ERR.sh) | 4 | ||||
-rw-r--r-- | tests/bugs/shard/bug-shard-discard.c | 4 | ||||
-rw-r--r-- | tests/bugs/shard/bug-shard-discard.t | 2 | ||||
-rw-r--r-- | tests/bugs/shard/bug-shard-zerofill.c | 4 | ||||
-rw-r--r-- | tests/bugs/shard/bug-shard-zerofill.t | 2 | ||||
-rw-r--r-- | tests/bugs/shard/shard-fallocate.c | 4 | ||||
-rw-r--r-- | tests/bugs/shard/zero-flag.t | 2 |
15 files changed, 45 insertions, 41 deletions
diff --git a/tests/bugs/ec/bug-1161886.c b/tests/bugs/ec/bug-1161886.c index 036f4ad1cc7..e8093e48a7a 100644 --- a/tests/bugs/ec/bug-1161886.c +++ b/tests/bugs/ec/bug-1161886.c @@ -1,7 +1,7 @@ #include <stdio.h> -#include "glfs.h" -#include "glfs-handles.h" +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> int main (int argc, char *argv[]) diff --git a/tests/bugs/ec/bug-1161886.t b/tests/bugs/ec/bug-1161886.t index 73b75619f28..e7322210a3e 100644 --- a/tests/bugs/ec/bug-1161886.t +++ b/tests/bugs/ec/bug-1161886.t @@ -34,7 +34,7 @@ TEST mv $M0/file1 $M0/file2 TEST ! stat $M0/file1 TEST stat $M0/file2 -TEST gcc -Wall -O2 -I api/src -o $(dirname $0)/bug-1161886 $(dirname $0)/bug-1161886.c -lgfapi +TEST build_tester $(dirname $0)/bug-1161886.c -lgfapi -Wall -O2 TEST $(dirname $0)/bug-1161886 $H0 $V0 /file2 EXPECT "^0$" stat -c "%s" $M0/file2 EXPECT "^Y$" check_ec_size file2 0 diff --git a/tests/bugs/libgfapi/bug-1032894.t b/tests/bugs/gfapi/bug-1032894.t index 88d110136e2..88d110136e2 100644 --- a/tests/bugs/libgfapi/bug-1032894.t +++ b/tests/bugs/gfapi/bug-1032894.t diff --git a/tests/bugs/libgfapi/bug-1093594.c b/tests/bugs/gfapi/bug-1093594.c index 8f5aa9be66c..aff271e4caf 100644 --- a/tests/bugs/libgfapi/bug-1093594.c +++ b/tests/bugs/gfapi/bug-1093594.c @@ -1,5 +1,5 @@ -#include "../../api/src/glfs.h" -#include "../../api/src/glfs-handles.h" +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -245,25 +245,27 @@ main (int argc, char *argv[]) char *topdir = "topdir", *filename = "file1"; char *buf = NULL; char *logfile = NULL; + char *hostname = NULL; - if (argc != 3) { + if (argc != 4) { fprintf (stderr, - "Expect following args %s <Vol> <log file>\n" + "Expect following args %s <hostname> <Vol> <log file>\n" , argv[0]); return -1; } - logfile = argv[2]; + hostname = argv[1]; + logfile = argv[3]; for (i = 0; i < TEST_CASE_LOOP; i++) { - fs = glfs_new (argv[1]); + fs = glfs_new (argv[2]); if (!fs) { fprintf (stderr, "glfs_new: returned NULL (%s)\n", strerror (errno)); return -1; } - ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007); + ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007); if (ret < 0) { fprintf (stderr, "glfs_set_volfile_server failed ret:%d (%s)\n", ret, strerror (errno)); @@ -292,7 +294,7 @@ main (int argc, char *argv[]) if (ret < 0) return -1; - ret = volfile_change (argv[1]); + ret = volfile_change (argv[2]); if (ret < 0) return -1; diff --git a/tests/bugs/libgfapi/bug-1093594.sh b/tests/bugs/gfapi/bug-1093594.t index 444319b8e63..3f7223be15e 100755 --- a/tests/bugs/libgfapi/bug-1093594.sh +++ b/tests/bugs/gfapi/bug-1093594.t @@ -13,8 +13,8 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; TEST $CLI volume start $V0; logdir=`gluster --print-logdir` -build_tester $(dirname $0)/bug-1093594.c -lgfapi -TEST $(dirname $0)/bug-1093594 $V0 $logdir/bug-1093594.log +TEST build_tester $(dirname $0)/bug-1093594.c -lgfapi +TEST $(dirname $0)/bug-1093594 $H0 $V0 $logdir/bug-1093594.log cleanup_tester $(dirname $0)/bug-1093594 cleanup; diff --git a/tests/bugs/libgfapi/bug-1319374-THIS-crash.sh b/tests/bugs/gfapi/bug-1319374-THIS-crash.t index 9aea739377b..8d3db421c88 100755 --- a/tests/bugs/libgfapi/bug-1319374-THIS-crash.sh +++ b/tests/bugs/gfapi/bug-1319374-THIS-crash.t @@ -19,8 +19,8 @@ TEST $CLI volume set $V0 diagnostics.client-log-flush-timeout 30 logdir=`gluster --print-logdir` -build_tester $(dirname $0)/bug-1319374.c -lgfapi -TEST $(dirname $0)/bug-1319374 $V0 $logdir/bug-1319374.log +TEST build_tester $(dirname $0)/bug-1319374.c -lgfapi +TEST $(dirname $0)/bug-1319374 $H0 $V0 $logdir/bug-1319374.log cleanup_tester $(dirname $0)/bug-1319374 diff --git a/tests/bugs/libgfapi/bug-1319374.c b/tests/bugs/gfapi/bug-1319374.c index 878d897dde6..bf2da998d6e 100644 --- a/tests/bugs/libgfapi/bug-1319374.c +++ b/tests/bugs/gfapi/bug-1319374.c @@ -7,7 +7,7 @@ #define NO_INIT 1 glfs_t * -setup_new_client(char *volname, char *log_file, int flag) +setup_new_client(char *hostname, char *volname, char *log_file, int flag) { int ret = 0; glfs_t *fs = NULL; @@ -19,7 +19,7 @@ setup_new_client(char *volname, char *log_file, int flag) goto error; } - ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007); + ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007); if (ret < 0) { fprintf (stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n", ret, strerror (errno)); @@ -58,32 +58,34 @@ main (int argc, char *argv[]) glfs_t *fs3 = NULL; char *volname = NULL; char *log_file = NULL; + char *hostname = NULL; - if (argc != 3) { + if (argc != 4) { fprintf (stderr, - "Expect following args %s <Vol> <log file location>\n" + "Expect following args %s <hostname> <Vol> <log file location>\n" , argv[0]); return -1; } - volname = argv[1]; - log_file = argv[2]; + hostname = argv[1]; + volname = argv[2]; + log_file = argv[3]; - fs1 = setup_new_client (volname, log_file, NO_INIT); + fs1 = setup_new_client (hostname, volname, log_file, NO_INIT); if (!fs1) { fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n", strerror (errno)); goto error; } - fs2 = setup_new_client (volname, log_file, 0); + fs2 = setup_new_client (hostname, volname, log_file, 0); if (!fs2) { fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n", strerror (errno)); goto error; } - fs3 = setup_new_client (volname, log_file, 0); + fs3 = setup_new_client (hostname, volname, log_file, 0); if (!fs3) { fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n", strerror (errno)); diff --git a/tests/bugs/libgfapi/glfs_vol_set_IO_ERR.c b/tests/bugs/gfapi/glfs_vol_set_IO_ERR.c index 4cf849484a6..68011171744 100644 --- a/tests/bugs/libgfapi/glfs_vol_set_IO_ERR.c +++ b/tests/bugs/gfapi/glfs_vol_set_IO_ERR.c @@ -8,7 +8,7 @@ #define WRITE_SIZE (128) glfs_t * -setup_new_client(char *volname, char *log_fileile) +setup_new_client(char *hostname, char *volname, char *log_fileile) { int ret = 0; glfs_t *fs = NULL; @@ -20,7 +20,7 @@ setup_new_client(char *volname, char *log_fileile) goto error; } - ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007); + ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007); if (ret < 0) { fprintf (stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n", ret, strerror (errno)); @@ -127,18 +127,18 @@ main (int argc, char *argv[]) char buf[100]; glfs_fd_t *fd = NULL; - if (argc != 3) { + if (argc != 4) { fprintf (stderr, - "Expect following args %s <Vol> <log file location>\n" + "Expect following args %s <hostname> <Vol> <log file location>\n" , argv[0]); return -1; } - fs = setup_new_client (argv[1], argv[2]); + fs = setup_new_client (argv[1], argv[2], argv[3]); if (!fs) goto error; - ret = volfile_change (argv[1]); + ret = volfile_change (argv[2]); if (ret < 0) goto error; diff --git a/tests/bugs/libgfapi/glfs_vol_set_IO_ERR.sh b/tests/bugs/gfapi/glfs_vol_set_IO_ERR.t index 43cad2b15ee..5893ef273bd 100755 --- a/tests/bugs/libgfapi/glfs_vol_set_IO_ERR.sh +++ b/tests/bugs/gfapi/glfs_vol_set_IO_ERR.t @@ -13,8 +13,8 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; TEST $CLI volume start $V0; logdir=`gluster --print-logdir` -build_tester $(dirname $0)/glfs_vol_set_IO_ERR.c -lgfapi -TEST $(dirname $0)/glfs_vol_set_IO_ERR $V0 $logdir/glfs_vol_set_IO_ERR.log +TEST build_tester $(dirname $0)/glfs_vol_set_IO_ERR.c -lgfapi +TEST $(dirname $0)/glfs_vol_set_IO_ERR $H0 $V0 $logdir/glfs_vol_set_IO_ERR.log cleanup_tester $(dirname $0)/glfs_vol_set_IO_ERR cleanup; diff --git a/tests/bugs/shard/bug-shard-discard.c b/tests/bugs/shard/bug-shard-discard.c index d51b07f9314..645bacf7d83 100644 --- a/tests/bugs/shard/bug-shard-discard.c +++ b/tests/bugs/shard/bug-shard-discard.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -#include "glfs.h" -#include "glfs-handles.h" +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> int main (int argc, char *argv[]) diff --git a/tests/bugs/shard/bug-shard-discard.t b/tests/bugs/shard/bug-shard-discard.t index 4c4e9417b5b..a7aff6dff40 100644 --- a/tests/bugs/shard/bug-shard-discard.t +++ b/tests/bugs/shard/bug-shard-discard.t @@ -28,7 +28,7 @@ EXPECT '10485760' stat -c %s $M0/foo gfid_foo=$(get_gfid_string $M0/foo) -TEST gcc -Wall -O2 -I api/src -o $(dirname $0)/bug-shard-discard $(dirname $0)/bug-shard-discard.c -lgfapi +TEST build_tester $(dirname $0)/bug-shard-discard.c -lgfapi -Wall -O2 #Call discard on the file at off=7M and len=3M TEST $(dirname $0)/bug-shard-discard $H0 $V0 /foo 7340032 3145728 `gluster --print-logdir`/glfs-$V0.log diff --git a/tests/bugs/shard/bug-shard-zerofill.c b/tests/bugs/shard/bug-shard-zerofill.c index f88c2e2fd02..838a656b3bb 100644 --- a/tests/bugs/shard/bug-shard-zerofill.c +++ b/tests/bugs/shard/bug-shard-zerofill.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include "glfs.h" -#include "glfs-handles.h" +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> int main (int argc, char *argv[]) diff --git a/tests/bugs/shard/bug-shard-zerofill.t b/tests/bugs/shard/bug-shard-zerofill.t index ad508c83236..29b836df323 100644 --- a/tests/bugs/shard/bug-shard-zerofill.t +++ b/tests/bugs/shard/bug-shard-zerofill.t @@ -18,7 +18,7 @@ TEST touch $M0/foo gfid_foo=$(get_gfid_string $M0/foo) -TEST gcc -Wall -O2 -I api/src -o $(dirname $0)/bug-shard-zerofill $(dirname $0)/bug-shard-zerofill.c -lgfapi +TEST build_tester $(dirname $0)/bug-shard-zerofill.c -lgfapi -Wall -O2 TEST $(dirname $0)/bug-shard-zerofill $H0 $V0 /foo `gluster --print-logdir`/glfs-$V0.log # This should ensure /.shard is created on the bricks. diff --git a/tests/bugs/shard/shard-fallocate.c b/tests/bugs/shard/shard-fallocate.c index 5365c74ef86..e16620964c9 100644 --- a/tests/bugs/shard/shard-fallocate.c +++ b/tests/bugs/shard/shard-fallocate.c @@ -2,8 +2,8 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> -#include "glfs.h" -#include "glfs-handles.h" +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> enum fallocate_flag { TEST_FALLOCATE_NONE, diff --git a/tests/bugs/shard/zero-flag.t b/tests/bugs/shard/zero-flag.t index fabf83040f0..6996150cd0e 100644 --- a/tests/bugs/shard/zero-flag.t +++ b/tests/bugs/shard/zero-flag.t @@ -17,7 +17,7 @@ TEST $CLI volume set $V0 features.shard on TEST $CLI volume start $V0 TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0 -TEST gcc -Wall -O2 -I api/src -o $(dirname $0)/zero-flag $(dirname $0)/shard-fallocate.c -lgfapi +TEST build_tester $(dirname $0)/shard-fallocate.c -lgfapi -Wall -O2 # On file1 confirm that when fallocate's offset + len > cur file size, # the new file size will increase. |