diff options
| -rw-r--r-- | Documentation/test-suite | 4 | ||||
| -rwxr-xr-x | validation/test-suite | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Documentation/test-suite b/Documentation/test-suite index 774f4ab2..7da6b577 100644 --- a/Documentation/test-suite +++ b/Documentation/test-suite @@ -53,10 +53,6 @@ check-output-excludes: <pattern> (optional) Several such tags can be given, in which case the output must contains none of the patterns. -check-output-pattern-<nbr>-times: <pattern> (optional) - Similar than the contains/excludes her above, but with full control - of the number of times the pattern should occurs in the output. - check-output-pattern(<nbr>): <pattern> (optional) check-output-pattern(<min>,<max>): <pattern> (optional) Similar to the '-contains/excludes' here above, but with full control diff --git a/validation/test-suite b/validation/test-suite index a92debd8..0311cc45 100755 --- a/validation/test-suite +++ b/validation/test-suite @@ -45,8 +45,8 @@ get_tag_value() check_output_ignore=0 check_output_contains=0 check_output_excludes=0 + check_output_pattern_obsolete=0 check_output_pattern=0 - check_output_pattern_minmax=0 lines=$(grep 'check-[a-z-]*' $1 | \ sed -e 's/^.*\(check-[a-z-]*:*\) *\(.*\)$/\1 \2/') @@ -65,8 +65,8 @@ get_tag_value() check-output-ignore) check_output_ignore=1 ;; check-output-contains:) check_output_contains=1 ;; check-output-excludes:) check_output_excludes=1 ;; - check-output-pattern-) check_output_pattern=1 ;; - check-output-pattern) check_output_pattern_minmax=1 ;; + check-output-pattern-) check_output_pattern_obsolete=1 ;; + check-output-pattern) check_output_pattern=1 ;; esac done << EOT $lines @@ -313,14 +313,14 @@ do_test() test_failed=1 fi fi - if [ $check_output_pattern -eq 1 ]; then + if [ $check_output_pattern_obsolete -eq 1 ]; then # verify the 'check-output-pattern-X-times' tags nbr_patterns "$file" 'check-output-pattern' $file.output.got if [ "$?" -ne "0" ]; then test_failed=1 fi fi - if [ $check_output_pattern_minmax -eq 1 ]; then + if [ $check_output_pattern -eq 1 ]; then # verify the 'check-output-pattern(...)' tags minmax_patterns "$file" 'check-output-pattern' $file.output.got if [ "$?" -ne "0" ]; then |