diff options
| -rw-r--r-- | testsuite/README | 9 | ||||
| -rw-r--r-- | testsuite/cp/cp-preserves-hard-links | 2 | ||||
| -rw-r--r-- | testsuite/grep/egrep-supports-extended-regexps | 2 | ||||
| -rw-r--r-- | testsuite/grep/grep-is-also-egrep | 2 | ||||
| -rwxr-xr-x | testsuite/runtest | 4 | ||||
| -rw-r--r-- | testsuite/tar/tar-archives-multiple-files | 2 | ||||
| -rw-r--r-- | testsuite/tar/tar-handles-empty-include-and-non-empty-exclude-list | 2 | ||||
| -rw-r--r-- | testsuite/tar/tar-handles-exclude-and-extract-lists | 2 | ||||
| -rw-r--r-- | testsuite/tar/tar-handles-nested-exclude | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/testsuite/README b/testsuite/README index 7ed790f7a..40439bfe8 100644 --- 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 c17f42635..4de7b85db 100644 --- 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 f858e8465..9953dcc66 100644 --- 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 f28afda62..2e6977c28 100644 --- 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 ba7deeb58..a4bfebd84 100755 --- 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 72d4ca811..245d9e989 100644 --- 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 4f2adab71..b76f02301 100644 --- 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 addcce094..e715a4771 100644 --- 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 2bfc7dd53..ad39506c8 100644 --- 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 |