check: shorten names of testcase outputs

.gitignore

@@ -30,6 +30,10 @@
 /tests/*.actual.output
 /tests/*.output.actual.new
 /tests/*.output.actual
+/tests/*.actual.new
+/tests/*.actual
+/tests/*.output.new
+/tests/*.output
 
 # Misc results
 *.strace

tests/run-tests

@@ -69,31 +69,31 @@ for executable; do
 	export FREQ="${FREQS[${freq_idx}]}"
 	base="$(basename $(basename "$test" .bash) .sh)"
 	dir="$(dirname "$test")"
-	actual="${dir}/${executable}--${base}.output.actual"
+	actual="${dir}/${executable}--${base}.actual"
 	printf "${hilite}%-13s${normal} ${hilite}%-32s${normal} " "${executable}" "${base}"
 	if "${test}" > "${actual}.new" 2>&1; then
 	    canonicalize_output < "${actual}.new" > "${actual}"
 	    expects_output=false
-	    for file in "${dir}/${base}.output.expected".[0-9]; do
+	    for file in "${dir}/${base}.expected".[0-9]; do
 		if test -f "$file"; then
 		    expects_output=true
 		    break
 		fi
 	    done
 	    if "${expects_output}"; then
 		expect_fail="true"
-		for expected in "${dir}/${base}.output.expected".[0-9]; do
+		for expected in "${dir}/${base}.expected".[0-9]; do
 		    if ${CMP} --quiet "${expected}" "${actual}"; then
 			pass="$(expr "${pass}" + 1)"
-			echo "${passmsg}${expected/#*output.expected}"
+			echo "${passmsg}${expected/#*expected}"
 			expect_fail="false"
 			break
 		    fi
 		done
 		if "$expect_fail"; then
 		    fail="$(expr "${fail}" + 1)"
 		    echo "${failmsg}"
-		    for expected in "${dir}/${base}.output.expected".[0-9]; do
+		    for expected in "${dir}/${base}.expected".[0-9]; do
 			${DIFF} -u "${expected}" "${actual}"
 		    done
 		fi