tests: Add mechanism for disabled tests

Requirements:
Should be able to skip tests from run-tests.sh run.
Should be granular enough to disable on subset of OSes.

Solution:
Tests can have special comment lines with some comma separated values
within them.

Key names used to determine test status are
G_TESTDEF_TEST_STATUS_CENTOS6
G_TESTDEF_TEST_STATUS_NETBSD7
Some examples:
G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=123456
G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=4444444
G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=123456;555555
You can change status of test to enabled or delete the line only if all the
bugs are closed or modified or if the patch fixes it.

Change-Id: Idee21fecaa5837fd4bd06e613f5c07a024f7b0c2
BUG: 1295704
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-on: http://review.gluster.org/13393
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>

32 files changed, 66 insertions, 21 deletions

diff --git a/tests/basic/afr/split-brain-healing.t b/tests/basic/afr/split-brain-healing.t
index 4132d32751..3a95d9862c 100644
--- a/tests/basic/afr/split-brain-healing.t
+++ b/tests/basic/afr/split-brain-healing.t
@@ -181,3 +181,5 @@ EXPECT "1" echo $?
 cd -
 TEST rm $AREQUAL_PATH/arequal-checksum
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/basic/quota-anon-fd-nfs.t b/tests/basic/quota-anon-fd-nfs.t
index aaba0b1d16..e2cce0b69c 100755
--- a/tests/basic/quota-anon-fd-nfs.t
+++ b/tests/basic/quota-anon-fd-nfs.t
@@ -102,3 +102,4 @@ EXPECT "1" get_aux
 rm -f $QDD
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/basic/quota-nfs.t b/tests/basic/quota-nfs.t
index 00c76a49f5..16d5aa6a90 100755
--- a/tests/basic/quota-nfs.t
+++ b/tests/basic/quota-nfs.t
@@ -61,3 +61,4 @@ EXPECT "1" get_aux
 
 rm -f $QDD
 cleanup;
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t b/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t
index 8aa1380ae4..754e8033f6 100755
--- a/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t
+++ b/tests/basic/tier/bug-1214222-directories_missing_after_attach_tier.t
@@ -53,3 +53,5 @@ EXPECT_WITHIN $REBALANCE_TIMEOUT "0" confirm_vol_stopped $V0
 
 
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/basic/tier/ctr-rename-overwrite.t b/tests/basic/tier/ctr-rename-overwrite.t
index a1d5af03a3..8bccd3b348 100755
--- a/tests/basic/tier/ctr-rename-overwrite.t
+++ b/tests/basic/tier/ctr-rename-overwrite.t
@@ -47,3 +47,4 @@ ENTRY_COUNT=$(echo "select * from gf_file_tb; select * from gf_flink_tb;" | \
 TEST [ $ENTRY_COUNT -eq 2 ]
 
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/file_with_spaces.t b/tests/basic/tier/file_with_spaces.t
index 3e3c34da72..bd99e71ffe 100755
--- a/tests/basic/tier/file_with_spaces.t
+++ b/tests/basic/tier/file_with_spaces.t
@@ -68,3 +68,4 @@ EXPECT "yes" exists_and_regular_file $CPATH
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/fops-during-migration-pause.t b/tests/basic/tier/fops-during-migration-pause.t
index f50d666ef2..10bd3f4667 100755
--- a/tests/basic/tier/fops-during-migration-pause.t
+++ b/tests/basic/tier/fops-during-migration-pause.t
@@ -86,3 +86,4 @@ TEST test -s $HPATH
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/fops-during-migration.t b/tests/basic/tier/fops-during-migration.t
index 96180d2391..4be05acb35 100755
--- a/tests/basic/tier/fops-during-migration.t
+++ b/tests/basic/tier/fops-during-migration.t
@@ -103,4 +103,5 @@ EXPECT "1" check_file_content $M0/dir1/FILE1 "$TEST_STR"
 TEST getfattr -n "user.test_xattr" $M0/dir1/FILE1
 
 cleanup;
-
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/basic/tier/frequency-counters.t b/tests/basic/tier/frequency-counters.t
index 51c7ab4a70..c335c02c56 100644
--- a/tests/basic/tier/frequency-counters.t
+++ b/tests/basic/tier/frequency-counters.t
@@ -79,3 +79,4 @@ cd /
 
 cleanup
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/legacy-many.t b/tests/basic/tier/legacy-many.t
index 4469c7569e..851f0a1b0c 100644
--- a/tests/basic/tier/legacy-many.t
+++ b/tests/basic/tier/legacy-many.t
@@ -71,3 +71,4 @@ EXPECT_WITHIN $PROMOTE_TIMEOUT "0" check_counters $NUM_FILES 0
 
 cd;
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/locked_file_migration.t b/tests/basic/tier/locked_file_migration.t
index f7a9d1f355..1a7e3f53c8 100755
--- a/tests/basic/tier/locked_file_migration.t
+++ b/tests/basic/tier/locked_file_migration.t
@@ -77,3 +77,4 @@ rm $(dirname $0)/file_lock
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/new-tier-cmds.t b/tests/basic/tier/new-tier-cmds.t
index c38ecf9d7d..6c78f13915 100644
--- a/tests/basic/tier/new-tier-cmds.t
+++ b/tests/basic/tier/new-tier-cmds.t
@@ -63,3 +63,4 @@ EXPECT "Tier command failed" $CLI volume tier $V0 detach status
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/readdir-during-migration.t b/tests/basic/tier/readdir-during-migration.t
index 42199c5776..e2a43c9357 100644
--- a/tests/basic/tier/readdir-during-migration.t
+++ b/tests/basic/tier/readdir-during-migration.t
@@ -62,3 +62,4 @@ cd /
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/record-metadata-heat.t b/tests/basic/tier/record-metadata-heat.t
index d36ed80591..d4481371f6 100755
--- a/tests/basic/tier/record-metadata-heat.t
+++ b/tests/basic/tier/record-metadata-heat.t
@@ -98,4 +98,5 @@ echo "File path on hot tier: "$HPATH
 EXPECT "yes" exists_and_regular_file $HPATH
 
 cleanup;
-
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/basic/tier/tier-file-create.t b/tests/basic/tier/tier-file-create.t
index 28caacd2a5..06f0e24150 100644
--- a/tests/basic/tier/tier-file-create.t
+++ b/tests/basic/tier/tier-file-create.t
@@ -57,3 +57,5 @@ cd
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=KNOWN_ISSUE,BUG=1315560
diff --git a/tests/basic/tier/tier-heald.t b/tests/basic/tier/tier-heald.t
index 05b19e437c..8dcdd39c61 100644
--- a/tests/basic/tier/tier-heald.t
+++ b/tests/basic/tier/tier-heald.t
@@ -95,3 +95,4 @@ TEST ! $CLI volume set dist disperse-self-heal-daemon off
 TEST ! $CLI volume set dist cluster.disperse-self-heal-daemon on
 
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/tier-snapshot.t b/tests/basic/tier/tier-snapshot.t
index b90d560699..6e7951d196 100644
--- a/tests/basic/tier/tier-snapshot.t
+++ b/tests/basic/tier/tier-snapshot.t
@@ -46,3 +46,5 @@ TEST $CLI snapshot create snap4 $V0 no-timestamp;
 TEST $CLI snapshot delete all;
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t
index cfd8e775f7..5874a9b6e8 100755
--- a/tests/basic/tier/tier.t
+++ b/tests/basic/tier/tier.t
@@ -210,3 +210,4 @@ cleanup
 rm -rf /tmp/d1
 
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/tier_lookup_heal.t b/tests/basic/tier/tier_lookup_heal.t
index 81bb0d6717..825f81db39 100755
--- a/tests/basic/tier/tier_lookup_heal.t
+++ b/tests/basic/tier/tier_lookup_heal.t
@@ -72,3 +72,5 @@ EXPECT_WITHIN $PROMOTE_TIMEOUT "0" file_on_fast_tier file1
 cd;
 
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/basic/tier/tierd_check.t b/tests/basic/tier/tierd_check.t
index 9ef12d5021..2b8ccbbbd9 100644
--- a/tests/basic/tier/tierd_check.t
+++ b/tests/basic/tier/tierd_check.t
@@ -60,3 +60,4 @@ TEST pkill -f "$B0/hot/$V0"
 TEST ! $CLI volume tier $V0 detach start
 
 cleanup
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/basic/tier/unlink-during-migration.t b/tests/basic/tier/unlink-during-migration.t
index 78887433cc..0c2255cfda 100755
--- a/tests/basic/tier/unlink-during-migration.t
+++ b/tests/basic/tier/unlink-during-migration.t
@@ -89,3 +89,4 @@ TEST ! stat $CPATH
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/bugs/distribute/bug-1066798.t b/tests/bugs/distribute/bug-1066798.t
index e53e1aebf2..03de970a63 100755
--- a/tests/bugs/distribute/bug-1066798.t
+++ b/tests/bugs/distribute/bug-1066798.t
@@ -84,3 +84,5 @@ TEST [ `echo $var | awk '{print $5}'` = "0"  ]
 TEST [ `echo $var | awk '{print $6}'` = "0"  ]
 
 cleanup
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/bugs/fuse/bug-924726.t b/tests/bugs/fuse/bug-924726.t
index 2d3c768079..65c56aa57b 100755
--- a/tests/bugs/fuse/bug-924726.t
+++ b/tests/bugs/fuse/bug-924726.t
@@ -43,3 +43,5 @@ SOCKETS_AFTER_SWITCH=`netstat -nap | grep $GLFS_MNT_PID | grep ESTABLISHED | wc
 TEST [ $SOCKETS_AFTER_SWITCH = `expr $SOCKETS_BEFORE_SWITCH + 1` ]
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t b/tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t
index 9ff1758f9c..2ef20b94b6 100644
--- a/tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t
+++ b/tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t
@@ -38,4 +38,5 @@ TEST $CLI_1 peer detach $H2;
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_nfs_count
 
 cleanup;
-
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/bugs/quota/bug-1235182.t b/tests/bugs/quota/bug-1235182.t
index a8d1734bf5..6091146cb9 100644
--- a/tests/bugs/quota/bug-1235182.t
+++ b/tests/bugs/quota/bug-1235182.t
@@ -57,3 +57,5 @@ EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "100.0MB" quotausage "/"
 rm -f $QDD
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t b/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t
index b9f6dc715e..c536c8261e 100644
--- a/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t
+++ b/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t
@@ -39,3 +39,5 @@ TEST $CLI volume set $V0 encryption.master-key $GLUSTERD_WORKDIR/$V0-master-key
 TEST $CLI volume set $V0 features.encryption on
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
diff --git a/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t b/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t
index dc16fed005..752c517adc 100644
--- a/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t
+++ b/tests/bugs/tier/bug-1205545-CTR-and-trash-integration.t
@@ -69,3 +69,4 @@ cleanup
 
 
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/bugs/tier/bug-1279376-rename-demoted-file.t b/tests/bugs/tier/bug-1279376-rename-demoted-file.t
index 98e61ae082..c4a50d9d9f 100755
--- a/tests/bugs/tier/bug-1279376-rename-demoted-file.t
+++ b/tests/bugs/tier/bug-1279376-rename-demoted-file.t
@@ -90,3 +90,4 @@ EXPECT 1 echo $(ls -l $M0 | grep $DST_FILE | wc -l)
 
 cleanup;
 
+#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000
diff --git a/tests/bugs/tier/bug-1286974.t b/tests/bugs/tier/bug-1286974.t
index a2d8131a0d..1df837c9d8 100644
--- a/tests/bugs/tier/bug-1286974.t
+++ b/tests/bugs/tier/bug-1286974.t
@@ -69,4 +69,5 @@ TEST $CLI volume tier $V0 detach stop
 EXPECT "0" tier_task_name "Tier migration";
 
 cleanup;
-
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/geo-rep/georep-basic-dr-rsync.t b/tests/geo-rep/georep-basic-dr-rsync.t
index 220b4713c6..e8b3993808 100644
--- a/tests/geo-rep/georep-basic-dr-rsync.t
+++ b/tests/geo-rep/georep-basic-dr-rsync.t
@@ -126,3 +126,5 @@ TEST $GEOREP_CLI $master $slave stop
 TEST $GEOREP_CLI $master $slave delete
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/geo-rep/georep-basic-dr-tarssh.t b/tests/geo-rep/georep-basic-dr-tarssh.t
index cf661d0878..5f879db99c 100644
--- a/tests/geo-rep/georep-basic-dr-tarssh.t
+++ b/tests/geo-rep/georep-basic-dr-tarssh.t
@@ -128,3 +128,5 @@ TEST $GEOREP_CLI $master $slave stop
 TEST $GEOREP_CLI $master $slave delete
 
 cleanup;
+#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=000000
+#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=000000
diff --git a/tests/include.rc b/tests/include.rc
index 21a6946579..b46a7b2fde 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -156,12 +156,13 @@ function test_header()
 function test_footer()
 {
         RET=$?
-        local err=$1
+        local lineno=$1
+        local err=$2
 
         if [ $RET -eq 0 ]; then
-                echo "ok $t";
+                echo "ok $t, LINENUM:$lineno";
         else
-                echo "not ok $t $err";
+                echo "not ok $t $err, LINENUM:$lineno";
                 # With DEBUG, this was already printed out, so skip it.
                 if [ x"$DEBUG" = x"0" ]; then
                         echo "FAILED COMMAND: $saved_cmd"
@@ -178,8 +179,9 @@ function test_footer()
 
 function test_expect_footer()
 {
-        local e=$1
-        local a=$2
+        local lineno=$1
+        local e=$2
+        local a=$3
         local err=""
 
         if ! [[ "$a" =~ $e ]]; then
@@ -187,7 +189,7 @@ function test_expect_footer()
         fi
         [[ "$a" =~ $e ]];
 
-        test_footer "$err";
+        test_footer "$lineno" "$err";
 }
 
 function _EXPECT()
@@ -204,16 +206,17 @@ function _EXPECT()
         a=$("$@" | tail -1)
 
         if [ "x$e" = "x" ] ; then
-                test_expect_footer "x$e" "x$a";
+                test_expect_footer "$TESTLINE" "x$e" "x$a";
         else
-                test_expect_footer "$e" "$a";
+                test_expect_footer "$TESTLINE" "$e" "$a";
         fi
 }
 
 function test_expect_not_footer()
 {
-        local e=$1
-        local a=$2
+        local lineno=$1
+        local e=$2
+        local a=$3
         local err=""
 
         if [[ "$a" =~ $e ]]; then
@@ -221,7 +224,7 @@ function test_expect_not_footer()
         fi
 
         ! [[ "$a" =~ "$e" ]];
-        test_footer "$err";
+        test_footer "$lineno" "$err";
 }
 
 function _EXPECT_NOT()
@@ -238,9 +241,9 @@ function _EXPECT_NOT()
         a=$("$@" | tail -1)
 
         if [ "x$e" = "x" ] ; then
-               test_expect_not_footer "x$e" "x$a";
+               test_expect_not_footer "$TESTLINE" "x$e" "x$a";
         else
-               test_expect_not_footer "$e" "$a";
+               test_expect_not_footer "$TESTLINE" "$e" "$a";
         fi
 }
 
@@ -255,7 +258,7 @@ function _EXPECT_KEYWORD()
         shift;
         "$@" | tail -1 | grep -q "$e"
 
-        test_footer;
+        test_footer "$TESTLINE";
 }
 
 function _TEST()
@@ -273,7 +276,7 @@ function _TEST()
 
         eval "$@" >/dev/null $redirect
 
-        test_footer;
+        test_footer "$TESTLINE";
 }
 
 function _EXPECT_WITHIN()
@@ -308,9 +311,9 @@ function _EXPECT_WITHIN()
         done
 
         if [ "x$e" = "x" ] ; then
-               test_expect_footer "x$e" "x$a";
+               test_expect_footer "$TESTLINE" "x$e" "x$a";
         else
-               test_expect_footer "$e" "$a";
+               test_expect_footer "$TESTLINE" "$e" "$a";
         fi
 }