From 64954eb3c58f4ef077e54e8a3726fd2d27419b12 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 26 Dec 2014 12:57:48 +0100 Subject: tests: move all test-cases into component subdirectories There are around 300 regression tests, 250 being in tests/bugs. Running partial set of tests/bugs is not easy because this is a flat directory with almost all tests inside. It would be valuable to make partial test/bugs easier, and allow the use of mulitple build hosts for a single commit, each running a subset of the tests for a quicker result. Additional changes made: - correct the include path for *.rc shell libraries and *.py utils - make the testcases pass checkpatch - arequal-checksum in afr/self-heal.t was never executed, now it is - include.rc now complains loudly if it fails to find env.rc Change-Id: I26ffd067e9853d3be1fd63b2f37d8aa0fd1b4fea BUG: 1178685 Reported-by: Emmanuel Dreyfus Reported-by: Atin Mukherjee URL: http://www.gluster.org/pipermail/gluster-devel/2014-December/043414.html Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/9353 Reviewed-by: Kaleb KEITHLEY Reviewed-by: Emmanuel Dreyfus Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- tests/bugs/getlk_owner.c | 120 ----------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 tests/bugs/getlk_owner.c (limited to 'tests/bugs/getlk_owner.c') diff --git a/tests/bugs/getlk_owner.c b/tests/bugs/getlk_owner.c deleted file mode 100644 index 619c2e32d98..00000000000 --- a/tests/bugs/getlk_owner.c +++ /dev/null @@ -1,120 +0,0 @@ -#include -#include -#include -#include - -#define GETLK_OWNER_CHECK(f, cp, label) \ - do { \ - switch (f.l_type) { \ - case F_RDLCK: \ - case F_WRLCK: \ - ret = 1; \ - goto label; \ - case F_UNLCK: \ - if (!are_flocks_sane (&f, &cp)) { \ - ret = 1; \ - goto label; \ - } \ - break; \ - } \ - } while (0) - -void -flock_init (struct flock *f, short int type, off_t start, off_t len) -{ - f->l_type = type; - f->l_start = start; - f->l_len = len; -} - -int -flock_cp (struct flock *dst, struct flock *src) -{ - memcpy ((void *) dst, (void *) src, sizeof (struct flock)); -} - -int -are_flocks_sane (struct flock *src, struct flock *cpy) -{ - return ((src->l_whence == cpy->l_whence) && - (src->l_start == cpy->l_start) && - (src->l_len == cpy->l_len)); -} - -/* - * Test description: - * SETLK (0,3), F_WRLCK - * SETLK (3,3), F_WRLCK - * - * the following GETLK requests must return flock struct unmodified - * except for l_type to F_UNLCK - * GETLK (3,3), F_WRLCK - * GETLK (3,3), F_RDLCK - * - * */ - -int main (int argc, char **argv) -{ - int fd = -1; - int ret = 1; - char *fname = NULL; - struct flock f = {0,}; - struct flock cp = {0,}; - - if (argc < 2) - goto out; - - fname = argv[1]; - fd = open (fname, O_RDWR); - if (fd == -1) { - perror ("open"); - goto out; - } - - flock_init (&f, F_WRLCK, 0, 3); - flock_cp (&cp, &f); - ret = fcntl (fd, F_SETLK, &f); - if (ret) { - perror ("fcntl"); - goto out; - } - if (!are_flocks_sane (&f, &cp)) { - ret = 1; - goto out; - } - - flock_init (&f, F_WRLCK, 3, 3); - flock_cp (&cp, &f); - ret = fcntl (fd, F_SETLK, &f); - if (ret) { - perror ("fcntl"); - goto out; - } - if (!are_flocks_sane (&f, &cp)) { - ret = 1; - goto out; - } - - flock_init (&f, F_WRLCK, 3, 3); - flock_cp (&cp, &f); - ret = fcntl (fd, F_GETLK, &f); - if (ret) { - perror ("fcntl"); - return 1; - } - GETLK_OWNER_CHECK (f, cp, out); - - flock_init (&f, F_RDLCK, 3, 3); - flock_cp (&cp, &f); - ret = fcntl (fd, F_GETLK, &f); - if (ret) { - perror ("fcntl"); - return 1; - } - GETLK_OWNER_CHECK (f, cp, out); - -out: - if (fd != -1) - close (fd); - return ret; -} -- cgit