diff options
| -rwxr-xr-x | run_tests.sh | 148 |
1 files changed, 119 insertions, 29 deletions
diff --git a/run_tests.sh b/run_tests.sh index c5a36ad..58465d4 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -2,51 +2,141 @@ line='........................................' -extract_section() { +extract_sections() { local file=$1 - local tag=$2 + local dir=$2 + local count=0 + local tag line outfile + + while IFS= read -r line; do + case "$line" in + "-- Testcase --") + tag="test" + count=$((count + 1)) + outfile=$(printf "%s/%03d.in" "$dir" $count) + printf "" > "$outfile" + ;; + "-- Expect stdout --"|"-- Expect stderr --"|"-- Expect exitcode --") + tag="${line#-- Expect }" + tag="${tag% --}" + count=$((count + 1)) + outfile=$(printf "%s/%03d.%s" "$dir" $count "$tag") + printf "" > "$outfile" + ;; + "-- End --") + tag="" + outfile="" + ;; + *) + if [ -n "$tag" ]; then + printf "%s\\n" "$line" >> "$outfile" + fi + ;; + esac + done < "$file" + + return $(ls -l "$dir/"*.in 2>/dev/null | wc -l) +} + +run_testcase() { + local num=$1 + local dir=$2 + local in=$3 + local out=$4 + local err=$5 + local code=$6 + local fail=0 + + ./utpl -i "$in" >"$dir/res.out" 2>"$dir/res.err" + + printf "%d\n" $? > "$dir/res.code" + + if [ -n "$err" ] && ! cmp -s "$dir/res.err" "$err"; then + [ $fail = 0 ] && printf "!\n" + printf "Testcase #%d: Expected stderr did not match:\n" $num + diff -u --color=always --label="Expected stderr" --label="Resulting stderr" "$err" "$dir/res.err" + printf -- "---\n" + fail=1 + fi + + if [ -n "$out" ] && ! cmp -s "$dir/res.out" "$out"; then + [ $fail = 0 ] && printf "!\n" + printf "Testcase #%d: Expected stdout did not match:\n" $num + diff -u --color=always --label="Expected stdout" --label="Resulting stdout" "$out" "$dir/res.out" + printf -- "---\n" + fail=1 + fi - sed -ne '/^-- '"$tag"' --$/ { :n; n; /^-- End --$/b; p; b n }' "$file" + if [ -n "$code" ] && ! cmp -s "$dir/res.code" "$code"; then + [ $fail = 0 ] && printf "!\n" + printf "Testcase #%d: Expected exit code did not match:\n" $num + diff -u --color=always --label="Expected code" --label="Resulting code" "$code" "$dir/res.code" + printf -- "---\n" + fail=1 + fi + + return $fail } run_test() { local file=$1 local name=${file##*/} - local res + local res ecode eout eerr ein tests + local testcase_first=0 failed=0 count=0 printf "%s %s " "$name" "${line:${#name}}" - extract_section "$file" "Expect stdout" >"/tmp/$$.expout" - extract_section "$file" "Expect stderr" >"/tmp/$$.experr" - extract_section "$file" "Testcase" >"/tmp/$$.in" + mkdir "/tmp/test.$$" + + extract_sections "$file" "/tmp/test.$$" + tests=$? + + [ -f "/tmp/test.$$/001.in" ] && testcase_first=1 + + for res in "/tmp/test.$$/"[0-9]*; do + case "$res" in + *.in) + count=$((count + 1)) + + if [ $testcase_first = 1 ]; then + # Flush previous test + if [ -n "$ein" ]; then + run_testcase $count "/tmp/test.$$" "$ein" "$eout" "$eerr" "$ecode" || failed=$((failed + 1)) + + ein=$res + eout="" + eerr="" + ecode="" + fi + else + run_testcase $count "/tmp/test.$$" "$res" "$eout" "$eerr" "$ecode" || failed=$((failed + 1)) + + eout="" + eerr="" + ecode="" + fi + + ;; + *.stdout) eout=$res ;; + *.stderr) eerr=$res ;; + *.exitcode) ecode=$res ;; + esac + done - ./utpl -i "/tmp/$$.in" >"/tmp/$$.out" 2>"/tmp/$$.err" + # Flush last test + if [ $testcase_first = 1 ] && [ -n "$eout$eerr$ecode" ]; then + run_testcase $count "/tmp/test.$$" "$ein" "$eout" "$eerr" "$ecode" || failed=$((failed + 1)) + fi - local rc=$? + rm -r "/tmp/test.$$" - if ! cmp -s "/tmp/$$.err" "/tmp/$$.experr"; then - printf "FAILED:\n" - diff -u --color=always --label="Expected stderr" --label="Resulting stderr" "/tmp/$$.experr" "/tmp/$$.err" - printf -- "---\n" - res=1 - elif ! cmp -s "/tmp/$$.out" "/tmp/$$.expout"; then - printf "FAILED:\n" - diff -u --color=always --label="Expected stdout" --label="Resulting stdout" "/tmp/$$.expout" "/tmp/$$.out" - printf -- "---\n" - res=1 - #elif [ "$rc" != 0 ]; then - # local err="$(cat "/tmp/$$.err")" - # printf "FAILED:\n" - # printf "Terminated with exit code %d:\n%s\n---\n" $rc "${err:-(no error output)}" - # res=1 - else + if [ $failed = 0 ]; then printf "OK\n" - res=0 + else + printf "%s %s FAILED (%d/%d)\n" "$name" "${line:${#name}}" $failed $tests fi - rm -f "/tmp/$$.in" "/tmp/$$.out" "/tmp/$$.err" "/tmp/$$.expout" "/tmp/$$.experr" - - return $res + return $failed } |