summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2014-12-26 12:57:48 +0100
committerVijay Bellur <vbellur@redhat.com>2015-01-06 03:24:24 -0800
commit64954eb3c58f4ef077e54e8a3726fd2d27419b12 (patch)
tree52cd5a39bbfda7442a5f0955ac2800b74a45b58a
parentc4ab37c02e9edc23d0637e23d6f2b42d0827dad2 (diff)
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 <manu@netbsd.org> Reported-by: Atin Mukherjee <amukherj@redhat.com> URL: http://www.gluster.org/pipermail/gluster-devel/2014-December/043414.html Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/9353 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Emmanuel Dreyfus <manu@netbsd.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/basic/afr/self-heal.t17
-rw-r--r--tests/bugs/access-control/bug-1051896.c (renamed from tests/bugs/bug-1051896.c)25
-rw-r--r--tests/bugs/access-control/bug-1051896.t (renamed from tests/bugs/bug-1051896.t)4
-rw-r--r--tests/bugs/access-control/bug-887098-gmount-crash.t (renamed from tests/bugs/bug-887098-gmount-crash.t)4
-rw-r--r--tests/bugs/access-control/bug-958691.t (renamed from tests/bugs/bug-958691.t)6
-rw-r--r--tests/bugs/cli/bug-1004218.t (renamed from tests/bugs/bug-1004218.t)2
-rw-r--r--tests/bugs/cli/bug-1022905.t (renamed from tests/bugs/bug-1022905.t)2
-rw-r--r--tests/bugs/cli/bug-1030580.t (renamed from tests/bugs/bug-1030580.t)4
-rw-r--r--tests/bugs/cli/bug-1047378.t (renamed from tests/bugs/bug-1047378.t)2
-rw-r--r--tests/bugs/cli/bug-1047416.t (renamed from tests/bugs/bug-1047416.t)6
-rw-r--r--tests/bugs/cli/bug-1077682.t (renamed from tests/bugs/bug-1077682.t)4
-rwxr-xr-xtests/bugs/cli/bug-1087487.t (renamed from tests/bugs/bug-1087487.t)4
-rw-r--r--tests/bugs/cli/bug-1113476.t (renamed from tests/bugs/bug-1113476.t)6
-rw-r--r--tests/bugs/cli/bug-764638.t (renamed from tests/bugs/bug-764638.t)2
-rwxr-xr-xtests/bugs/cli/bug-770655.t (renamed from tests/bugs/bug-770655.t)4
-rwxr-xr-xtests/bugs/cli/bug-822830.t (renamed from tests/bugs/bug-822830.t)4
-rw-r--r--tests/bugs/cli/bug-867252.t (renamed from tests/bugs/bug-867252.t)2
-rwxr-xr-xtests/bugs/cli/bug-921215.t (renamed from tests/bugs/bug-921215.t)2
-rw-r--r--tests/bugs/cli/bug-949298.t (renamed from tests/bugs/bug-949298.t)4
-rw-r--r--tests/bugs/cli/bug-961307.t (renamed from tests/bugs/bug-961307.t)4
-rwxr-xr-xtests/bugs/cli/bug-969193.t (renamed from tests/bugs/bug-969193.t)2
-rw-r--r--tests/bugs/cli/bug-977246.t (renamed from tests/bugs/bug-977246.t)2
-rw-r--r--tests/bugs/cli/bug-982174.t (renamed from tests/bugs/bug-982174.t)4
-rw-r--r--tests/bugs/cli/bug-983317.t (renamed from tests/bugs/bug-983317.t)4
-rw-r--r--tests/bugs/core/949327.t (renamed from tests/bugs/949327.t)4
-rw-r--r--tests/bugs/core/bug-1110917.t (renamed from tests/bugs/bug-1110917.t)4
-rw-r--r--tests/bugs/core/bug-1111557.t (renamed from tests/bugs/bug-1111557.t)2
-rw-r--r--tests/bugs/core/bug-1117951.t (renamed from tests/bugs/bug-1117951.t)4
-rw-r--r--tests/bugs/core/bug-1119582.t (renamed from tests/bugs/bug-1119582.t)8
-rw-r--r--tests/bugs/core/bug-1135514-allow-setxattr-with-null-value.t (renamed from tests/bugs/bug-1135514-allow-setxattr-with-null-value.t)4
-rwxr-xr-xtests/bugs/core/bug-1168803-snapd-option-validation-fix.t (renamed from tests/bugs/bug-1168803-snapd-option-validation-fix.t)4
-rw-r--r--tests/bugs/core/bug-1168875.t (renamed from tests/bugs/bug-1168875.t)10
-rw-r--r--tests/bugs/core/bug-834465.c (renamed from tests/bugs/bug-834465.c)0
-rwxr-xr-xtests/bugs/core/bug-834465.t (renamed from tests/bugs/bug-834465.t)4
-rw-r--r--tests/bugs/core/bug-845213.t (renamed from tests/bugs/bug-845213.t)2
-rw-r--r--tests/bugs/core/bug-903336.t (renamed from tests/bugs/bug-903336.t)2
-rwxr-xr-xtests/bugs/core/bug-908146.t (renamed from tests/bugs/bug-908146.t)4
-rw-r--r--tests/bugs/core/bug-913544.t (renamed from tests/bugs/bug-913544.t)4
-rwxr-xr-xtests/bugs/core/bug-924075.t (renamed from tests/bugs/bug-924075.t)4
-rwxr-xr-xtests/bugs/core/bug-927616.t (renamed from tests/bugs/bug-927616.t)4
-rw-r--r--tests/bugs/core/bug-949242.t (renamed from tests/bugs/bug-949242.t)6
-rw-r--r--tests/bugs/core/bug-986429.t (renamed from tests/bugs/bug-986429.t)4
-rw-r--r--tests/bugs/distribute/bug-1042725.t (renamed from tests/bugs/bug-1042725.t)4
-rwxr-xr-xtests/bugs/distribute/bug-1063230.t (renamed from tests/bugs/bug-1063230.t)4
-rwxr-xr-xtests/bugs/distribute/bug-1066798.t (renamed from tests/bugs/bug-1066798.t)4
-rwxr-xr-xtests/bugs/distribute/bug-1086228.t (renamed from tests/bugs/bug-1086228.t)8
-rwxr-xr-xtests/bugs/distribute/bug-1088231.t (renamed from tests/bugs/bug-1088231.t)8
-rw-r--r--tests/bugs/distribute/bug-1099890.t (renamed from tests/bugs/bug-1099890.t)6
-rwxr-xr-xtests/bugs/distribute/bug-1117851.t (renamed from tests/bugs/bug-1117851.t)4
-rw-r--r--tests/bugs/distribute/bug-1122443.t (renamed from tests/bugs/bug-1122443.t)4
-rwxr-xr-xtests/bugs/distribute/bug-1125824.t (renamed from tests/bugs/bug-1125824.t)6
-rwxr-xr-xtests/bugs/distribute/bug-1161156.t (renamed from tests/bugs/bug-1161156.t)4
-rwxr-xr-xtests/bugs/distribute/bug-853258.t (renamed from tests/bugs/bug-853258.t)4
-rw-r--r--tests/bugs/distribute/bug-860663.c (renamed from tests/bugs/bug-860663.c)3
-rw-r--r--tests/bugs/distribute/bug-860663.t (renamed from tests/bugs/bug-860663.t)2
-rw-r--r--tests/bugs/distribute/bug-862967.t (renamed from tests/bugs/bug-862967.t)2
-rwxr-xr-xtests/bugs/distribute/bug-882278.t (renamed from tests/bugs/bug-882278.t)4
-rwxr-xr-xtests/bugs/distribute/bug-884455.t (renamed from tests/bugs/bug-884455.t)4
-rwxr-xr-xtests/bugs/distribute/bug-884597.t (renamed from tests/bugs/bug-884597.t)6
-rwxr-xr-xtests/bugs/distribute/bug-907072.t (renamed from tests/bugs/bug-907072.t)8
-rwxr-xr-xtests/bugs/distribute/bug-912564.t (renamed from tests/bugs/bug-912564.t)4
-rwxr-xr-xtests/bugs/distribute/bug-915554.t (renamed from tests/bugs/bug-915554.t)6
-rwxr-xr-xtests/bugs/distribute/bug-921408.t (renamed from tests/bugs/bug-921408.t)8
-rwxr-xr-xtests/bugs/distribute/bug-924265.t (renamed from tests/bugs/bug-924265.t)4
-rw-r--r--tests/bugs/distribute/bug-961615.t (renamed from tests/bugs/bug-961615.t)4
-rwxr-xr-xtests/bugs/distribute/bug-973073.t (renamed from tests/bugs/bug-973073.t)4
-rwxr-xr-xtests/bugs/distribute/overlap.py (renamed from tests/bugs/overlap.py)0
-rwxr-xr-xtests/bugs/error-gen/bug-767095.t (renamed from tests/bugs/bug-767095.t)2
-rw-r--r--tests/bugs/fuse/bug-1030208.t (renamed from tests/bugs/bug-1030208.t)4
-rw-r--r--tests/bugs/fuse/bug-1126048.c (renamed from tests/bugs/bug-1126048.c)2
-rwxr-xr-xtests/bugs/fuse/bug-1126048.t (renamed from tests/bugs/bug-1126048.t)2
-rwxr-xr-xtests/bugs/fuse/bug-858215.t (renamed from tests/bugs/bug-858215.t)2
-rw-r--r--tests/bugs/fuse/bug-858488-min-free-disk.t (renamed from tests/bugs/bug-858488-min-free-disk.t)4
-rwxr-xr-xtests/bugs/fuse/bug-924726.t (renamed from tests/bugs/bug-924726.t)4
-rw-r--r--tests/bugs/fuse/bug-963678.t (renamed from tests/bugs/bug-963678.t)6
-rwxr-xr-xtests/bugs/fuse/bug-983477.t (renamed from tests/bugs/bug-983477.t)4
-rw-r--r--tests/bugs/fuse/bug-985074.t (renamed from tests/bugs/bug-985074.t)4
-rw-r--r--tests/bugs/geo-replication/bug-1111490.t (renamed from tests/bugs/bug-1111490.t)8
-rwxr-xr-xtests/bugs/geo-replication/bug-877293.t (renamed from tests/bugs/bug-877293.t)4
-rwxr-xr-xtests/bugs/glusterd/859927/repl.t (renamed from tests/bugs/859927/repl.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-000000.t (renamed from tests/bugs/bug-000000.t)2
-rwxr-xr-xtests/bugs/glusterd/bug-1002556.t (renamed from tests/bugs/bug-1002556.t)4
-rw-r--r--tests/bugs/glusterd/bug-1004744.t (renamed from tests/bugs/bug-1004744.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-1022055.t (renamed from tests/bugs/bug-1022055.t)4
-rw-r--r--tests/bugs/glusterd/bug-1027171.t (renamed from tests/bugs/bug-1027171.t)4
-rw-r--r--tests/bugs/glusterd/bug-1040408.t (renamed from tests/bugs/bug-1040408.t)4
-rw-r--r--tests/bugs/glusterd/bug-1046308.t (renamed from tests/bugs/bug-1046308.t)2
-rw-r--r--tests/bugs/glusterd/bug-1047955.t (renamed from tests/bugs/bug-1047955.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-1070734.t (renamed from tests/bugs/bug-1070734.t)6
-rw-r--r--tests/bugs/glusterd/bug-1075087.t (renamed from tests/bugs/bug-1075087.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-1085330.t (renamed from tests/bugs/bug-1085330.t)4
-rw-r--r--tests/bugs/glusterd/bug-1087203.t (renamed from tests/bugs/bug-1087203.t)8
-rwxr-xr-xtests/bugs/glusterd/bug-1089668.t (renamed from tests/bugs/bug-1089668.t)6
-rwxr-xr-xtests/bugs/glusterd/bug-1090042.t (renamed from tests/bugs/bug-1090042.t)6
-rwxr-xr-xtests/bugs/glusterd/bug-1091935-brick-order-check-from-cli-to-glusterd.t (renamed from tests/bugs/bug-1091935-brick-order-check-from-cli-to-glusterd.t)4
-rw-r--r--tests/bugs/glusterd/bug-1092841.t (renamed from tests/bugs/bug-1092841.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-1095097.t (renamed from tests/bugs/bug-1095097.t)2
-rw-r--r--tests/bugs/glusterd/bug-1102656.t (renamed from tests/bugs/bug-1102656.t)2
-rw-r--r--tests/bugs/glusterd/bug-1104642.t (renamed from tests/bugs/bug-1104642.t)6
-rw-r--r--tests/bugs/glusterd/bug-1109741-auth-mgmt-handshake.t (renamed from tests/bugs/bug-1109741-auth-mgmt-handshake.t)4
-rw-r--r--tests/bugs/glusterd/bug-1109770.t (renamed from tests/bugs/bug-1109770.t)10
-rw-r--r--tests/bugs/glusterd/bug-1109889.t (renamed from tests/bugs/bug-1109889.t)10
-rw-r--r--tests/bugs/glusterd/bug-1111041.t (renamed from tests/bugs/bug-1111041.t)8
-rwxr-xr-xtests/bugs/glusterd/bug-1112559.t (renamed from tests/bugs/bug-1112559.t)10
-rw-r--r--tests/bugs/glusterd/bug-1112613.t (renamed from tests/bugs/bug-1112613.t)8
-rw-r--r--tests/bugs/glusterd/bug-1113975.t (renamed from tests/bugs/bug-1113975.t)6
-rw-r--r--tests/bugs/glusterd/bug-1120647.t (renamed from tests/bugs/bug-1120647.t)4
-rw-r--r--tests/bugs/glusterd/bug-1140162-file-snapshot-and-features-encryption-option-validation.t (renamed from tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-1173414-mgmt-v3-remote-lock-failure.t (renamed from tests/bugs/bug-1173414-mgmt-v3-remote-lock-failure.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-765230.t (renamed from tests/bugs/bug-765230.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-782095.t (renamed from tests/bugs/bug-782095.t)4
-rw-r--r--tests/bugs/glusterd/bug-824753-file-locker.c (renamed from tests/bugs/bug-824753-file-locker.c)4
-rwxr-xr-xtests/bugs/glusterd/bug-824753.t (renamed from tests/bugs/bug-824753.t)2
-rw-r--r--tests/bugs/glusterd/bug-839595.t (renamed from tests/bugs/bug-839595.t)4
-rw-r--r--tests/bugs/glusterd/bug-857330/common.rc (renamed from tests/bugs/bug-857330/common.rc)2
-rwxr-xr-xtests/bugs/glusterd/bug-857330/normal.t (renamed from tests/bugs/bug-857330/normal.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-857330/xml.t (renamed from tests/bugs/bug-857330/xml.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-859927.t (renamed from tests/bugs/bug-859927.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-862834.t (renamed from tests/bugs/bug-862834.t)2
-rw-r--r--tests/bugs/glusterd/bug-878004.t (renamed from tests/bugs/bug-878004.t)2
-rw-r--r--tests/bugs/glusterd/bug-888752.t (renamed from tests/bugs/bug-888752.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-889630.t (renamed from tests/bugs/bug-889630.t)4
-rw-r--r--tests/bugs/glusterd/bug-905307.t (renamed from tests/bugs/bug-905307.t)4
-rw-r--r--tests/bugs/glusterd/bug-913487.t (renamed from tests/bugs/bug-913487.t)2
-rwxr-xr-xtests/bugs/glusterd/bug-913555.t (renamed from tests/bugs/bug-913555.t)6
-rwxr-xr-xtests/bugs/glusterd/bug-916549.t (renamed from tests/bugs/bug-916549.t)2
-rwxr-xr-xtests/bugs/glusterd/bug-948686.t (renamed from tests/bugs/bug-948686.t)6
-rw-r--r--tests/bugs/glusterd/bug-948729/bug-948729-force.t (renamed from tests/bugs/bug-948729/bug-948729-force.t)6
-rw-r--r--tests/bugs/glusterd/bug-948729/bug-948729-mode-script.t (renamed from tests/bugs/bug-948729/bug-948729-mode-script.t)6
-rw-r--r--tests/bugs/glusterd/bug-948729/bug-948729.t (renamed from tests/bugs/bug-948729/bug-948729.t)6
-rw-r--r--tests/bugs/glusterd/bug-949930.t (renamed from tests/bugs/bug-949930.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-955588.t (renamed from tests/bugs/bug-955588.t)4
-rw-r--r--tests/bugs/glusterd/bug-958790.t (renamed from tests/bugs/bug-958790.t)4
-rw-r--r--tests/bugs/glusterd/bug-961669.t (renamed from tests/bugs/bug-961669.t)4
-rwxr-xr-xtests/bugs/glusterd/bug-963541.t (renamed from tests/bugs/bug-963541.t)2
-rwxr-xr-xtests/bugs/glusterd/bug-964059.t (renamed from tests/bugs/bug-964059.t)4
-rw-r--r--tests/bugs/glusterd/bug-974007.t (renamed from tests/bugs/bug-974007.t)4
-rwxr-xr-xtests/bugs/glusterfs-server/bug-852147.t (renamed from tests/bugs/bug-852147.t)4
-rwxr-xr-xtests/bugs/glusterfs-server/bug-861542.t (renamed from tests/bugs/bug-861542.t)2
-rwxr-xr-xtests/bugs/glusterfs-server/bug-864222.t (renamed from tests/bugs/bug-864222.t)6
-rw-r--r--tests/bugs/glusterfs-server/bug-873549.t (renamed from tests/bugs/bug-873549.t)2
-rwxr-xr-xtests/bugs/glusterfs-server/bug-877992.t (renamed from tests/bugs/bug-877992.t)2
-rwxr-xr-xtests/bugs/glusterfs-server/bug-887145.t (renamed from tests/bugs/bug-887145.t)4
-rw-r--r--tests/bugs/glusterfs-server/bug-889996.t (renamed from tests/bugs/bug-889996.t)4
-rwxr-xr-xtests/bugs/glusterfs-server/bug-904300.t (renamed from tests/bugs/bug-904300.t)6
-rw-r--r--tests/bugs/glusterfs-server/bug-905864.c (renamed from tests/bugs/bug-905864.c)2
-rw-r--r--tests/bugs/glusterfs-server/bug-905864.t (renamed from tests/bugs/bug-905864.t)4
-rwxr-xr-xtests/bugs/glusterfs-server/bug-912297.t (renamed from tests/bugs/bug-912297.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-811493.t (renamed from tests/bugs/bug-811493.t)2
-rwxr-xr-xtests/bugs/glusterfs/bug-844688.t (renamed from tests/bugs/bug-844688.t)4
-rw-r--r--tests/bugs/glusterfs/bug-848251.t (renamed from tests/bugs/bug-848251.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-853690.t (renamed from tests/bugs/bug-853690.t)4
-rw-r--r--tests/bugs/glusterfs/bug-856455.t (renamed from tests/bugs/bug-856455.t)2
-rw-r--r--tests/bugs/glusterfs/bug-860297.t (renamed from tests/bugs/bug-860297.t)2
-rw-r--r--tests/bugs/glusterfs/bug-861015-index.t (renamed from tests/bugs/bug-861015-index.t)4
-rw-r--r--tests/bugs/glusterfs/bug-861015-log.t (renamed from tests/bugs/bug-861015-log.t)4
-rw-r--r--tests/bugs/glusterfs/bug-866459.t (renamed from tests/bugs/bug-866459.t)4
-rw-r--r--tests/bugs/glusterfs/bug-867253.t (renamed from tests/bugs/bug-867253.t)6
-rw-r--r--tests/bugs/glusterfs/bug-869724.t (renamed from tests/bugs/bug-869724.t)2
-rwxr-xr-xtests/bugs/glusterfs/bug-872923.t (renamed from tests/bugs/bug-872923.t)6
-rw-r--r--tests/bugs/glusterfs/bug-873962-spb.t (renamed from tests/bugs/bug-873962-spb.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-873962.t (renamed from tests/bugs/bug-873962.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-879490.t (renamed from tests/bugs/bug-879490.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-879494.t (renamed from tests/bugs/bug-879494.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-892730.t (renamed from tests/bugs/bug-892730.t)4
-rw-r--r--tests/bugs/glusterfs/bug-893338.t (renamed from tests/bugs/bug-893338.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-893378.t (renamed from tests/bugs/bug-893378.t)2
-rw-r--r--tests/bugs/glusterfs/bug-895235.t (renamed from tests/bugs/bug-895235.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-896431.t (renamed from tests/bugs/bug-896431.t)4
-rwxr-xr-xtests/bugs/glusterfs/bug-902610.t (renamed from tests/bugs/bug-902610.t)2
-rw-r--r--tests/bugs/glusterfs/bug-906646.t (renamed from tests/bugs/bug-906646.t)4
-rw-r--r--tests/bugs/glusterfs/getlk_owner.c (renamed from tests/bugs/getlk_owner.c)16
-rw-r--r--tests/bugs/io-cache/bug-858242.c (renamed from tests/bugs/bug-858242.c)0
-rwxr-xr-xtests/bugs/io-cache/bug-858242.t (renamed from tests/bugs/bug-858242.t)2
-rw-r--r--tests/bugs/libgfapi/bug-1032894.t (renamed from tests/bugs/bug-1032894.t)4
-rwxr-xr-xtests/bugs/logging/bug-823081.t (renamed from tests/bugs/bug-823081.t)2
-rwxr-xr-xtests/bugs/nfs/bug-1053579.t (renamed from tests/bugs/bug-1053579.t)6
-rw-r--r--tests/bugs/nfs/bug-1116503.t (renamed from tests/bugs/bug-1116503.t)6
-rw-r--r--tests/bugs/nfs/bug-1157223-symlink-mounting.t (renamed from tests/bugs/bug-1157223-symlink-mounting.t)4
-rw-r--r--tests/bugs/nfs/bug-1161092-nfs-acls.t (renamed from tests/bugs/bug-1161092-nfs-acls.t)4
-rwxr-xr-xtests/bugs/nfs/bug-847622.t (renamed from tests/bugs/bug-847622.t)6
-rwxr-xr-xtests/bugs/nfs/bug-877885.t (renamed from tests/bugs/bug-877885.t)6
-rwxr-xr-xtests/bugs/nfs/bug-904065.t (renamed from tests/bugs/bug-904065.t)6
-rwxr-xr-xtests/bugs/nfs/bug-915280.t (renamed from tests/bugs/bug-915280.t)6
-rwxr-xr-xtests/bugs/nfs/bug-970070.t (renamed from tests/bugs/bug-970070.t)2
-rwxr-xr-xtests/bugs/nfs/bug-974972.t (renamed from tests/bugs/bug-974972.t)6
-rw-r--r--tests/bugs/posix/bug-1034716.t (renamed from tests/bugs/bug-1034716.t)4
-rwxr-xr-xtests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t (renamed from tests/bugs/brick-uid-reset-on-volume-restart.t)4
-rw-r--r--tests/bugs/posix/bug-765380.t (renamed from tests/bugs/bug-765380.t)2
-rwxr-xr-xtests/bugs/posix/bug-990028.t (renamed from tests/bugs/bug-990028.t)8
-rwxr-xr-xtests/bugs/protocol/bug-762989.t (renamed from tests/bugs/bug-762989.t)2
-rwxr-xr-xtests/bugs/protocol/bug-808400-dist.t (renamed from tests/bugs/bug-808400-dist.t)4
-rw-r--r--tests/bugs/protocol/bug-808400-fcntl.c (renamed from tests/bugs/bug-808400-fcntl.c)0
-rw-r--r--tests/bugs/protocol/bug-808400-flock.c (renamed from tests/bugs/bug-808400-flock.c)0
-rwxr-xr-xtests/bugs/protocol/bug-808400-repl.t (renamed from tests/bugs/bug-808400-repl.t)4
-rwxr-xr-xtests/bugs/protocol/bug-808400-stripe.t (renamed from tests/bugs/bug-808400-stripe.t)4
-rwxr-xr-xtests/bugs/protocol/bug-808400.t (renamed from tests/bugs/bug-808400.t)4
-rw-r--r--tests/bugs/quick-read/bug-846240.t (renamed from tests/bugs/bug-846240.t)6
-rw-r--r--tests/bugs/quota/afr-quota-xattr-mdata-heal.t (renamed from tests/bugs/afr-quota-xattr-mdata-heal.t)4
-rw-r--r--tests/bugs/quota/bug-1023974.t (renamed from tests/bugs/bug-1023974.t)2
-rw-r--r--tests/bugs/quota/bug-1035576.t (renamed from tests/bugs/bug-1035576.t)4
-rw-r--r--tests/bugs/quota/bug-1038598.t (renamed from tests/bugs/bug-1038598.t)4
-rwxr-xr-xtests/bugs/quota/bug-1040423.t (renamed from tests/bugs/bug-1040423.t)4
-rwxr-xr-xtests/bugs/quota/bug-1049323.t (renamed from tests/bugs/bug-1049323.t)4
-rw-r--r--tests/bugs/quota/bug-1087198.t (renamed from tests/bugs/bug-1087198.t)8
-rw-r--r--tests/bugs/quota/bug-1100050.t (renamed from tests/bugs/bug-1100050.t)4
-rwxr-xr-xtests/bugs/quota/bug-1104692.t (renamed from tests/bugs/bug-1104692.t)4
-rwxr-xr-xtests/bugs/rdma/bug-765473.t (renamed from tests/bugs/bug-765473.t)6
-rw-r--r--tests/bugs/replicate/886998/strict-readdir.t (renamed from tests/bugs/886998/strict-readdir.t)4
-rwxr-xr-xtests/bugs/replicate/bug-1015990-rep.t (renamed from tests/bugs/bug-1015990-rep.t)6
-rwxr-xr-xtests/bugs/replicate/bug-1015990.t (renamed from tests/bugs/bug-1015990.t)6
-rw-r--r--tests/bugs/replicate/bug-1032927.t (renamed from tests/bugs/bug-1032927.t)4
-rwxr-xr-xtests/bugs/replicate/bug-1037501.t (renamed from tests/bugs/bug-1037501.t)4
-rwxr-xr-xtests/bugs/replicate/bug-1046624.t (renamed from tests/bugs/bug-1046624.t)4
-rw-r--r--tests/bugs/replicate/bug-1058797.t (renamed from tests/bugs/bug-1058797.t)4
-rw-r--r--tests/bugs/replicate/bug-1101647.t (renamed from tests/bugs/bug-1101647.t)6
-rw-r--r--tests/bugs/replicate/bug-1130892.t (renamed from tests/bugs/bug-1130892.t)6
-rw-r--r--tests/bugs/replicate/bug-1132102.t (renamed from tests/bugs/bug-1132102.t)4
-rw-r--r--tests/bugs/replicate/bug-1134691-afr-lookup-metadata-heal.t (renamed from tests/bugs/bug-1134691-afr-lookup-metadata-heal.t)4
-rw-r--r--tests/bugs/replicate/bug-1139230.t (renamed from tests/bugs/bug-1139230.t)6
-rw-r--r--tests/bugs/replicate/bug-765564.t (renamed from tests/bugs/bug-765564.t)4
-rwxr-xr-xtests/bugs/replicate/bug-767585-gfid.t (renamed from tests/bugs/bug-767585-gfid.t)4
-rwxr-xr-xtests/bugs/replicate/bug-802417.t (renamed from tests/bugs/bug-802417.t)4
-rw-r--r--tests/bugs/replicate/bug-821056.t (renamed from tests/bugs/bug-821056.t)4
-rwxr-xr-xtests/bugs/replicate/bug-830665.t (renamed from tests/bugs/bug-830665.t)6
-rwxr-xr-xtests/bugs/replicate/bug-853680.t (renamed from tests/bugs/bug-853680.t)4
-rwxr-xr-xtests/bugs/replicate/bug-859581.t (renamed from tests/bugs/bug-859581.t)4
-rwxr-xr-xtests/bugs/replicate/bug-865825.t (renamed from tests/bugs/bug-865825.t)4
-rw-r--r--tests/bugs/replicate/bug-880898.t (renamed from tests/bugs/bug-880898.t)2
-rw-r--r--tests/bugs/replicate/bug-884328.t (renamed from tests/bugs/bug-884328.t)4
-rw-r--r--tests/bugs/replicate/bug-886998.t (renamed from tests/bugs/bug-886998.t)4
-rw-r--r--tests/bugs/replicate/bug-888174.t (renamed from tests/bugs/bug-888174.t)4
-rw-r--r--tests/bugs/replicate/bug-913051.t (renamed from tests/bugs/bug-913051.t)6
-rw-r--r--tests/bugs/replicate/bug-916226.t (renamed from tests/bugs/bug-916226.t)4
-rw-r--r--tests/bugs/replicate/bug-918437-sh-mtime.t (renamed from tests/bugs/bug-918437-sh-mtime.t)4
-rw-r--r--tests/bugs/replicate/bug-921231.t (renamed from tests/bugs/bug-921231.t)4
-rw-r--r--tests/bugs/replicate/bug-957877.t (renamed from tests/bugs/bug-957877.t)6
-rw-r--r--tests/bugs/replicate/bug-966018.t (renamed from tests/bugs/bug-966018.t)6
-rw-r--r--tests/bugs/replicate/bug-976800.t (renamed from tests/bugs/bug-976800.t)4
-rwxr-xr-xtests/bugs/replicate/bug-977797.t (renamed from tests/bugs/bug-977797.t)4
-rw-r--r--tests/bugs/replicate/bug-978794.t (renamed from tests/bugs/bug-978794.t)6
-rwxr-xr-xtests/bugs/replicate/bug-979365.t (renamed from tests/bugs/bug-979365.t)4
-rwxr-xr-xtests/bugs/replicate/bug-986905.t (renamed from tests/bugs/bug-986905.t)4
-rwxr-xr-xtests/bugs/rpc/bug-1043886.t (renamed from tests/bugs/bug-1043886.t)4
-rwxr-xr-xtests/bugs/rpc/bug-847624.t (renamed from tests/bugs/bug-847624.t)6
-rw-r--r--tests/bugs/rpc/bug-884452.t (renamed from tests/bugs/bug-884452.t)4
-rwxr-xr-xtests/bugs/rpc/bug-921072.t (renamed from tests/bugs/bug-921072.t)6
-rwxr-xr-xtests/bugs/rpc/bug-954057.t (renamed from tests/bugs/bug-954057.t)4
-rwxr-xr-xtests/bugs/snapshot/bug-1045333.t (renamed from tests/bugs/bug-1045333.t)4
-rwxr-xr-xtests/bugs/snapshot/bug-1049834.t (renamed from tests/bugs/bug-1049834.t)8
-rw-r--r--tests/bugs/snapshot/bug-1064768.t (renamed from tests/bugs/bug-1064768.t)2
-rw-r--r--tests/bugs/snapshot/bug-1155042-dont-display-deactivated-snapshots.t (renamed from tests/bugs/bug-1155042-dont-display-deactivated-snapshots.t)6
-rwxr-xr-xtests/bugs/snapshot/bug-1157991.t (renamed from tests/bugs/bug-1157991.t)4
-rwxr-xr-xtests/bugs/snapshot/bug-1162462.t (renamed from tests/bugs/bug-1162462.t)6
-rw-r--r--tests/bugs/snapshot/bug-1162498.t (renamed from tests/bugs/bug-1162498.t)4
-rw-r--r--tests/bugs/snapshot/bug-1164613.t (renamed from tests/bugs/bug-1164613.t)4
-rwxr-xr-xtests/bugs/snapshot/bug-1166197.t (renamed from tests/bugs/bug-1166197.t)8
-rw-r--r--tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t (renamed from tests/bugs/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t)8
-rw-r--r--tests/bugs/snapshot/bug-1178079.t (renamed from tests/bugs/bug-1178079.t)4
-rw-r--r--tests/bugs/stripe/bug-1002207.t (renamed from tests/bugs/bug-1002207.t)4
-rw-r--r--tests/bugs/stripe/bug-1111454.t (renamed from tests/bugs/bug-1111454.t)4
-rwxr-xr-xtests/bugs/trace/bug-797171.t (renamed from tests/bugs/bug-797171.t)4
-rwxr-xr-xtests/bugs/transport/bug-873367.t (renamed from tests/bugs/bug-873367.t)4
-rw-r--r--tests/bugs/unclassified/bug-1034085.t (renamed from tests/bugs/bug-1034085.t)2
-rw-r--r--tests/bugs/unclassified/bug-874498.t (renamed from tests/bugs/bug-874498.t)6
-rw-r--r--tests/bugs/unclassified/bug-991622.t (renamed from tests/bugs/bug-991622.t)6
-rw-r--r--tests/bugs/write-behind/bug-1058663.c (renamed from tests/bugs/bug-1058663.c)38
-rw-r--r--tests/bugs/write-behind/bug-1058663.t (renamed from tests/bugs/bug-1058663.t)4
-rw-r--r--[-rwxr-xr-x]tests/cluster.rc0
-rw-r--r--tests/include.rc15
-rw-r--r--[-rwxr-xr-x]tests/snapshot.rc0
271 files changed, 619 insertions, 609 deletions
diff --git a/tests/basic/afr/self-heal.t b/tests/basic/afr/self-heal.t
index fff0181..dbd8961 100644
--- a/tests/basic/afr/self-heal.t
+++ b/tests/basic/afr/self-heal.t
@@ -7,6 +7,7 @@ cleanup;
#Init
AREQUAL_PATH=$(dirname $0)/../../utils
+AREQUAL_BIN=$AREQUAL_PATH/arequal-checksum
CFLAGS=""
test "`uname -s`" != "Linux" && {
CFLAGS="$CFLAGS -I$(dirname $0)/../../../contrib/argp-standalone ";
@@ -14,6 +15,8 @@ test "`uname -s`" != "Linux" && {
CFLAGS="$CFLAGS -lintl";
}
build_tester $AREQUAL_PATH/arequal-checksum.c $CFLAGS
+TEST [ -e $AREQUAL_BIN ]
+
TEST glusterd
TEST pidof glusterd
TEST $CLI volume create $V0 replica 2 $H0:$B0/brick{0,1}
@@ -59,7 +62,7 @@ TEST ls $B0/brick0/def/ghi/file2.txt
TEST ls $B0/brick0/jkl/mno/file.txt
TEST ! ls $B0/brick0/abc/ghi
EXPECT "$NEW_UID$NEW_GID" stat -c %u%g $B0/brick0/abc/def/file_abc_def_2.txt
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
#Cleanup
TEST rm -rf $M0/*
@@ -83,7 +86,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
#check heal has happened in the correct direction
TEST test -d $B0/brick0/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
#Cleanup
TEST rm -rf $M0/*
@@ -106,7 +109,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
#check heal has happened in the correct direction
EXPECT "777" stat -c %a $B0/brick0/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
#Cleanup
TEST rm -rf $M0/*
@@ -130,7 +133,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
#check heal has happened in the correct direction
EXPECT "$NEW_UID$NEW_GID" stat -c %u%g $B0/brick0/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
#Cleanup
TEST rm -rf $M0/*
@@ -161,7 +164,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
#check heal has happened in the correct direction
EXPECT 0 stat -c %s $B0/brick1/file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
#Cleanup
TEST rm -rf $M0/*
@@ -209,7 +212,7 @@ EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
#check heal has happened in the correct direction
TEST test -f $B0/brick0/hard_link_to_file
TEST test -h $B0/brick0/link_to_file
-TEST diff <(arequal-checksum -p $B0/brick0 -i .glusterfs) <(arequal-checksum -p $B0/brick1 -i .glusterfs)
+TEST diff <($AREQUAL_BIN -p $B0/brick0 -i .glusterfs) <($AREQUAL_BIN -p $B0/brick1 -i .glusterfs)
#Cleanup
TEST rm -rf $M0/*
@@ -239,5 +242,5 @@ TEST diff <(echo "user.myattr_3=\"My_attribute_3\"") <(getfattr -n user.myattr_3
TEST rm -rf $M0/*
###############################################################################
-TEST rm -rf $AREQUAL_PATH/arequal-checksum
+TEST rm -rf $AREQUAL_BIN
cleanup;
diff --git a/tests/bugs/bug-1051896.c b/tests/bugs/access-control/bug-1051896.c
index 0ffd819..27aa155 100644
--- a/tests/bugs/bug-1051896.c
+++ b/tests/bugs/access-control/bug-1051896.c
@@ -25,12 +25,12 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
char textmode[30];
r = 0;
- dob = strchr(options,'b') != (char*)NULL;
- dok = strchr(options,'k') != (char*)NULL;
- dom = strchr(options,'m') != (char*)NULL;
+ dob = strchr(options, 'b') != (char *)NULL;
+ dok = strchr(options, 'k') != (char *)NULL;
+ dom = strchr(options, 'm') != (char *)NULL;
if ((dom && !textacl)
|| (!dom && (textacl || (!dok && !dob) ||
- strchr(options,'d')))) {
+ strchr(options, 'd')))) {
errno = EBADRQC; /* "bad request" */
r = -1;
} else {
@@ -38,7 +38,7 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
r = acl_delete_def_file(path);
}
if (dob && !r) {
- if (!stat(path,&st)) {
+ if (!stat(path, &st)) {
sprintf(textmode,
"u::%c%c%c,g::%c%c%c,o::%c%c%c",
(st.st_mode & 0400 ? 'r' : '-'),
@@ -53,7 +53,7 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
acl = acl_from_text(textmode);
if (acl) {
r = acl_set_file(path,
- ACL_TYPE_ACCESS,acl);
+ ACL_TYPE_ACCESS, acl);
acl_free(acl);
} else
r = -1;
@@ -61,13 +61,13 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
r = -1;
}
if (!r && dom) {
- if (strchr(options,'d'))
+ if (strchr(options, 'd'))
type = ACL_TYPE_DEFAULT;
else
type = ACL_TYPE_ACCESS;
acl = acl_from_text(textacl);
if (acl) {
- r = acl_set_file(path,type,acl);
+ r = acl_set_file(path, type, acl);
acl_free(acl);
} else
r = -1;
@@ -75,18 +75,21 @@ int do_setfacl(const char *path, const char *options, const char *textacl)
}
if (r)
r = -errno;
- return (r);
+ return r;
}
-int main(int argc, char *argv[]){
+int main(int argc, char *argv[])
+{
int rc = 0;
+
if (argc != 4) {
fprintf(stderr,
"usage: ./setfacl_test <path> <options> <textacl>\n");
return 0;
}
- if ((rc = do_setfacl(argv[1], argv[2], argv[3])) != 0){
+ rc = do_setfacl(argv[1], argv[2], argv[3]);
+ if (rc != 0) {
fprintf(stderr, "do_setfacl failed: %s\n", strerror(errno));
return rc;
}
diff --git a/tests/bugs/bug-1051896.t b/tests/bugs/access-control/bug-1051896.t
index e069b17..870ede7 100644
--- a/tests/bugs/bug-1051896.t
+++ b/tests/bugs/access-control/bug-1051896.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
case $OSTYPE in
NetBSD)
diff --git a/tests/bugs/bug-887098-gmount-crash.t b/tests/bugs/access-control/bug-887098-gmount-crash.t
index 5a6a9fd..ba9937b 100644
--- a/tests/bugs/bug-887098-gmount-crash.t
+++ b/tests/bugs/access-control/bug-887098-gmount-crash.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-958691.t b/tests/bugs/access-control/bug-958691.t
index 18a2fb5..9db858d 100644
--- a/tests/bugs/bug-958691.t
+++ b/tests/bugs/access-control/bug-958691.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1004218.t b/tests/bugs/cli/bug-1004218.t
index 17eb3c6..ab8307d 100644
--- a/tests/bugs/bug-1004218.t
+++ b/tests/bugs/cli/bug-1004218.t
@@ -3,7 +3,7 @@
# Test if only a single xml document is generated by 'status all'
# when a volume is not started
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1022905.t b/tests/bugs/cli/bug-1022905.t
index aef3395..ce163f5 100644
--- a/tests/bugs/bug-1022905.t
+++ b/tests/bugs/cli/bug-1022905.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1030580.t b/tests/bugs/cli/bug-1030580.t
index 1b03ae2..a907950 100644
--- a/tests/bugs/bug-1030580.t
+++ b/tests/bugs/cli/bug-1030580.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1047378.t b/tests/bugs/cli/bug-1047378.t
index b441ee9..33ee6be 100644
--- a/tests/bugs/bug-1047378.t
+++ b/tests/bugs/cli/bug-1047378.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1047416.t b/tests/bugs/cli/bug-1047416.t
index 67a0fea..6e1b0a4 100644
--- a/tests/bugs/bug-1047416.t
+++ b/tests/bugs/cli/bug-1047416.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
@@ -37,7 +37,7 @@ output=$($CLI volume profile $V0 info peek)
EXPECT 2 cumulative_stat_count "$output"
EXPECT 2 incremental_stat_count "$output" ' 1 '
-# Verify 'volume profile info incremental peek' prints incremental stats only
+# Verify 'volume profile info incremental peek' prints incremental stats only
# without clearing incremental stats
write_to_file &
wait
diff --git a/tests/bugs/bug-1077682.t b/tests/bugs/cli/bug-1077682.t
index b47744e..6b6d71e 100644
--- a/tests/bugs/bug-1077682.t
+++ b/tests/bugs/cli/bug-1077682.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function get-task-status()
{
diff --git a/tests/bugs/bug-1087487.t b/tests/bugs/cli/bug-1087487.t
index d0cb0a3..0659ffa 100755
--- a/tests/bugs/bug-1087487.t
+++ b/tests/bugs/cli/bug-1087487.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1113476.t b/tests/bugs/cli/bug-1113476.t
index 7cb9d90..119846d 100644
--- a/tests/bugs/bug-1113476.t
+++ b/tests/bugs/cli/bug-1113476.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
function volinfo_validate ()
{
diff --git a/tests/bugs/bug-764638.t b/tests/bugs/cli/bug-764638.t
index 8165465..ffc6134 100644
--- a/tests/bugs/bug-764638.t
+++ b/tests/bugs/cli/bug-764638.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-770655.t b/tests/bugs/cli/bug-770655.t
index 945e323..4e0b20d 100755
--- a/tests/bugs/bug-770655.t
+++ b/tests/bugs/cli/bug-770655.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-822830.t b/tests/bugs/cli/bug-822830.t
index b7a5704..b66aa4f 100755
--- a/tests/bugs/bug-822830.t
+++ b/tests/bugs/cli/bug-822830.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-867252.t b/tests/bugs/cli/bug-867252.t
index 17edcd9..ccc33d8 100644
--- a/tests/bugs/bug-867252.t
+++ b/tests/bugs/cli/bug-867252.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-921215.t b/tests/bugs/cli/bug-921215.t
index 344b568..0253256 100755
--- a/tests/bugs/bug-921215.t
+++ b/tests/bugs/cli/bug-921215.t
@@ -2,7 +2,7 @@
# This is test case for bug no 921215 "Can not create volume with a . in the name"
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-949298.t b/tests/bugs/cli/bug-949298.t
index 1394127..e0692f0 100644
--- a/tests/bugs/bug-949298.t
+++ b/tests/bugs/cli/bug-949298.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-961307.t b/tests/bugs/cli/bug-961307.t
index 9775c3a..68fc7bb 100644
--- a/tests/bugs/bug-961307.t
+++ b/tests/bugs/cli/bug-961307.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-969193.t b/tests/bugs/cli/bug-969193.t
index e78a298..dd6d7cd 100755
--- a/tests/bugs/bug-969193.t
+++ b/tests/bugs/cli/bug-969193.t
@@ -2,7 +2,7 @@
# Test that "system getspec" works without op_version problems.
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-977246.t b/tests/bugs/cli/bug-977246.t
index e07ee19..bb8d632 100644
--- a/tests/bugs/bug-977246.t
+++ b/tests/bugs/cli/bug-977246.t
@@ -3,7 +3,7 @@
# This test checks if address validation, correctly catches hostnames
# with consective dots, such as 'example..org', as invalid
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-982174.t b/tests/bugs/cli/bug-982174.t
index 460af75..067e5b9 100644
--- a/tests/bugs/bug-982174.t
+++ b/tests/bugs/cli/bug-982174.t
@@ -1,7 +1,7 @@
#!/bin/bash
# Test to check
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#Check if incorrect log-level keywords does not crash the CLI
cleanup;
diff --git a/tests/bugs/bug-983317.t b/tests/bugs/cli/bug-983317.t
index 7355cba..11590ac 100644
--- a/tests/bugs/bug-983317.t
+++ b/tests/bugs/cli/bug-983317.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/949327.t b/tests/bugs/core/949327.t
index b8ac995..6b8033a 100644
--- a/tests/bugs/949327.t
+++ b/tests/bugs/core/949327.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1110917.t b/tests/bugs/core/bug-1110917.t
index 4b67293..c4b04fb 100644
--- a/tests/bugs/bug-1110917.t
+++ b/tests/bugs/core/bug-1110917.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1111557.t b/tests/bugs/core/bug-1111557.t
index 656b6e6..4ed4576 100644
--- a/tests/bugs/bug-1111557.t
+++ b/tests/bugs/core/bug-1111557.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1117951.t b/tests/bugs/core/bug-1117951.t
index 47a0781..b484fee 100644
--- a/tests/bugs/bug-1117951.t
+++ b/tests/bugs/core/bug-1117951.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1119582.t b/tests/bugs/core/bug-1119582.t
index cc388bd..c30057c 100644
--- a/tests/bugs/bug-1119582.t
+++ b/tests/bugs/core/bug-1119582.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1135514-allow-setxattr-with-null-value.t b/tests/bugs/core/bug-1135514-allow-setxattr-with-null-value.t
index cea0566..d26aa56 100644
--- a/tests/bugs/bug-1135514-allow-setxattr-with-null-value.t
+++ b/tests/bugs/core/bug-1135514-allow-setxattr-with-null-value.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#Test
cleanup;
diff --git a/tests/bugs/bug-1168803-snapd-option-validation-fix.t b/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
index e29cbe4..1e52d44 100755
--- a/tests/bugs/bug-1168803-snapd-option-validation-fix.t
+++ b/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
@@ -3,8 +3,8 @@
## Test case for BZ-1168803 - snapd option validation should not fail if the
#snapd is not running
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1168875.t b/tests/bugs/core/bug-1168875.t
index 0a7476d..f6fa9f7 100644
--- a/tests/bugs/bug-1168875.t
+++ b/tests/bugs/core/bug-1168875.t
@@ -1,10 +1,10 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-834465.c b/tests/bugs/core/bug-834465.c
index 61d3dea..61d3dea 100644
--- a/tests/bugs/bug-834465.c
+++ b/tests/bugs/core/bug-834465.c
diff --git a/tests/bugs/bug-834465.t b/tests/bugs/core/bug-834465.t
index 7002791..5bc52a0 100755
--- a/tests/bugs/bug-834465.t
+++ b/tests/bugs/core/bug-834465.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-845213.t b/tests/bugs/core/bug-845213.t
index e79b371..136e412 100644
--- a/tests/bugs/bug-845213.t
+++ b/tests/bugs/core/bug-845213.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-903336.t b/tests/bugs/core/bug-903336.t
index c1f9131..b52c1a4 100644
--- a/tests/bugs/bug-903336.t
+++ b/tests/bugs/core/bug-903336.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-908146.t b/tests/bugs/core/bug-908146.t
index 87b456e..8b519ff 100755
--- a/tests/bugs/bug-908146.t
+++ b/tests/bugs/core/bug-908146.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function get_fd_count {
local vol=$1
diff --git a/tests/bugs/bug-913544.t b/tests/bugs/core/bug-913544.t
index db28ca8..af42172 100644
--- a/tests/bugs/bug-913544.t
+++ b/tests/bugs/core/bug-913544.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-924075.t b/tests/bugs/core/bug-924075.t
index f4e03e3..61ce0f1 100755
--- a/tests/bugs/bug-924075.t
+++ b/tests/bugs/core/bug-924075.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-927616.t b/tests/bugs/core/bug-927616.t
index 4525ddb..811e88f 100755
--- a/tests/bugs/bug-927616.t
+++ b/tests/bugs/core/bug-927616.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-949242.t b/tests/bugs/core/bug-949242.t
index 31e5bf6..5e916cb 100644
--- a/tests/bugs/bug-949242.t
+++ b/tests/bugs/core/bug-949242.t
@@ -7,9 +7,9 @@
# size option does not modify the file size.
###
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fallocate.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fallocate.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-986429.t b/tests/bugs/core/bug-986429.t
index 6e43f72..e512301 100644
--- a/tests/bugs/bug-986429.t
+++ b/tests/bugs/core/bug-986429.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
## This tests failover achieved by providing multiple
## servers from the trusted pool for fetching volume
diff --git a/tests/bugs/bug-1042725.t b/tests/bugs/distribute/bug-1042725.t
index a954019..5497eb8 100644
--- a/tests/bugs/bug-1042725.t
+++ b/tests/bugs/distribute/bug-1042725.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1063230.t b/tests/bugs/distribute/bug-1063230.t
index a04be88..944c6c2 100755
--- a/tests/bugs/bug-1063230.t
+++ b/tests/bugs/distribute/bug-1063230.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1066798.t b/tests/bugs/distribute/bug-1066798.t
index 445ec75..e53e1ae 100755
--- a/tests/bugs/bug-1066798.t
+++ b/tests/bugs/distribute/bug-1066798.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1086228.t b/tests/bugs/distribute/bug-1086228.t
index 4c77a85..e14ea57 100755
--- a/tests/bugs/bug-1086228.t
+++ b/tests/bugs/distribute/bug-1086228.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
cleanup;
## Start and create a volume
diff --git a/tests/bugs/bug-1088231.t b/tests/bugs/distribute/bug-1088231.t
index da6adae..89823ee 100755
--- a/tests/bugs/bug-1088231.t
+++ b/tests/bugs/distribute/bug-1088231.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
cleanup;
diff --git a/tests/bugs/bug-1099890.t b/tests/bugs/distribute/bug-1099890.t
index c4be2cf..4a44501 100644
--- a/tests/bugs/bug-1099890.t
+++ b/tests/bugs/distribute/bug-1099890.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../dht.rc
## TO-DO: Fix the following once the dht du refresh interval issue is fixed:
## 1. Do away with sleep(1).
diff --git a/tests/bugs/bug-1117851.t b/tests/bugs/distribute/bug-1117851.t
index 02e52f5..c93a05e 100755
--- a/tests/bugs/bug-1117851.t
+++ b/tests/bugs/distribute/bug-1117851.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
create_files () {
for i in {1..1000}; do
diff --git a/tests/bugs/bug-1122443.t b/tests/bugs/distribute/bug-1122443.t
index db9d3a0..3e2455e 100644
--- a/tests/bugs/bug-1122443.t
+++ b/tests/bugs/distribute/bug-1122443.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
make_files() {
mkdir $1 && \
diff --git a/tests/bugs/bug-1125824.t b/tests/bugs/distribute/bug-1125824.t
index fb4fb00..a944b36 100755
--- a/tests/bugs/bug-1125824.t
+++ b/tests/bugs/distribute/bug-1125824.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
create_files () {
for i in {1..10}; do
diff --git a/tests/bugs/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t
index 9f33391..dfaea90 100755
--- a/tests/bugs/bug-1161156.t
+++ b/tests/bugs/distribute/bug-1161156.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
function usage()
{
diff --git a/tests/bugs/bug-853258.t b/tests/bugs/distribute/bug-853258.t
index 21e48bd..b2d7f2b 100755
--- a/tests/bugs/bug-853258.t
+++ b/tests/bugs/distribute/bug-853258.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-860663.c b/tests/bugs/distribute/bug-860663.c
index 6f6d069..bee4e7d 100644
--- a/tests/bugs/bug-860663.c
+++ b/tests/bugs/distribute/bug-860663.c
@@ -31,7 +31,8 @@ main(argc, argv)
for (i = 0; i < count; i++) {
(void)sprintf(path, "%s%06d", basepath, i);
- if ((fd = open(path, O_CREAT|O_RDWR, 0644)) == -1)
+ fd = open(path, O_CREAT|O_RDWR, 0644);
+ if (fd == -1)
err(1, "create %s failed", path);
if (close(fd) != 0)
diff --git a/tests/bugs/bug-860663.t b/tests/bugs/distribute/bug-860663.t
index 555a634..f250a73 100644
--- a/tests/bugs/bug-860663.t
+++ b/tests/bugs/distribute/bug-860663.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-862967.t b/tests/bugs/distribute/bug-862967.t
index 30d7118..07b0537 100644
--- a/tests/bugs/bug-862967.t
+++ b/tests/bugs/distribute/bug-862967.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-882278.t b/tests/bugs/distribute/bug-882278.t
index 1a31cd9..8cb5147 100755
--- a/tests/bugs/bug-882278.t
+++ b/tests/bugs/distribute/bug-882278.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup
# Is there a good reason to require --fqdn elsewhere? It's worse than useless
diff --git a/tests/bugs/bug-884455.t b/tests/bugs/distribute/bug-884455.t
index e63af43..59413cd 100755
--- a/tests/bugs/bug-884455.t
+++ b/tests/bugs/distribute/bug-884455.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
cleanup;
diff --git a/tests/bugs/bug-884597.t b/tests/bugs/distribute/bug-884597.t
index 0daa025..d6a2c65 100755
--- a/tests/bugs/bug-884597.t
+++ b/tests/bugs/distribute/bug-884597.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
cleanup;
BRICK_COUNT=3
diff --git a/tests/bugs/bug-907072.t b/tests/bugs/distribute/bug-907072.t
index a04f4c2..1e8bd28 100755
--- a/tests/bugs/bug-907072.t
+++ b/tests/bugs/distribute/bug-907072.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-912564.t b/tests/bugs/distribute/bug-912564.t
index 4fc548c..d437728 100755
--- a/tests/bugs/bug-912564.t
+++ b/tests/bugs/distribute/bug-912564.t
@@ -5,8 +5,8 @@
# 1/4 chance of each file being assigned to the right place, so with 16 files
# we have a 1/2^32 chance of getting the correct result by accident.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function count_linkfiles {
local i
diff --git a/tests/bugs/bug-915554.t b/tests/bugs/distribute/bug-915554.t
index b0c653e..5caf483 100755
--- a/tests/bugs/bug-915554.t
+++ b/tests/bugs/distribute/bug-915554.t
@@ -10,9 +10,9 @@
#
###
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-921408.t b/tests/bugs/distribute/bug-921408.t
index 6490a93..b1887f8 100755
--- a/tests/bugs/bug-921408.t
+++ b/tests/bugs/distribute/bug-921408.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../dht.rc
+. $(dirname $0)/../../volume.rc
cleanup;
wait_check_status ()
diff --git a/tests/bugs/bug-924265.t b/tests/bugs/distribute/bug-924265.t
index 51eda7f..67c21de 100755
--- a/tests/bugs/bug-924265.t
+++ b/tests/bugs/distribute/bug-924265.t
@@ -3,8 +3,8 @@
# Test that setting cluster.dht-xattr-name works, and that DHT consistently
# uses the specified name instead of the default.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
# We only care about the exit code, so keep it quiet.
function silent_getfattr {
diff --git a/tests/bugs/bug-961615.t b/tests/bugs/distribute/bug-961615.t
index d10eeea..00938e8 100644
--- a/tests/bugs/bug-961615.t
+++ b/tests/bugs/distribute/bug-961615.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This test tests that an extra fd_unref does not happen in rebalance
#migration completion check code path in dht
diff --git a/tests/bugs/bug-973073.t b/tests/bugs/distribute/bug-973073.t
index 3ea5413..aac4afd 100755
--- a/tests/bugs/bug-973073.t
+++ b/tests/bugs/distribute/bug-973073.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../dht.rc
## Steps followed are one descibed in bugzilla
diff --git a/tests/bugs/overlap.py b/tests/bugs/distribute/overlap.py
index 15f2da4..15f2da4 100755
--- a/tests/bugs/overlap.py
+++ b/tests/bugs/distribute/overlap.py
diff --git a/tests/bugs/bug-767095.t b/tests/bugs/error-gen/bug-767095.t
index 82212c7..34c3b18 100755
--- a/tests/bugs/bug-767095.t
+++ b/tests/bugs/error-gen/bug-767095.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1030208.t b/tests/bugs/fuse/bug-1030208.t
index 1ab4107..526283c 100644
--- a/tests/bugs/bug-1030208.t
+++ b/tests/bugs/fuse/bug-1030208.t
@@ -2,8 +2,8 @@
#Test case: Hardlink test
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1126048.c b/tests/bugs/fuse/bug-1126048.c
index 2282bb2..5b9afaf 100644
--- a/tests/bugs/bug-1126048.c
+++ b/tests/bugs/fuse/bug-1126048.c
@@ -29,7 +29,7 @@ main (int argc, char **argv)
if (write (fd, "abc", 3) < 0)
printf ("Not able to print %s\n", strerror (errno));
system(cmd);
- sleep(1); //No way to confirm graph switch so sleep 1
+ sleep(1); /* No way to confirm graph switch so sleep 1 */
ret = fsync(fd);
if (ret < 0)
printf ("Not able to fsync %s\n", strerror (errno));
diff --git a/tests/bugs/bug-1126048.t b/tests/bugs/fuse/bug-1126048.t
index 53c8ced..5e2ed29 100755
--- a/tests/bugs/bug-1126048.t
+++ b/tests/bugs/fuse/bug-1126048.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-858215.t b/tests/bugs/fuse/bug-858215.t
index 8034276..b33b8d4 100755
--- a/tests/bugs/bug-858215.t
+++ b/tests/bugs/fuse/bug-858215.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-858488-min-free-disk.t b/tests/bugs/fuse/bug-858488-min-free-disk.t
index 1933f70..635dc04 100644
--- a/tests/bugs/bug-858488-min-free-disk.t
+++ b/tests/bugs/fuse/bug-858488-min-free-disk.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-924726.t b/tests/bugs/fuse/bug-924726.t
index 82c11af..58bf2c8 100755
--- a/tests/bugs/bug-924726.t
+++ b/tests/bugs/fuse/bug-924726.t
@@ -2,8 +2,8 @@
TESTS_EXPECTED_IN_LOOP=10
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-963678.t b/tests/bugs/fuse/bug-963678.t
index 9431010..006181f 100644
--- a/tests/bugs/bug-963678.t
+++ b/tests/bugs/fuse/bug-963678.t
@@ -12,9 +12,9 @@
# test (opens will invalidate the fuse cache).
###
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fallocate.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fallocate.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-983477.t b/tests/bugs/fuse/bug-983477.t
index 47d2f30..41ddd9e 100755
--- a/tests/bugs/bug-983477.t
+++ b/tests/bugs/fuse/bug-983477.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This script checks if use-readdirp option works as accepted in mount options
diff --git a/tests/bugs/bug-985074.t b/tests/bugs/fuse/bug-985074.t
index d8f852a..d10fd9f 100644
--- a/tests/bugs/bug-985074.t
+++ b/tests/bugs/fuse/bug-985074.t
@@ -21,8 +21,8 @@
#
###
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1111490.t b/tests/bugs/geo-replication/bug-1111490.t
index d313805..e598ecc 100644
--- a/tests/bugs/bug-1111490.t
+++ b/tests/bugs/geo-replication/bug-1111490.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
@@ -16,7 +16,7 @@ TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount
# create file with specific gfid
uuid=`uuidgen`
-EXPECT "File creation OK" $PYTHON $(dirname $0)/../utils/gfid-access.py \
+EXPECT "File creation OK" $PYTHON $(dirname $0)/../../utils/gfid-access.py \
$M0 ROOT file0 $uuid file 10 10 0644
# check gfid
@@ -28,7 +28,7 @@ TEST umount $M0
TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount
# touch the file again (gfid-access.py handles errno)
-EXPECT "File creation OK" $PYTHON $(dirname $0)/../utils/gfid-access.py \
+EXPECT "File creation OK" $PYTHON $(dirname $0)/../../utils/gfid-access.py \
$M0 ROOT file0 $uuid file 10 10 0644
cleanup;
diff --git a/tests/bugs/bug-877293.t b/tests/bugs/geo-replication/bug-877293.t
index d9bd8a3..542774a 100755
--- a/tests/bugs/bug-877293.t
+++ b/tests/bugs/geo-replication/bug-877293.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
TEST glusterd
TEST pidof glusterd
diff --git a/tests/bugs/859927/repl.t b/tests/bugs/glusterd/859927/repl.t
index 0094f43..db96d70 100755
--- a/tests/bugs/859927/repl.t
+++ b/tests/bugs/glusterd/859927/repl.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
cleanup;
TEST glusterd;
diff --git a/tests/bugs/bug-000000.t b/tests/bugs/glusterd/bug-000000.t
index 7f3d15c..55f7b11 100755
--- a/tests/bugs/bug-000000.t
+++ b/tests/bugs/glusterd/bug-000000.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1002556.t b/tests/bugs/glusterd/bug-1002556.t
index a57f455..ac71d06 100755
--- a/tests/bugs/bug-1002556.t
+++ b/tests/bugs/glusterd/bug-1002556.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1004744.t b/tests/bugs/glusterd/bug-1004744.t
index 6b1bb9d..b48ed97 100644
--- a/tests/bugs/bug-1004744.t
+++ b/tests/bugs/glusterd/bug-1004744.t
@@ -3,8 +3,8 @@
#Test case: After a rebalance fix-layout, check if the rebalance status command
#displays the appropriate message at the CLI.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1022055.t b/tests/bugs/glusterd/bug-1022055.t
index 07d0b1f..9f39c80 100755
--- a/tests/bugs/bug-1022055.t
+++ b/tests/bugs/glusterd/bug-1022055.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-1027171.t b/tests/bugs/glusterd/bug-1027171.t
index c1f4bd8..1b457d8 100644
--- a/tests/bugs/bug-1027171.t
+++ b/tests/bugs/glusterd/bug-1027171.t
@@ -2,8 +2,8 @@
#Test case: Do not allow commit if the bricks are not decommissioned
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1040408.t b/tests/bugs/glusterd/bug-1040408.t
index 2982d6a..c378000 100644
--- a/tests/bugs/bug-1040408.t
+++ b/tests/bugs/glusterd/bug-1040408.t
@@ -3,8 +3,8 @@
#Test case: Create a distributed replicate volume, and reduce
#replica count
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1046308.t b/tests/bugs/glusterd/bug-1046308.t
index cfec3a3..9c827c4 100644
--- a/tests/bugs/bug-1046308.t
+++ b/tests/bugs/glusterd/bug-1046308.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1047955.t b/tests/bugs/glusterd/bug-1047955.t
index 169333e..a409d9f 100644
--- a/tests/bugs/bug-1047955.t
+++ b/tests/bugs/glusterd/bug-1047955.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-1070734.t b/tests/bugs/glusterd/bug-1070734.t
index 3928983..b5a53c2 100755
--- a/tests/bugs/bug-1070734.t
+++ b/tests/bugs/glusterd/bug-1070734.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1075087.t b/tests/bugs/glusterd/bug-1075087.t
index 89aab02..35155a0 100644
--- a/tests/bugs/bug-1075087.t
+++ b/tests/bugs/glusterd/bug-1075087.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1085330.t b/tests/bugs/glusterd/bug-1085330.t
index dafba21..ffcfe92 100755
--- a/tests/bugs/bug-1085330.t
+++ b/tests/bugs/glusterd/bug-1085330.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
STR="1234567890"
volname="Vol"
diff --git a/tests/bugs/bug-1087203.t b/tests/bugs/glusterd/bug-1087203.t
index e41d601..035be09 100644
--- a/tests/bugs/bug-1087203.t
+++ b/tests/bugs/glusterd/bug-1087203.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../cluster.rc
function get_volume_info ()
{
diff --git a/tests/bugs/bug-1089668.t b/tests/bugs/glusterd/bug-1089668.t
index 3baa3f2..f2b99bf 100755
--- a/tests/bugs/bug-1089668.t
+++ b/tests/bugs/glusterd/bug-1089668.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../dht.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../dht.rc
cleanup
diff --git a/tests/bugs/bug-1090042.t b/tests/bugs/glusterd/bug-1090042.t
index 364d8b2..b4df8e6 100755
--- a/tests/bugs/bug-1090042.t
+++ b/tests/bugs/glusterd/bug-1090042.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
diff --git a/tests/bugs/bug-1091935-brick-order-check-from-cli-to-glusterd.t b/tests/bugs/glusterd/bug-1091935-brick-order-check-from-cli-to-glusterd.t
index d5edabd..01cc5b5 100755
--- a/tests/bugs/bug-1091935-brick-order-check-from-cli-to-glusterd.t
+++ b/tests/bugs/glusterd/bug-1091935-brick-order-check-from-cli-to-glusterd.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1092841.t b/tests/bugs/glusterd/bug-1092841.t
index 6740c31..d3dcf07 100644
--- a/tests/bugs/bug-1092841.t
+++ b/tests/bugs/glusterd/bug-1092841.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1095097.t b/tests/bugs/glusterd/bug-1095097.t
index 9f9db7a..0fe29f0 100755
--- a/tests/bugs/bug-1095097.t
+++ b/tests/bugs/glusterd/bug-1095097.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
TEST glusterd;
diff --git a/tests/bugs/bug-1102656.t b/tests/bugs/glusterd/bug-1102656.t
index 18f2b93..e80f493 100644
--- a/tests/bugs/bug-1102656.t
+++ b/tests/bugs/glusterd/bug-1102656.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1104642.t b/tests/bugs/glusterd/bug-1104642.t
index da56eb5..a45a617 100644
--- a/tests/bugs/bug-1104642.t
+++ b/tests/bugs/glusterd/bug-1104642.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../cluster.rc
function get_value()
diff --git a/tests/bugs/bug-1109741-auth-mgmt-handshake.t b/tests/bugs/glusterd/bug-1109741-auth-mgmt-handshake.t
index 42a8eb3..561b907 100644
--- a/tests/bugs/bug-1109741-auth-mgmt-handshake.t
+++ b/tests/bugs/glusterd/bug-1109741-auth-mgmt-handshake.t
@@ -1,7 +1,7 @@
#! /bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
# The test will attempt to verify that management handshake requests to
# GlusterD are authenticated before being allowed to change a GlusterD's
diff --git a/tests/bugs/bug-1109770.t b/tests/bugs/glusterd/bug-1109770.t
index 03b929d..eca4969 100644
--- a/tests/bugs/bug-1109770.t
+++ b/tests/bugs/glusterd/bug-1109770.t
@@ -1,10 +1,10 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1109889.t b/tests/bugs/glusterd/bug-1109889.t
index 05f6588..eac5ac1 100644
--- a/tests/bugs/bug-1109889.t
+++ b/tests/bugs/glusterd/bug-1109889.t
@@ -1,10 +1,10 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1111041.t b/tests/bugs/glusterd/bug-1111041.t
index ad8a2a7..9e72c50 100644
--- a/tests/bugs/bug-1111041.t
+++ b/tests/bugs/glusterd/bug-1111041.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1112559.t b/tests/bugs/glusterd/bug-1112559.t
index 58cc40f..f318db6 100755
--- a/tests/bugs/bug-1112559.t
+++ b/tests/bugs/glusterd/bug-1112559.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
@@ -48,7 +48,7 @@ TEST snapshot_exists 1 ${V0}_snap1
EXPECT_WITHIN $SNAP_COMMAND_TIMEOUT 1 check_snaps_status
#Disabling the checking of snap brick status , Will continue investigation
-#on the failure of the snapbrick port bind issue.
+#on the failure of the snapbrick port bind issue.
#EXPECT_WITHIN $SNAP_COMMAND_TIMEOUT $NUMBER_OF_BRICKS check_snaps_bricks_health
#check if the peer is added successfully
diff --git a/tests/bugs/bug-1112613.t b/tests/bugs/glusterd/bug-1112613.t
index 17302ea..e566de0 100644
--- a/tests/bugs/bug-1112613.t
+++ b/tests/bugs/glusterd/bug-1112613.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../cluster.rc
cleanup;
diff --git a/tests/bugs/bug-1113975.t b/tests/bugs/glusterd/bug-1113975.t
index 4b786d1..c1b9b1e 100644
--- a/tests/bugs/bug-1113975.t
+++ b/tests/bugs/glusterd/bug-1113975.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
diff --git a/tests/bugs/bug-1120647.t b/tests/bugs/glusterd/bug-1120647.t
index 4670faa..0223f46 100644
--- a/tests/bugs/bug-1120647.t
+++ b/tests/bugs/glusterd/bug-1120647.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t b/tests/bugs/glusterd/bug-1140162-file-snapshot-and-features-encryption-option-validation.t
index a7aa883..f91093d 100644
--- a/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t
+++ b/tests/bugs/glusterd/bug-1140162-file-snapshot-and-features-encryption-option-validation.t
@@ -3,8 +3,8 @@
## Test case for BZ-1140160 Volume option set <vol> <file-snapshot> and
## <features.encryption> <value> command input should validate correctly.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1173414-mgmt-v3-remote-lock-failure.t b/tests/bugs/glusterd/bug-1173414-mgmt-v3-remote-lock-failure.t
index adc3fe3..5a6cf81 100755
--- a/tests/bugs/bug-1173414-mgmt-v3-remote-lock-failure.t
+++ b/tests/bugs/glusterd/bug-1173414-mgmt-v3-remote-lock-failure.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-765230.t b/tests/bugs/glusterd/bug-765230.t
index 2012be5..e0b9608 100755
--- a/tests/bugs/bug-765230.t
+++ b/tests/bugs/glusterd/bug-765230.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-782095.t b/tests/bugs/glusterd/bug-782095.t
index a0cea14..dd8a8dc 100755
--- a/tests/bugs/bug-782095.t
+++ b/tests/bugs/glusterd/bug-782095.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-824753-file-locker.c b/tests/bugs/glusterd/bug-824753-file-locker.c
index 903e23e..ea8a763 100644
--- a/tests/bugs/bug-824753-file-locker.c
+++ b/tests/bugs/glusterd/bug-824753-file-locker.c
@@ -36,7 +36,7 @@ int main (int argc, char *argv[])
close(fd);
if (ret)
- return -1;
+ return -1;
else
- return 0;
+ return 0;
}
diff --git a/tests/bugs/bug-824753.t b/tests/bugs/glusterd/bug-824753.t
index 772219a..2ce4a07 100755
--- a/tests/bugs/bug-824753.t
+++ b/tests/bugs/glusterd/bug-824753.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-839595.t b/tests/bugs/glusterd/bug-839595.t
index 979827f..b2fe978 100644
--- a/tests/bugs/bug-839595.t
+++ b/tests/bugs/glusterd/bug-839595.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-857330/common.rc b/tests/bugs/glusterd/bug-857330/common.rc
index e5a7cd7..8342dcc 100644
--- a/tests/bugs/bug-857330/common.rc
+++ b/tests/bugs/glusterd/bug-857330/common.rc
@@ -1,4 +1,4 @@
-. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../../include.rc
UUID_REGEX='[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}'
diff --git a/tests/bugs/bug-857330/normal.t b/tests/bugs/glusterd/bug-857330/normal.t
index 9e348c5..02018f2 100755
--- a/tests/bugs/bug-857330/normal.t
+++ b/tests/bugs/glusterd/bug-857330/normal.t
@@ -1,7 +1,7 @@
#!/bin/bash
. $(dirname $0)/common.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../volume.rc
cleanup;
TEST glusterd
@@ -14,7 +14,7 @@ TEST $CLI volume start $V0;
TEST glusterfs -s $H0 --volfile-id=$V0 $M0;
-TEST $PYTHON $(dirname $0)/../../utils/create-files.py \
+TEST $PYTHON $(dirname $0)/../../../utils/create-files.py \
--multi -b 10 -d 10 -n 10 $M0;
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
diff --git a/tests/bugs/bug-857330/xml.t b/tests/bugs/glusterd/bug-857330/xml.t
index 475c35b..3aec3b8 100755
--- a/tests/bugs/bug-857330/xml.t
+++ b/tests/bugs/glusterd/bug-857330/xml.t
@@ -1,7 +1,7 @@
#!/bin/bash
. $(dirname $0)/common.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../volume.rc
cleanup;
@@ -15,7 +15,7 @@ TEST $CLI volume start $V0;
TEST glusterfs -s $H0 --volfile-id=$V0 $M0;
-TEST $PYTHON $(dirname $0)/../../utils/create-files.py \
+TEST $PYTHON $(dirname $0)/../../../utils/create-files.py \
--multi -b 10 -d 10 -n 10 $M0;
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
diff --git a/tests/bugs/bug-859927.t b/tests/bugs/glusterd/bug-859927.t
index ed74d3e..c30d2b8 100755
--- a/tests/bugs/bug-859927.t
+++ b/tests/bugs/glusterd/bug-859927.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
glusterd;
diff --git a/tests/bugs/bug-862834.t b/tests/bugs/glusterd/bug-862834.t
index 33aaea1..ac2f956 100755
--- a/tests/bugs/bug-862834.t
+++ b/tests/bugs/glusterd/bug-862834.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-878004.t b/tests/bugs/glusterd/bug-878004.t
index 407fd6e..8abada3 100644
--- a/tests/bugs/bug-878004.t
+++ b/tests/bugs/glusterd/bug-878004.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-888752.t b/tests/bugs/glusterd/bug-888752.t
index b82c0dd..ed0602e 100644
--- a/tests/bugs/bug-888752.t
+++ b/tests/bugs/glusterd/bug-888752.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
# Check if xml output is generated correctly for volume status for a single brick
# present on another peer and no async tasks are running.
diff --git a/tests/bugs/bug-889630.t b/tests/bugs/glusterd/bug-889630.t
index d2fcc10..4fefd94 100755
--- a/tests/bugs/bug-889630.t
+++ b/tests/bugs/glusterd/bug-889630.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-905307.t b/tests/bugs/glusterd/bug-905307.t
index d81d81c..dd1c1bc 100644
--- a/tests/bugs/bug-905307.t
+++ b/tests/bugs/glusterd/bug-905307.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-913487.t b/tests/bugs/glusterd/bug-913487.t
index 2095903..9c616ea 100644
--- a/tests/bugs/bug-913487.t
+++ b/tests/bugs/glusterd/bug-913487.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-913555.t b/tests/bugs/glusterd/bug-913555.t
index 2393a16..4f9e004 100755
--- a/tests/bugs/bug-913555.t
+++ b/tests/bugs/glusterd/bug-913555.t
@@ -2,9 +2,9 @@
# Test that a volume becomes unwritable when the cluster loses quorum.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../cluster.rc
function check_fs {
diff --git a/tests/bugs/bug-916549.t b/tests/bugs/glusterd/bug-916549.t
index 344c6ab..bedbdd6 100755
--- a/tests/bugs/bug-916549.t
+++ b/tests/bugs/glusterd/bug-916549.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-948686.t b/tests/bugs/glusterd/bug-948686.t
index 0402870..dfe11ff 100755
--- a/tests/bugs/bug-948686.t
+++ b/tests/bugs/glusterd/bug-948686.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-948729/bug-948729-force.t b/tests/bugs/glusterd/bug-948729/bug-948729-force.t
index b4106a5..f4f71f9 100644
--- a/tests/bugs/bug-948729/bug-948729-force.t
+++ b/tests/bugs/glusterd/bug-948729/bug-948729-force.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
+. $(dirname $0)/../../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-948729/bug-948729-mode-script.t b/tests/bugs/glusterd/bug-948729/bug-948729-mode-script.t
index 6264e18..18bf9a1 100644
--- a/tests/bugs/bug-948729/bug-948729-mode-script.t
+++ b/tests/bugs/glusterd/bug-948729/bug-948729-mode-script.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
+. $(dirname $0)/../../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-948729/bug-948729.t b/tests/bugs/glusterd/bug-948729/bug-948729.t
index 46cdb3d..2b574aa 100644
--- a/tests/bugs/bug-948729/bug-948729.t
+++ b/tests/bugs/glusterd/bug-948729/bug-948729.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
+. $(dirname $0)/../../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-949930.t b/tests/bugs/glusterd/bug-949930.t
index 4a738be..774802a 100644
--- a/tests/bugs/bug-949930.t
+++ b/tests/bugs/glusterd/bug-949930.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
V1=patchy2
diff --git a/tests/bugs/bug-955588.t b/tests/bugs/glusterd/bug-955588.t
index 182035c..028a34e 100755
--- a/tests/bugs/bug-955588.t
+++ b/tests/bugs/glusterd/bug-955588.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-958790.t b/tests/bugs/glusterd/bug-958790.t
index fc5f63a..39be0a1 100644
--- a/tests/bugs/bug-958790.t
+++ b/tests/bugs/glusterd/bug-958790.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-961669.t b/tests/bugs/glusterd/bug-961669.t
index 2f7e48c..b02f2f5 100644
--- a/tests/bugs/bug-961669.t
+++ b/tests/bugs/glusterd/bug-961669.t
@@ -2,8 +2,8 @@
#Test case: Fail remove-brick 'start' variant when reducing the replica count of a volume.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-963541.t b/tests/bugs/glusterd/bug-963541.t
index 950c7db..611626a 100755
--- a/tests/bugs/bug-963541.t
+++ b/tests/bugs/glusterd/bug-963541.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-964059.t b/tests/bugs/glusterd/bug-964059.t
index e81e4d7..7b4f604 100755
--- a/tests/bugs/bug-964059.t
+++ b/tests/bugs/glusterd/bug-964059.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
function check_peers {
$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
diff --git a/tests/bugs/bug-974007.t b/tests/bugs/glusterd/bug-974007.t
index 84197ec..5759adb 100644
--- a/tests/bugs/bug-974007.t
+++ b/tests/bugs/glusterd/bug-974007.t
@@ -3,8 +3,8 @@
#Test case: Create a distributed replicate volume, and remove multiple
#replica pairs in a single remove-brick command.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-852147.t b/tests/bugs/glusterfs-server/bug-852147.t
index 0e79230..8cb5fd1 100755
--- a/tests/bugs/bug-852147.t
+++ b/tests/bugs/glusterfs-server/bug-852147.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
logdir=`gluster --print-logdir`"/bricks"
diff --git a/tests/bugs/bug-861542.t b/tests/bugs/glusterfs-server/bug-861542.t
index 70fd122..ab57296 100755
--- a/tests/bugs/bug-861542.t
+++ b/tests/bugs/glusterfs-server/bug-861542.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-864222.t b/tests/bugs/glusterfs-server/bug-864222.t
index 35d90ab..cbda7d2 100755
--- a/tests/bugs/bug-864222.t
+++ b/tests/bugs/glusterfs-server/bug-864222.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-873549.t b/tests/bugs/glusterfs-server/bug-873549.t
index 5b541de..a3b2f9c 100644
--- a/tests/bugs/bug-873549.t
+++ b/tests/bugs/glusterfs-server/bug-873549.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-877992.t b/tests/bugs/glusterfs-server/bug-877992.t
index 979cbfd..c0287e7 100755
--- a/tests/bugs/bug-877992.t
+++ b/tests/bugs/glusterfs-server/bug-877992.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-887145.t b/tests/bugs/glusterfs-server/bug-887145.t
index 554e6ce..35e1c92 100755
--- a/tests/bugs/bug-887145.t
+++ b/tests/bugs/glusterfs-server/bug-887145.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-889996.t b/tests/bugs/glusterfs-server/bug-889996.t
index 6b07d89..d7d25c4 100644
--- a/tests/bugs/bug-889996.t
+++ b/tests/bugs/glusterfs-server/bug-889996.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-904300.t b/tests/bugs/glusterfs-server/bug-904300.t
index 648838b..8ce805c 100755
--- a/tests/bugs/bug-904300.t
+++ b/tests/bugs/glusterfs-server/bug-904300.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-905864.c b/tests/bugs/glusterfs-server/bug-905864.c
index ed09b6e..3cc4cc5 100644
--- a/tests/bugs/bug-905864.c
+++ b/tests/bugs/glusterfs-server/bug-905864.c
@@ -24,7 +24,7 @@ flock_range_in_steps (int fd, int is_set, short l_type,
for (i = start; i+step < end; i += step) {
flock_init (&f, l_type, i, step);
- ret = fcntl (fd, (is_set)? F_SETLKW:F_GETLK, &f);
+ ret = fcntl (fd, (is_set) ? F_SETLKW : F_GETLK, &f);
if (ret) {
perror ("fcntl");
goto out;
diff --git a/tests/bugs/bug-905864.t b/tests/bugs/glusterfs-server/bug-905864.t
index 39598d6..44923a8 100644
--- a/tests/bugs/bug-905864.t
+++ b/tests/bugs/glusterfs-server/bug-905864.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-912297.t b/tests/bugs/glusterfs-server/bug-912297.t
index f5a5bab..f1f4147 100755
--- a/tests/bugs/bug-912297.t
+++ b/tests/bugs/glusterfs-server/bug-912297.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-811493.t b/tests/bugs/glusterfs/bug-811493.t
index 9669959..98f7c12 100755
--- a/tests/bugs/bug-811493.t
+++ b/tests/bugs/glusterfs/bug-811493.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-844688.t b/tests/bugs/glusterfs/bug-844688.t
index 228a3ed..a1b0b15 100755
--- a/tests/bugs/bug-844688.t
+++ b/tests/bugs/glusterfs/bug-844688.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-848251.t b/tests/bugs/glusterfs/bug-848251.t
index 3de4172..b44ec9d 100644
--- a/tests/bugs/bug-848251.t
+++ b/tests/bugs/glusterfs/bug-848251.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-853690.t b/tests/bugs/glusterfs/bug-853690.t
index 0f09eea..d81be01 100755
--- a/tests/bugs/bug-853690.t
+++ b/tests/bugs/glusterfs/bug-853690.t
@@ -12,8 +12,8 @@
#
########
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-856455.t b/tests/bugs/glusterfs/bug-856455.t
index 0e79d9f..25a30bf 100644
--- a/tests/bugs/bug-856455.t
+++ b/tests/bugs/glusterfs/bug-856455.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-860297.t b/tests/bugs/glusterfs/bug-860297.t
index 2a3ca7a..c2d2155 100644
--- a/tests/bugs/bug-860297.t
+++ b/tests/bugs/glusterfs/bug-860297.t
@@ -1,5 +1,5 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-861015-index.t b/tests/bugs/glusterfs/bug-861015-index.t
index 614d4df..05f3e8b 100644
--- a/tests/bugs/bug-861015-index.t
+++ b/tests/bugs/glusterfs/bug-861015-index.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-861015-log.t b/tests/bugs/glusterfs/bug-861015-log.t
index c403f55..2f3e0ad 100644
--- a/tests/bugs/bug-861015-log.t
+++ b/tests/bugs/glusterfs/bug-861015-log.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-866459.t b/tests/bugs/glusterfs/bug-866459.t
index fe92f3a..f90aa3f 100644
--- a/tests/bugs/bug-866459.t
+++ b/tests/bugs/glusterfs/bug-866459.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-867253.t b/tests/bugs/glusterfs/bug-867253.t
index bd3f678..3df49a1 100644
--- a/tests/bugs/bug-867253.t
+++ b/tests/bugs/glusterfs/bug-867253.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
# Skip the entire test if /proc/sys/vm/drop_caches does not exist
if [ ! -f /proc/sys/vm/drop_caches ] ; then
diff --git a/tests/bugs/bug-869724.t b/tests/bugs/glusterfs/bug-869724.t
index eec5d34..ca5bb17 100644
--- a/tests/bugs/bug-869724.t
+++ b/tests/bugs/glusterfs/bug-869724.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-872923.t b/tests/bugs/glusterfs/bug-872923.t
index afbf6ac..de24117 100755
--- a/tests/bugs/bug-872923.t
+++ b/tests/bugs/glusterfs/bug-872923.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-873962-spb.t b/tests/bugs/glusterfs/bug-873962-spb.t
index 2821952..db84a22 100644
--- a/tests/bugs/bug-873962-spb.t
+++ b/tests/bugs/glusterfs/bug-873962-spb.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-873962.t b/tests/bugs/glusterfs/bug-873962.t
index bd3132c..492d028 100755
--- a/tests/bugs/bug-873962.t
+++ b/tests/bugs/glusterfs/bug-873962.t
@@ -1,8 +1,8 @@
#!/bin/bash
#AFR TEST-IDENTIFIER SPLIT-BRAIN
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-879490.t b/tests/bugs/glusterfs/bug-879490.t
index 5b9ae7b..7cec671 100755
--- a/tests/bugs/bug-879490.t
+++ b/tests/bugs/glusterfs/bug-879490.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-879494.t b/tests/bugs/glusterfs/bug-879494.t
index 5caca79..06a5e5d 100755
--- a/tests/bugs/bug-879494.t
+++ b/tests/bugs/glusterfs/bug-879494.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-892730.t b/tests/bugs/glusterfs/bug-892730.t
index 2a497d0..a769611 100755
--- a/tests/bugs/bug-892730.t
+++ b/tests/bugs/glusterfs/bug-892730.t
@@ -9,8 +9,8 @@
#
########
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-893338.t b/tests/bugs/glusterfs/bug-893338.t
index cc39f28..0df1b9a 100644
--- a/tests/bugs/bug-893338.t
+++ b/tests/bugs/glusterfs/bug-893338.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-893378.t b/tests/bugs/glusterfs/bug-893378.t
index 46aec53..72a23f9 100755
--- a/tests/bugs/bug-893378.t
+++ b/tests/bugs/glusterfs/bug-893378.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
BRICK_COUNT=3
diff --git a/tests/bugs/bug-895235.t b/tests/bugs/glusterfs/bug-895235.t
index d02120c..ac9caae 100644
--- a/tests/bugs/bug-895235.t
+++ b/tests/bugs/glusterfs/bug-895235.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-896431.t b/tests/bugs/glusterfs/bug-896431.t
index f968e59..7764a88 100755
--- a/tests/bugs/bug-896431.t
+++ b/tests/bugs/glusterfs/bug-896431.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-902610.t b/tests/bugs/glusterfs/bug-902610.t
index 8b1e91f..656bf50 100755
--- a/tests/bugs/bug-902610.t
+++ b/tests/bugs/glusterfs/bug-902610.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-906646.t b/tests/bugs/glusterfs/bug-906646.t
index b11bb08..45c85d9 100644
--- a/tests/bugs/bug-906646.t
+++ b/tests/bugs/glusterfs/bug-906646.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/getlk_owner.c b/tests/bugs/glusterfs/getlk_owner.c
index 619c2e3..85fd104 100644
--- a/tests/bugs/getlk_owner.c
+++ b/tests/bugs/glusterfs/getlk_owner.c
@@ -6,16 +6,16 @@
#define GETLK_OWNER_CHECK(f, cp, label) \
do { \
switch (f.l_type) { \
- case F_RDLCK: \
- case F_WRLCK: \
+ case F_RDLCK: \
+ case F_WRLCK: \
+ ret = 1; \
+ goto label; \
+ case F_UNLCK: \
+ if (!are_flocks_sane (&f, &cp)) { \
ret = 1; \
goto label; \
- case F_UNLCK: \
- if (!are_flocks_sane (&f, &cp)) { \
- ret = 1; \
- goto label; \
- } \
- break; \
+ } \
+ break; \
} \
} while (0)
diff --git a/tests/bugs/bug-858242.c b/tests/bugs/io-cache/bug-858242.c
index ecdda2a..ecdda2a 100644
--- a/tests/bugs/bug-858242.c
+++ b/tests/bugs/io-cache/bug-858242.c
diff --git a/tests/bugs/bug-858242.t b/tests/bugs/io-cache/bug-858242.t
index e93c2d2..0c8ffb6 100755
--- a/tests/bugs/bug-858242.t
+++ b/tests/bugs/io-cache/bug-858242.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1032894.t b/tests/bugs/libgfapi/bug-1032894.t
index ecb5952..88d1101 100644
--- a/tests/bugs/bug-1032894.t
+++ b/tests/bugs/libgfapi/bug-1032894.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#Check stale indices are deleted as part of self-heal-daemon crawl.
cleanup;
diff --git a/tests/bugs/bug-823081.t b/tests/bugs/logging/bug-823081.t
index e863052..0ed8f4c 100755
--- a/tests/bugs/bug-823081.t
+++ b/tests/bugs/logging/bug-823081.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
cmd_log_history="cmd_history.log"
diff --git a/tests/bugs/bug-1053579.t b/tests/bugs/nfs/bug-1053579.t
index 11357f7..81e786d 100755
--- a/tests/bugs/bug-1053579.t
+++ b/tests/bugs/nfs/bug-1053579.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup
diff --git a/tests/bugs/bug-1116503.t b/tests/bugs/nfs/bug-1116503.t
index 9bad1cd..5527f76 100644
--- a/tests/bugs/bug-1116503.t
+++ b/tests/bugs/nfs/bug-1116503.t
@@ -3,9 +3,9 @@
# Verify that mounting NFS over UDP (MOUNT service only) works.
#
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1157223-symlink-mounting.t b/tests/bugs/nfs/bug-1157223-symlink-mounting.t
index 4ebc345..469b221 100644
--- a/tests/bugs/bug-1157223-symlink-mounting.t
+++ b/tests/bugs/nfs/bug-1157223-symlink-mounting.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1161092-nfs-acls.t b/tests/bugs/nfs/bug-1161092-nfs-acls.t
index f64ae5b..ed7761d 100644
--- a/tests/bugs/bug-1161092-nfs-acls.t
+++ b/tests/bugs/nfs/bug-1161092-nfs-acls.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-847622.t b/tests/bugs/nfs/bug-847622.t
index 8ceb01c..22167e8 100755
--- a/tests/bugs/bug-847622.t
+++ b/tests/bugs/nfs/bug-847622.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
case $OSTYPE in
NetBSD)
diff --git a/tests/bugs/bug-877885.t b/tests/bugs/nfs/bug-877885.t
index 01b645e..47eb396 100755
--- a/tests/bugs/bug-877885.t
+++ b/tests/bugs/nfs/bug-877885.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-904065.t b/tests/bugs/nfs/bug-904065.t
index 0b39adb..ff6797b 100755
--- a/tests/bugs/bug-904065.t
+++ b/tests/bugs/nfs/bug-904065.t
@@ -19,9 +19,9 @@ function count_lines()
}
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup
diff --git a/tests/bugs/bug-915280.t b/tests/bugs/nfs/bug-915280.t
index 1a8b78f..72bdf2c 100755
--- a/tests/bugs/bug-915280.t
+++ b/tests/bugs/nfs/bug-915280.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-970070.t b/tests/bugs/nfs/bug-970070.t
index 08ab4a3..61be484 100755
--- a/tests/bugs/bug-970070.t
+++ b/tests/bugs/nfs/bug-970070.t
@@ -1,6 +1,6 @@
#!/bin/bash
# TEST the nfs.acl option
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup
TEST glusterd
diff --git a/tests/bugs/bug-974972.t b/tests/bugs/nfs/bug-974972.t
index 28b7539..9ed1991 100755
--- a/tests/bugs/bug-974972.t
+++ b/tests/bugs/nfs/bug-974972.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
#This script checks that nfs mount does not fail lookup on files with split-brain
cleanup;
diff --git a/tests/bugs/bug-1034716.t b/tests/bugs/posix/bug-1034716.t
index e6260fc..d36f8b5 100644
--- a/tests/bugs/bug-1034716.t
+++ b/tests/bugs/posix/bug-1034716.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/brick-uid-reset-on-volume-restart.t b/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
index 26c4d00..e67616d 100755
--- a/tests/bugs/brick-uid-reset-on-volume-restart.t
+++ b/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function get_uid() {
stat -c '%u' $1;
diff --git a/tests/bugs/bug-765380.t b/tests/bugs/posix/bug-765380.t
index cf580c4..384b802 100644
--- a/tests/bugs/bug-765380.t
+++ b/tests/bugs/posix/bug-765380.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-990028.t b/tests/bugs/posix/bug-990028.t
index fbf4175..a35ea2a 100755
--- a/tests/bugs/bug-990028.t
+++ b/tests/bugs/posix/bug-990028.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
cleanup;
@@ -77,7 +77,7 @@ function links_across_directories()
TEST [ $LINES = 2 ]
for i in $(seq 1 2); do
- HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/dir$i/file$i 2>&1 | grep "trusted.pgfid" | cut -d$'\n' -f$i | cut -d'=' -f2`
+ HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/dir$i/file$i 2>&1 | grep "trusted.pgfid" | cut -d$'\n' -f$i | cut -d'=' -f2`
TEST_IN_LOOP [ $HL = "0x00000001" ]
done
@@ -107,7 +107,7 @@ function links_across_directories()
TEST mv $M0/r_file1 $M0/r_file2
#now check the pgfid hard link count is still one or not
- HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/r_file2 2>&1 | grep "trusted.pgfid" | cut -d'=' -f2`
+ HL=`getfattr -m "trusted.pgfid.*" -de hex $B0/brick/r_file2 2>&1 | grep "trusted.pgfid" | cut -d'=' -f2`
TEST [ $HL = "0x00000001" ]
diff --git a/tests/bugs/bug-762989.t b/tests/bugs/protocol/bug-762989.t
index fb25671..1607fcf 100755
--- a/tests/bugs/bug-762989.t
+++ b/tests/bugs/protocol/bug-762989.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-808400-dist.t b/tests/bugs/protocol/bug-808400-dist.t
index d201b04..0df9725 100755
--- a/tests/bugs/bug-808400-dist.t
+++ b/tests/bugs/protocol/bug-808400-dist.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-808400-fcntl.c b/tests/bugs/protocol/bug-808400-fcntl.c
index 87a83f3..87a83f3 100644
--- a/tests/bugs/bug-808400-fcntl.c
+++ b/tests/bugs/protocol/bug-808400-fcntl.c
diff --git a/tests/bugs/bug-808400-flock.c b/tests/bugs/protocol/bug-808400-flock.c
index bd2ce8c..bd2ce8c 100644
--- a/tests/bugs/bug-808400-flock.c
+++ b/tests/bugs/protocol/bug-808400-flock.c
diff --git a/tests/bugs/bug-808400-repl.t b/tests/bugs/protocol/bug-808400-repl.t
index d1e1c49..611e5ec 100755
--- a/tests/bugs/bug-808400-repl.t
+++ b/tests/bugs/protocol/bug-808400-repl.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-808400-stripe.t b/tests/bugs/protocol/bug-808400-stripe.t
index fce6b8a..6d6c727 100755
--- a/tests/bugs/bug-808400-stripe.t
+++ b/tests/bugs/protocol/bug-808400-stripe.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-808400.t b/tests/bugs/protocol/bug-808400.t
index 55881b9..4ae1722 100755
--- a/tests/bugs/bug-808400.t
+++ b/tests/bugs/protocol/bug-808400.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-846240.t b/tests/bugs/quick-read/bug-846240.t
index 14ed52c..c47040d 100644
--- a/tests/bugs/bug-846240.t
+++ b/tests/bugs/quick-read/bug-846240.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
cleanup;
diff --git a/tests/bugs/afr-quota-xattr-mdata-heal.t b/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
index 5291c46..b7a15a3 100644
--- a/tests/bugs/afr-quota-xattr-mdata-heal.t
+++ b/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-1023974.t b/tests/bugs/quota/bug-1023974.t
index 63b2c55..017a6de 100644
--- a/tests/bugs/bug-1023974.t
+++ b/tests/bugs/quota/bug-1023974.t
@@ -4,7 +4,7 @@
# no limit set, is accounted properly, when moved into a directory with quota
# limit set.
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1035576.t b/tests/bugs/quota/bug-1035576.t
index 62d431a..dd4f499 100644
--- a/tests/bugs/bug-1035576.t
+++ b/tests/bugs/quota/bug-1035576.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This script tests that self-heal of limit-set xattr is happening on a directory
#but self-heal of quota.size xattr is not happening
diff --git a/tests/bugs/bug-1038598.t b/tests/bugs/quota/bug-1038598.t
index 4846b7d..c51bc47 100644
--- a/tests/bugs/bug-1038598.t
+++ b/tests/bugs/quota/bug-1038598.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1040423.t b/tests/bugs/quota/bug-1040423.t
index 6dae9ea..4e7b564 100755
--- a/tests/bugs/bug-1040423.t
+++ b/tests/bugs/quota/bug-1040423.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup
diff --git a/tests/bugs/bug-1049323.t b/tests/bugs/quota/bug-1049323.t
index 203612e..818c5f0 100755
--- a/tests/bugs/bug-1049323.t
+++ b/tests/bugs/quota/bug-1049323.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1087198.t b/tests/bugs/quota/bug-1087198.t
index 92d2acc..69ae18c 100644
--- a/tests/bugs/bug-1087198.t
+++ b/tests/bugs/quota/bug-1087198.t
@@ -12,10 +12,10 @@
## 6. Repeat 3 and 4.
## 7. Cleanup
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../fileio.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-1100050.t b/tests/bugs/quota/bug-1100050.t
index 537591d..e12f64f 100644
--- a/tests/bugs/bug-1100050.t
+++ b/tests/bugs/quota/bug-1100050.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1104692.t b/tests/bugs/quota/bug-1104692.t
index 79ed32c..6f6b174 100755
--- a/tests/bugs/bug-1104692.t
+++ b/tests/bugs/quota/bug-1104692.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-765473.t b/tests/bugs/rdma/bug-765473.t
index cf25882..9f595a1 100755
--- a/tests/bugs/bug-765473.t
+++ b/tests/bugs/rdma/bug-765473.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
cleanup;
diff --git a/tests/bugs/886998/strict-readdir.t b/tests/bugs/replicate/886998/strict-readdir.t
index 57a8c1c..63fe313 100644
--- a/tests/bugs/886998/strict-readdir.t
+++ b/tests/bugs/replicate/886998/strict-readdir.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../../include.rc
+. $(dirname $0)/../../../volume.rc
function num_files_in_dir {
d=$1
diff --git a/tests/bugs/bug-1015990-rep.t b/tests/bugs/replicate/bug-1015990-rep.t
index bca0d7a..4e959e6 100755
--- a/tests/bugs/bug-1015990-rep.t
+++ b/tests/bugs/replicate/bug-1015990-rep.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
## Start and create a volume
diff --git a/tests/bugs/bug-1015990.t b/tests/bugs/replicate/bug-1015990.t
index 165af51..48181c0 100755
--- a/tests/bugs/bug-1015990.t
+++ b/tests/bugs/replicate/bug-1015990.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
## Start and create a volume
diff --git a/tests/bugs/bug-1032927.t b/tests/bugs/replicate/bug-1032927.t
index 2106f3d..eb663d0 100644
--- a/tests/bugs/bug-1032927.t
+++ b/tests/bugs/replicate/bug-1032927.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This tests if pathinfo getxattr fails when one of the bricks is down
#Lets hope it doesn't
diff --git a/tests/bugs/bug-1037501.t b/tests/bugs/replicate/bug-1037501.t
index aff3d6c..ce07955 100755
--- a/tests/bugs/bug-1037501.t
+++ b/tests/bugs/replicate/bug-1037501.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function write_file()
{
diff --git a/tests/bugs/bug-1046624.t b/tests/bugs/replicate/bug-1046624.t
index 13ee45d..9ae4087 100755
--- a/tests/bugs/bug-1046624.t
+++ b/tests/bugs/replicate/bug-1046624.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-1058797.t b/tests/bugs/replicate/bug-1058797.t
index 74de859..99ab3eb 100644
--- a/tests/bugs/bug-1058797.t
+++ b/tests/bugs/replicate/bug-1058797.t
@@ -1,8 +1,8 @@
#!/bin/bash
#Test that the setuid bit is healed correctly.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
#Basic checks
diff --git a/tests/bugs/bug-1101647.t b/tests/bugs/replicate/bug-1101647.t
index ccfa7e2..148af98 100644
--- a/tests/bugs/bug-1101647.t
+++ b/tests/bugs/replicate/bug-1101647.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
diff --git a/tests/bugs/bug-1130892.t b/tests/bugs/replicate/bug-1130892.t
index 206778f..0840ffb 100644
--- a/tests/bugs/bug-1130892.t
+++ b/tests/bugs/replicate/bug-1130892.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
diff --git a/tests/bugs/bug-1132102.t b/tests/bugs/replicate/bug-1132102.t
index 4e54b1d..c7dbbf8 100644
--- a/tests/bugs/bug-1132102.t
+++ b/tests/bugs/replicate/bug-1132102.t
@@ -1,8 +1,8 @@
#!/bin/bash
#This tests that mknod and create fops mark necessary pending changelog
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1134691-afr-lookup-metadata-heal.t b/tests/bugs/replicate/bug-1134691-afr-lookup-metadata-heal.t
index 1fb1732..f43c7ce 100644
--- a/tests/bugs/bug-1134691-afr-lookup-metadata-heal.t
+++ b/tests/bugs/replicate/bug-1134691-afr-lookup-metadata-heal.t
@@ -1,8 +1,8 @@
#!/bin/bash
#### Test iatt and user xattr heal from lookup code path ####
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-1139230.t b/tests/bugs/replicate/bug-1139230.t
index 24317dd..9ceac6c 100644
--- a/tests/bugs/bug-1139230.t
+++ b/tests/bugs/replicate/bug-1139230.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
diff --git a/tests/bugs/bug-765564.t b/tests/bugs/replicate/bug-765564.t
index fa8ead7..098d225 100644
--- a/tests/bugs/bug-765564.t
+++ b/tests/bugs/replicate/bug-765564.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-767585-gfid.t b/tests/bugs/replicate/bug-767585-gfid.t
index 41043a0..4176aab 100755
--- a/tests/bugs/bug-767585-gfid.t
+++ b/tests/bugs/replicate/bug-767585-gfid.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#Test cases to perform gfid-self-heal
#file 'a' should be assigned a fresh gfid
diff --git a/tests/bugs/bug-802417.t b/tests/bugs/replicate/bug-802417.t
index d8f9ca2..ad41100 100755
--- a/tests/bugs/bug-802417.t
+++ b/tests/bugs/replicate/bug-802417.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function write_file()
{
diff --git a/tests/bugs/bug-821056.t b/tests/bugs/replicate/bug-821056.t
index 8c00260..02a9c78 100644
--- a/tests/bugs/bug-821056.t
+++ b/tests/bugs/replicate/bug-821056.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-830665.t b/tests/bugs/replicate/bug-830665.t
index 2a84f9b..3d2ec11 100755
--- a/tests/bugs/bug-830665.t
+++ b/tests/bugs/replicate/bug-830665.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-853680.t b/tests/bugs/replicate/bug-853680.t
index bd9ee8d..806c3d1 100755
--- a/tests/bugs/bug-853680.t
+++ b/tests/bugs/replicate/bug-853680.t
@@ -6,8 +6,8 @@
# a limit, perform a few operations with a least-priority mount and verify
# said operations take a minimum amount of time according to the limit.
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-859581.t b/tests/bugs/replicate/bug-859581.t
index 08883fa..d8b45a2 100755
--- a/tests/bugs/bug-859581.t
+++ b/tests/bugs/replicate/bug-859581.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-865825.t b/tests/bugs/replicate/bug-865825.t
index a66ede6..ffb2e0f 100755
--- a/tests/bugs/bug-865825.t
+++ b/tests/bugs/replicate/bug-865825.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-880898.t b/tests/bugs/replicate/bug-880898.t
index 4b9fb50..123e7e1 100644
--- a/tests/bugs/bug-880898.t
+++ b/tests/bugs/replicate/bug-880898.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-884328.t b/tests/bugs/replicate/bug-884328.t
index ee5509b..acc8e54 100644
--- a/tests/bugs/bug-884328.t
+++ b/tests/bugs/replicate/bug-884328.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-886998.t b/tests/bugs/replicate/bug-886998.t
index 7a905a1..bcac235 100644
--- a/tests/bugs/bug-886998.t
+++ b/tests/bugs/replicate/bug-886998.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-888174.t b/tests/bugs/replicate/bug-888174.t
index d45124d..8c70265 100644
--- a/tests/bugs/bug-888174.t
+++ b/tests/bugs/replicate/bug-888174.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This tests if flush, fsync wakes up the delayed post-op or not.
#If it is not woken up, INODELK from the next command waits
diff --git a/tests/bugs/bug-913051.t b/tests/bugs/replicate/bug-913051.t
index 69845f7..1c21839 100644
--- a/tests/bugs/bug-913051.t
+++ b/tests/bugs/replicate/bug-913051.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
cleanup;
diff --git a/tests/bugs/bug-916226.t b/tests/bugs/replicate/bug-916226.t
index 50d1e31..893905f 100644
--- a/tests/bugs/bug-916226.t
+++ b/tests/bugs/replicate/bug-916226.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-918437-sh-mtime.t b/tests/bugs/replicate/bug-918437-sh-mtime.t
index 9d3ebd5..04ac02f 100644
--- a/tests/bugs/bug-918437-sh-mtime.t
+++ b/tests/bugs/replicate/bug-918437-sh-mtime.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
function get_mtime {
local f=$1
diff --git a/tests/bugs/bug-921231.t b/tests/bugs/replicate/bug-921231.t
index 79c7522..93c642b 100644
--- a/tests/bugs/bug-921231.t
+++ b/tests/bugs/replicate/bug-921231.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
# This test writes to same file with 2 fds and tests that eager-lock is not
# causing extra delay because of post-op-delay-secs
diff --git a/tests/bugs/bug-957877.t b/tests/bugs/replicate/bug-957877.t
index 52bbd62..1290172 100644
--- a/tests/bugs/bug-957877.t
+++ b/tests/bugs/replicate/bug-957877.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
TEST glusterd
diff --git a/tests/bugs/bug-966018.t b/tests/bugs/replicate/bug-966018.t
index 47a36c4..be4d0b9 100644
--- a/tests/bugs/bug-966018.t
+++ b/tests/bugs/replicate/bug-966018.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
#This tests if eager-lock blocks metadata operations on nfs/fuse mounts.
#If it is not woken up, INODELK from the next command waits
diff --git a/tests/bugs/bug-976800.t b/tests/bugs/replicate/bug-976800.t
index 2aee8cc..35a40a3 100644
--- a/tests/bugs/bug-976800.t
+++ b/tests/bugs/replicate/bug-976800.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
# This test checks if there are any open fds on the brick
# even after the file is closed on the mount. This particular
diff --git a/tests/bugs/bug-977797.t b/tests/bugs/replicate/bug-977797.t
index 339588a..3ff14ec 100755
--- a/tests/bugs/bug-977797.t
+++ b/tests/bugs/replicate/bug-977797.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-978794.t b/tests/bugs/replicate/bug-978794.t
index 8cda83e..8e43e74 100644
--- a/tests/bugs/bug-978794.t
+++ b/tests/bugs/replicate/bug-978794.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
# This test opens 100 fds and triggers graph switches to check if fsync
diff --git a/tests/bugs/bug-979365.t b/tests/bugs/replicate/bug-979365.t
index fa9e1de..b1396c2 100755
--- a/tests/bugs/bug-979365.t
+++ b/tests/bugs/replicate/bug-979365.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This script checks that ensure-durability option enables/disables afr
#sending fsyncs
diff --git a/tests/bugs/bug-986905.t b/tests/bugs/replicate/bug-986905.t
index ed11bbb..f4f7386 100755
--- a/tests/bugs/bug-986905.t
+++ b/tests/bugs/replicate/bug-986905.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This script checks if hardlinks that are created while a brick is down are
#healed properly.
diff --git a/tests/bugs/bug-1043886.t b/tests/bugs/rpc/bug-1043886.t
index 710fcd2..e6bd454 100755
--- a/tests/bugs/bug-1043886.t
+++ b/tests/bugs/rpc/bug-1043886.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
diff --git a/tests/bugs/bug-847624.t b/tests/bugs/rpc/bug-847624.t
index 6b35c99..627c47b 100755
--- a/tests/bugs/bug-847624.t
+++ b/tests/bugs/rpc/bug-847624.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup
#1
diff --git a/tests/bugs/bug-884452.t b/tests/bugs/rpc/bug-884452.t
index aa29212..c161a68 100644
--- a/tests/bugs/bug-884452.t
+++ b/tests/bugs/rpc/bug-884452.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-921072.t b/tests/bugs/rpc/bug-921072.t
index 8f7a5d0..46a3442 100755
--- a/tests/bugs/bug-921072.t
+++ b/tests/bugs/rpc/bug-921072.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-954057.t b/tests/bugs/rpc/bug-954057.t
index 30bc1d7..9c48207 100755
--- a/tests/bugs/bug-954057.t
+++ b/tests/bugs/rpc/bug-954057.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#This script checks if use-readdirp option works as accepted in mount options
diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/snapshot/bug-1045333.t
index d877d14..ad2d002 100755
--- a/tests/bugs/bug-1045333.t
+++ b/tests/bugs/snapshot/bug-1045333.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1049834.t b/tests/bugs/snapshot/bug-1049834.t
index 7e16fde..cdb8a3b 100755
--- a/tests/bugs/bug-1049834.t
+++ b/tests/bugs/snapshot/bug-1049834.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../cluster.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
TEST verify_lvm_version
diff --git a/tests/bugs/bug-1064768.t b/tests/bugs/snapshot/bug-1064768.t
index b0d04eb..53140a0 100644
--- a/tests/bugs/bug-1064768.t
+++ b/tests/bugs/snapshot/bug-1064768.t
@@ -1,6 +1,6 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-1155042-dont-display-deactivated-snapshots.t b/tests/bugs/snapshot/bug-1155042-dont-display-deactivated-snapshots.t
index 63ad3d7..cf35caa 100644
--- a/tests/bugs/bug-1155042-dont-display-deactivated-snapshots.t
+++ b/tests/bugs/snapshot/bug-1155042-dont-display-deactivated-snapshots.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
diff --git a/tests/bugs/bug-1157991.t b/tests/bugs/snapshot/bug-1157991.t
index 97d0810..77440bc 100755
--- a/tests/bugs/bug-1157991.t
+++ b/tests/bugs/snapshot/bug-1157991.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1162462.t b/tests/bugs/snapshot/bug-1162462.t
index 30b9dc3..aed79fd 100755
--- a/tests/bugs/bug-1162462.t
+++ b/tests/bugs/snapshot/bug-1162462.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
diff --git a/tests/bugs/bug-1162498.t b/tests/bugs/snapshot/bug-1162498.t
index d01999e..06b3d74 100644
--- a/tests/bugs/bug-1162498.t
+++ b/tests/bugs/snapshot/bug-1162498.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1164613.t b/tests/bugs/snapshot/bug-1164613.t
index b7b27f1..9cf122b 100644
--- a/tests/bugs/bug-1164613.t
+++ b/tests/bugs/snapshot/bug-1164613.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
cleanup;
TEST verify_lvm_version;
diff --git a/tests/bugs/bug-1166197.t b/tests/bugs/snapshot/bug-1166197.t
index a1e2480..6592382 100755
--- a/tests/bugs/bug-1166197.t
+++ b/tests/bugs/snapshot/bug-1166197.t
@@ -1,9 +1,9 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../snapshot.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../nfs.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../snapshot.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../nfs.rc
cleanup;
CURDIR=`pwd`
diff --git a/tests/bugs/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
index 1eb3d55..b15d3a8 100644
--- a/tests/bugs/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
+++ b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../nfs.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
# This function returns a value "Y" if user can execute
# the given command. Else it will return "N"
diff --git a/tests/bugs/bug-1178079.t b/tests/bugs/snapshot/bug-1178079.t
index 3ee4f73..a1a6b0b 100644
--- a/tests/bugs/bug-1178079.t
+++ b/tests/bugs/snapshot/bug-1178079.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1002207.t b/tests/bugs/stripe/bug-1002207.t
index c67738b..1f8e46b 100644
--- a/tests/bugs/bug-1002207.t
+++ b/tests/bugs/stripe/bug-1002207.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-1111454.t b/tests/bugs/stripe/bug-1111454.t
index 49f080d..05f6934 100644
--- a/tests/bugs/bug-1111454.t
+++ b/tests/bugs/stripe/bug-1111454.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
#symlink resolution should succeed
cleanup;
diff --git a/tests/bugs/bug-797171.t b/tests/bugs/trace/bug-797171.t
index d29c4bd..29f96b1 100755
--- a/tests/bugs/bug-797171.t
+++ b/tests/bugs/trace/bug-797171.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/bugs/bug-873367.t b/tests/bugs/transport/bug-873367.t
index 771c862..d4c0702 100755
--- a/tests/bugs/bug-873367.t
+++ b/tests/bugs/transport/bug-873367.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
SSL_BASE=/etc/ssl
SSL_KEY=$SSL_BASE/glusterfs.key
diff --git a/tests/bugs/bug-1034085.t b/tests/bugs/unclassified/bug-1034085.t
index 7ccb440..aacaa24 100644
--- a/tests/bugs/bug-1034085.t
+++ b/tests/bugs/unclassified/bug-1034085.t
@@ -1,7 +1,7 @@
#!/bin/bash
#Test case: Check the creation of indices/xattrop dir as soon as brick comes up.
-. $(dirname $0)/../include.rc
+. $(dirname $0)/../../include.rc
cleanup;
diff --git a/tests/bugs/bug-874498.t b/tests/bugs/unclassified/bug-874498.t
index 843698d..8d409d0 100644
--- a/tests/bugs/bug-874498.t
+++ b/tests/bugs/unclassified/bug-874498.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../afr.rc
cleanup;
diff --git a/tests/bugs/bug-991622.t b/tests/bugs/unclassified/bug-991622.t
index 5c32434..17b37a7 100644
--- a/tests/bugs/bug-991622.t
+++ b/tests/bugs/unclassified/bug-991622.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
#This tests that no fd leaks are observed in unlink/rename in open-behind
function leaked_fds {
diff --git a/tests/bugs/bug-1058663.c b/tests/bugs/write-behind/bug-1058663.c
index 8f26d0f..5e522e9 100644
--- a/tests/bugs/bug-1058663.c
+++ b/tests/bugs/write-behind/bug-1058663.c
@@ -13,8 +13,8 @@
/* number of SIGBUS before exiting */
#define MAX_SIGBUS 1
-static int expect_sigbus = 0;
-static int sigbus_received = 0;
+static int expect_sigbus;
+static int sigbus_received;
/* test for truncate()/seek()/write()/mmap()
* There should ne no SIGBUS triggered.
@@ -22,9 +22,9 @@ static int sigbus_received = 0;
void seek_write(char *filename)
{
int fd;
- uint8_t* map;
+ uint8_t *map;
int i;
-
+
fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, 0600);
lseek(fd, FILE_SIZE - 1, SEEK_SET);
write(fd, "\xff", 1);
@@ -43,9 +43,9 @@ int read_after_eof(char *filename)
{
int ret = 0;
int fd;
- char* data;
- uint8_t* map;
-
+ char *data;
+ uint8_t *map;
+
fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, 0600);
lseek(fd, FILE_SIZE - 1, SEEK_SET);
write(fd, "\xff", 1);
@@ -74,22 +74,22 @@ void catch_sigbus(int signum)
{
switch (signum) {
#ifdef __NetBSD__
- /* Depending on architecture, we can get SIGSEGV */
- case SIGSEGV: /* FALLTHROUGH */
+ /* Depending on architecture, we can get SIGSEGV */
+ case SIGSEGV: /* FALLTHROUGH */
#endif
- case SIGBUS:
- sigbus_received++;
- if (!expect_sigbus)
- exit(EXIT_FAILURE);
- if (sigbus_received >= MAX_SIGBUS)
- exit(EXIT_SUCCESS);
- break;
- default:
- printf("Unexpected signal received: %d\n", signum);
+ case SIGBUS:
+ sigbus_received++;
+ if (!expect_sigbus)
+ exit(EXIT_FAILURE);
+ if (sigbus_received >= MAX_SIGBUS)
+ exit(EXIT_SUCCESS);
+ break;
+ default:
+ printf("Unexpected signal received: %d\n", signum);
}
}
-int main(int argc, char** argv)
+int main(int argc, char **argv)
{
int i = 0;
diff --git a/tests/bugs/bug-1058663.t b/tests/bugs/write-behind/bug-1058663.t
index c1e8211..a900a6d 100644
--- a/tests/bugs/bug-1058663.t
+++ b/tests/bugs/write-behind/bug-1058663.t
@@ -1,7 +1,7 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
diff --git a/tests/cluster.rc b/tests/cluster.rc
index b734f9d..b734f9d 100755..100644
--- a/tests/cluster.rc
+++ b/tests/cluster.rc
diff --git a/tests/include.rc b/tests/include.rc
index 2c37446..db79711 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -13,15 +13,18 @@ OSTYPE=$(uname -s)
ENV_RC=$(dirname $0)/../env.rc
if [ ! -f $ENV_RC ]; then
ENV_RC=$(dirname $0)/../../env.rc
+ if [ ! -f $ENV_RC ]; then
+ ENV_RC=$(dirname $0)/../../../env.rc
+ fi
fi
if [ ! -f $ENV_RC ]; then
- echo "Aborting."
- echo
- echo "env.rc not found"
- echo
- echo "Please correct the problem and try again."
- echo
+ echo "Aborting." | tee /dev/stderr
+ echo | tee /dev/stderr
+ echo "env.rc not found" | tee /dev/stderr
+ echo | tee /dev/stderr
+ echo "Please correct the problem and try again." | tee /dev/stderr
+ echo | tee /dev/stderr
exit 1
fi
. $ENV_RC
diff --git a/tests/snapshot.rc b/tests/snapshot.rc
index a0c92d9..a0c92d9 100755..100644
--- a/tests/snapshot.rc
+++ b/tests/snapshot.rc