* testsuite/README: Change "UNSUPPORTED" tag to "FEATURE".

* testsuite/runtest (run_applet_testcase): Likewise.
* testsuite/cp/cp-preserves-hard-links: Likewise.
* testsuite/grep/egrep-supports-extended-regexps: Likewise.
* testsuite/grep/grep-is-also-egrep: Likewise.
* testsuite/tar/tar-archives-multiple-files: Likewise.
* testsuite/tar/tar-handles-empty-include-and-non-empty-exclude-list:
  Likewise.
* testsuite/tar/tar-handles-exclude-and-extract-lists: Likewise.
* testsuite/tar/tar-handles-nested-exclude: Likewise.

diff --git a/testsuite/README b/testsuite/README
index 7ed790f7abc9dd30cbb660d6f6b469406133e93b..40439bfe8cbf6208088c898ac7cfec30e3595e0e 100644 (file)
--- a/testsuite/README
+++ b/testsuite/README
@@ -6,10 +6,11 @@ cases for particular applets, specify them as parameters to runtest.
 The test cases for an applet reside in the subdirectory of the applet name.  The
 name of the test case should be the assertion that is tested.  The test case
 should be a shell fragment that returns successfully if the test case passes,
-and unsuccessfully otherwise.  If the test case is known to fail, it should be
-marked as such by including the string "XFAIL" in a comment.  If a certain
-feature must be enabled for it to pass, it should indicate that by including the
-string "UNSUPPORTED: " followed by the feature name in a comment.
+and unsuccessfully otherwise.
+
+If the test case relies on a certain feature, it should include the string
+"FEATURE: " followed by the name of the feature in a comment.  If it is always
+expected to fail, it should include the string "XFAIL" in a comment.
 
 For the entire testsuite, the copyright is as follows:
 

diff --git a/testsuite/cp/cp-preserves-hard-links b/testsuite/cp/cp-preserves-hard-links
index c17f42635ca1c45aceebaab2c50e36048bd348ef..4de7b85db8067dee380cc12649feba73b30a1d37 100644 (file)
--- a/testsuite/cp/cp-preserves-hard-links
+++ b/testsuite/cp/cp-preserves-hard-links
@@ -1,4 +1,4 @@
-# UNSUPPORTED: CONFIG_FEATURE_PRESERVE_HARDLINKS
+# FEATURE: CONFIG_FEATURE_PRESERVE_HARDLINKS
 touch foo
 ln foo bar
 mkdir baz

diff --git a/testsuite/grep/egrep-supports-extended-regexps b/testsuite/grep/egrep-supports-extended-regexps
index f858e8465050361f061f66ee9c01484736eff205..9953dcc6661e12f0f6eb32df4e0f96768eb80afd 100644 (file)
--- a/testsuite/grep/egrep-supports-extended-regexps
+++ b/testsuite/grep/egrep-supports-extended-regexps
@@ -1,2 +1,2 @@
-# UNSUPPORTED: CONFIG_FEATURE_GREP_EGREP_ALIAS
+# FEATURE: CONFIG_FEATURE_GREP_EGREP_ALIAS
 test x`echo foo | busybox egrep fo+` = xfoo

diff --git a/testsuite/grep/grep-is-also-egrep b/testsuite/grep/grep-is-also-egrep
index f28afda6284144a40f3086e200b2793b718131b0..2e6977c284ce394121f2791142c91f3f981668a0 100644 (file)
--- a/testsuite/grep/grep-is-also-egrep
+++ b/testsuite/grep/grep-is-also-egrep
@@ -1,2 +1,2 @@
-# UNSUPPORTED: CONFIG_FEATURE_GREP_EGREP_ALIAS
+# FEATURE: CONFIG_FEATURE_GREP_EGREP_ALIAS
 echo foo | busybox egrep foo

diff --git a/testsuite/runtest b/testsuite/runtest
index ba7deeb584c4e0fb18ca58ba3533ce42d893a7ed..a4bfebd84465cdb6b84dd3529933194e9ebad112 100755 (executable)
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -36,8 +36,8 @@ run_applet_testcase ()
                return 0
        fi
 
-       if grep -q "^# UNSUPPORTED: " $testcase; then
-               local feature=`sed -ne 's/.*UNSUPPORTED: //p' $testcase`
+       if grep -q "^# FEATURE: " $testcase; then
+               local feature=`sed -ne 's/^# FEATURE: //p' $testcase`
 
                if grep -q "^# ${feature} is not set$" ../.config; then
                        show_result UNTESTED $testname

diff --git a/testsuite/tar/tar-archives-multiple-files b/testsuite/tar/tar-archives-multiple-files
index 72d4ca811c2c780090f4272484a3b46003a1bd9f..245d9e9892ec7cb4dcc363c7ce2da0f9926914a3 100644 (file)
--- a/testsuite/tar/tar-archives-multiple-files
+++ b/testsuite/tar/tar-archives-multiple-files
@@ -1,4 +1,4 @@
-# UNSUPPORTED: CONFIG_FEATURE_TAR_CREATE
+# FEATURE: CONFIG_FEATURE_TAR_CREATE
 touch foo bar
 busybox tar cf foo.tar foo bar
 rm foo bar

diff --git a/testsuite/tar/tar-handles-empty-include-and-non-empty-exclude-list b/testsuite/tar/tar-handles-empty-include-and-non-empty-exclude-list
index 4f2adab71ac79d01c58445e71694da7c788c063f..b76f023012b1b7eda10eff774fc389dd9ea550d4 100644 (file)
--- a/testsuite/tar/tar-handles-empty-include-and-non-empty-exclude-list
+++ b/testsuite/tar/tar-handles-empty-include-and-non-empty-exclude-list
@@ -1,4 +1,4 @@
-# UNSUPPORTED: CONFIG_FEATURE_TAR_EXCLUDE
+# FEATURE: CONFIG_FEATURE_TAR_EXCLUDE
 touch foo
 tar cf foo.tar foo
 echo foo >foo.exclude

diff --git a/testsuite/tar/tar-handles-exclude-and-extract-lists b/testsuite/tar/tar-handles-exclude-and-extract-lists
index addcce094b7e76403e7c055d2ddb627a76d67c5d..e715a4771c1630f36ee5f47669d8a63c33d5368a 100644 (file)
--- a/testsuite/tar/tar-handles-exclude-and-extract-lists
+++ b/testsuite/tar/tar-handles-exclude-and-extract-lists
@@ -1,4 +1,4 @@
-# UNSUPPORTED: CONFIG_FEATURE_TAR_EXCLUDE
+# FEATURE: CONFIG_FEATURE_TAR_EXCLUDE
 touch foo bar baz
 tar cf foo.tar foo bar baz
 echo foo >foo.exclude

diff --git a/testsuite/tar/tar-handles-nested-exclude b/testsuite/tar/tar-handles-nested-exclude
index 2bfc7dd533f2c2640a47c5cff8d71f6342b98324..ad39506c8f6e1dde5273a4ac6fd853e9feb84f69 100644 (file)
--- a/testsuite/tar/tar-handles-nested-exclude
+++ b/testsuite/tar/tar-handles-nested-exclude
@@ -1,4 +1,4 @@
-# UNSUPPORTED: CONFIG_FEATURE_TAR_EXCLUDE
+# FEATURE: CONFIG_FEATURE_TAR_EXCLUDE
 mkdir foo
 touch foo/bar
 tar cf foo.tar foo