diff --git a/test/Dockerfile b/test/Dockerfile index 12ea74da5..066fbc819 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -36,7 +36,8 @@ RUN apk add --no-cache \ # Our terminals RUN apk add --no-cache \ - alacritty + alacritty \ + xterm COPY --from=vttest /vttest /usr/bin/vttest diff --git a/test/cases/vttest/1_1.sh.alacritty.png b/test/cases/vttest/1_1.sh.alacritty.png new file mode 100644 index 000000000..030912052 Binary files /dev/null and b/test/cases/vttest/1_1.sh.alacritty.png differ diff --git a/test/cases/vttest/1_1.sh.xterm.png b/test/cases/vttest/1_1.sh.xterm.png new file mode 100644 index 000000000..b2ab3cdf5 Binary files /dev/null and b/test/cases/vttest/1_1.sh.xterm.png differ diff --git a/test/cases/vttest/launch.sh.png b/test/cases/vttest/launch.sh.png deleted file mode 100644 index ba1bc593d..000000000 Binary files a/test/cases/vttest/launch.sh.png and /dev/null differ diff --git a/test/run.sh b/test/run.sh index a263a8b37..a0643df57 100755 --- a/test/run.sh +++ b/test/run.sh @@ -33,7 +33,8 @@ while [[ "$#" -gt 0 ]]; do done # If we're updating, then just update the file in-place -if [ "$ARG_UPDATE" -eq 1 ]; then ARG_OUT="${ARG_CASE}.png"; fi +GOLDEN_OUT="${ARG_CASE}.${ARG_EXEC}.png" +if [ "$ARG_UPDATE" -eq 1 ]; then ARG_OUT=$GOLDEN_OUT; fi bad=0 if [ -z "$ARG_EXEC" ]; then bad=1; fi @@ -93,7 +94,7 @@ echo "Capturing screen shot..." import -window root ${ARG_OUT} echo "Comparing results..." -DIFF=$(compare -metric AE ${ARG_OUT} ${ARG_CASE}.png null: 2>&1) +DIFF=$(compare -metric AE ${ARG_OUT} ${GOLDEN_OUT} null: 2>&1) if [ $? -eq 2 ] ; then echo " Comparison failed (error)" exit 1