From fd1b306c47a848fdce037b7aac05603143e746a8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 17 Jul 2022 19:12:31 -0700 Subject: [PATCH] image outputs now contain the terminal name --- test/Dockerfile | 3 ++- test/cases/vttest/1_1.sh.alacritty.png | Bin 0 -> 9760 bytes test/cases/vttest/1_1.sh.xterm.png | Bin 0 -> 4325 bytes test/cases/vttest/launch.sh.png | Bin 14219 -> 0 bytes test/run.sh | 5 +++-- 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 test/cases/vttest/1_1.sh.alacritty.png create mode 100644 test/cases/vttest/1_1.sh.xterm.png delete mode 100644 test/cases/vttest/launch.sh.png 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 0000000000000000000000000000000000000000..0309120524a6687e4ec1246112f8a580c29f7dc1 GIT binary patch literal 9760 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 b^GHnF>s=H*=Sc9UEx-{Q`vZCVJTLzjBFTrY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b2ab3cdf54eb94829ff30e2febb624dfe7f31355 GIT binary patch literal 4325 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 literal 0 HcmV?d00001 diff --git a/test/cases/vttest/launch.sh.png b/test/cases/vttest/launch.sh.png deleted file mode 100644 index ba1bc593da83c85684829b1652349247350caba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14219 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 VK~?uE_-i5Hf}Zi&qCZi${ug-ggi!zh 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