nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-30 03:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add options to do colourized, side-by-side & meld reviewing of results.

Browse Source
This commit is contained in:
Andrew McMillan 2013-09-24 11:46:37 +02:00
parent 2589a886f8
commit 50c25cc740
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
testing/run_regressions.sh
View File

@ -27,19 +27,22 @@ ACCEPT_ALL=${2:-""}
check_result() { check_result() {
TEST="$1" TEST="$1"
SKIPDIFF="$2"
if [ ! -f "${REGRESSION}/${TEST}.result" ] ; then if [ ! -f "${REGRESSION}/${TEST}.result" ] ; then
touch "${REGRESSION}/${TEST}.result" touch "${REGRESSION}/${TEST}.result"
fi fi
diff --text -u "${REGRESSION}/${TEST}.result" "${RESULTS}/${TEST}" >"${REGRESSION}/diffs/${TEST}" diff --text -u "${REGRESSION}/${TEST}.result" "${RESULTS}/${TEST}" >"${REGRESSION}/diffs/${TEST}"
if [ -s "${REGRESSION}/diffs/${TEST}" ] ; then if [ -s "${REGRESSION}/diffs/${TEST}" ] ; then
echo "=======================================" if [ -z "$SKIPDIFF" ]; then
echo "Displaying diff for test ${TEST}" echo "======================================="
echo "=======================================" echo "Displaying diff for test ${TEST}"
cat "${REGRESSION}/diffs/${TEST}" echo "======================================="
echo "=======================================" cat "${REGRESSION}/diffs/${TEST}"
echo "======================================="
fi
if [ "${ACCEPT_ALL}" = "" ] ; then if [ "${ACCEPT_ALL}" = "" ] ; then
read -p "[${TEST}] Accept new result [e/r/v/f/x/y/N]? " ACCEPT read -p "[${TEST}] Accept new result [e/s/r/v/f/m/x/y/w/N]? " ACCEPT
else else
ACCEPT=${ACCEPT_ALL} ACCEPT=${ACCEPT_ALL}
fi fi
@ -52,16 +55,28 @@ check_result() {
echo "Showing test $REGRESSION/${TEST}.test" echo "Showing test $REGRESSION/${TEST}.test"
cat "$REGRESSION/${TEST}.test" cat "$REGRESSION/${TEST}.test"
return 2 return 2
elif [ "${ACCEPT}" = "s" ]; then
echo "Displaying side-by-side diff of ${TEST} results"
sdiff --text "${REGRESSION}/${TEST}.result" "${RESULTS}/${TEST}" | less -R
return 3
elif [ "${ACCEPT}" = "w" ]; then
echo "Displaying colourized diff of ${TEST} results"
wdiff -n -w $'\033[30;41m' -x $'\033[0m' -y $'\033[30;42m' -z $'\033[0m' "${REGRESSION}/${TEST}.result" "${RESULTS}/${TEST}" | less -R
return 3
elif [ "${ACCEPT}" = "m" ]; then
echo "Displaying side-by-side 'meld' of ${TEST} results"
meld "${REGRESSION}/${TEST}.result" "${RESULTS}/${TEST}"
return 3
elif [ "${ACCEPT}" = "f" ]; then elif [ "${ACCEPT}" = "f" ]; then
echo "Showing full details of ${TEST}" echo "Showing full details of ${TEST}"
cat "${REGRESSION}/${TEST}.test" cat "${REGRESSION}/${TEST}.test"
echo "Showing full result of ${TEST}" echo "Showing full result of ${TEST}"
cat "${RESULTS}/${TEST}" cat "${RESULTS}/${TEST}"
return 2 return 3
elif [ "${ACCEPT}" = "e" ]; then elif [ "${ACCEPT}" = "e" ]; then
echo "Editing test $REGRESSION/${TEST}.test" echo "Editing test $REGRESSION/${TEST}.test"
vi "$REGRESSION/${TEST}.test" vi "$REGRESSION/${TEST}.test"
return 2 return 3
elif [ "${ACCEPT}" = "r" ]; then elif [ "${ACCEPT}" = "r" ]; then
echo "Rerunning test ${TEST}" echo "Rerunning test ${TEST}"
return 1 return 1
@ -154,9 +169,12 @@ run_regression_suite() {
# Fix Vim syntax highlighting by putting an esac here. Silly, huh? # Fix Vim syntax highlighting by putting an esac here. Silly, huh?
RESULT=999 RESULT=999
SKIPDIFF=""
while [ "${RESULT}" -gt 1 ]; do while [ "${RESULT}" -gt 1 ]; do
check_result "${TEST}" check_result "${TEST}" "$SKIPDIFF"
RESULT=$? RESULT=$?
SKIPDIFF=""
[ "${RESULT}" -gt 2 ] && SKIPDIFF=1
done done
done done