diff options
| -rw-r--r-- | Documentation/test-suite | 4 | ||||
| -rwxr-xr-x | validation/test-suite | 28 |
2 files changed, 32 insertions, 0 deletions
diff --git a/Documentation/test-suite b/Documentation/test-suite index a0f205f4..2e786bbf 100644 --- a/Documentation/test-suite +++ b/Documentation/test-suite @@ -49,6 +49,10 @@ 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. + Using test-suite ~~~~~~~~~~~~~~~~ diff --git a/validation/test-suite b/validation/test-suite index e5317109..c14a4c5a 100755 --- a/validation/test-suite +++ b/validation/test-suite @@ -94,6 +94,27 @@ has_none_patterns() } ## +# nbr_patterns(ifile tag ofile) - does ofile contains the +# the patterns given by ifile's tags +# the right number of time? +nbr_patterns() +{ + ifile="$1" + patt="$2" + ofile="$3" + grep "$patt-[0-9][0-9]*-times:" "$ifile" | \ + sed -e "s/^.*$patt-\([0-9][0-9]*\)-times: *\(.*\)/\1 \2/" | \ + while read nbr pat; do + n=$(grep -s "$pat" "$ofile" | wc -l) + if [ "$n" -ne "$nbr" ]; then + return 1 + fi + done + + return $? +} + +## # verbose(string) - prints string if we are in verbose mode verbose() { @@ -221,6 +242,13 @@ do_test() test_failed=1 fi + # verify the 'check-output-pattern-X-times' tags + nbr_patterns "$file" 'check-output-pattern' $file.output.got + if [ "$?" -ne "0" ]; then + error "Actual output doesn't contain the pattern the expected number." + test_failed=1 + fi + get_tag "check-known-to-fail" $file must_fail=`expr "$?" = 0` known_ko_tests=`expr $known_ko_tests + $must_fail` |