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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 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 zcmd5jy7_zro0ZyA;0f_qx z0B8yTQvd+;4FCra0N&C8Sa%u#67yW;x0V2ag&rspLG3M;>rpLlMBfgS~+Ni{PmqK_6GGsCN$ayUw& z@nNy5C{Os5qfxsk(TwL4e-o_d-qfY7lAkEDfwMVEqW5YE_*T{IRZ!<6@!PHx%N@9> zA4O%*l#Uh+3uAt|1qv>gC|#cHDk)LRKfaQNJqikTpvL6~y1k*hcVpVw71%+F1s%5= z*Hn%jrDR`*l7WgAtUPD32Nc>LS8iKXOp)_wP+Mv8-iIQXUd{I0Yq(&H8eiF zh1iB*4#*KI>}}DM*@UW_G_9SCN^*OjqjD-08fqT3b}lFZYWtufhZ1C zf3zx1W$5gC&&1J6F=_Jo%(2FtY2#}VYiuG(!QZ*uZfki#xxksf_TI@<^@dZj}* zcfKJt+v#O~WhSx7xo1Lhp)?rRbV=@Eb zWv^XpasCXA&Ke-Fff0kfs&0(FJ>;`5vq;@FR@!&^6z#m%1w52WTu>n&5M@aD@!|2S zy9FJ#n)DrKPI}7mH}P|OJZ)T&V$E}Gv;7R;0O~3u=JtCN?YNoJ^WvJ8_|uMLqc)`e zub2)KmdG+1aaoxXa$&o%2U5J*FpJ%Q8^ZrGT8VoVTYTBl)k&}S>VAeIGRDV$z?-s| z6@Wih(Ve)CE{Us9y7k~#livA>{SxP0mri?h`BH5Gha3xGG(sOfW0HZ5Vd_*^E4}$@lE=JiyYCUdqr3JerZ{x1!v>2 z6Lp-BnCc5Z);8^&Nr;GuB;l5w96rd&^7Zpt+~wCJ)~MdsLv=#qr7r6UMw+^DFD_Tb zoXQpabTQOr*v+c8dvxC!Q*pfvP)TpAspKliE!In2h#_<-wjuQ@avdftWzR|*jAfKY6#0BdcRND1mUS z{xX-fc+o>B+$w08lN=oX5Pn|e^dN zdm{PekNjtbsu|JOV>`4sp)vBgMGNiPDS<1)`Jy~sc|PogSH>O%t;~pZp+EQ#kxVI^ z?Jg&wlZDM84?ZIApQ}`NVa>xw$ywZz`%A}KDdJ|W^=O((i+Z;LAMQVd`kfv-IW=S& z(zv~nTe>2%H43@KjcoQv7`$Prz)fWD&9LxAH3{0)77U6_X~mTNIkWKQsuNZU)I_^t z0x|^8F|mdv@=jfRtTqkNpf$1MDgG`!ah23}8aJft^k;UZ`|HAZji_|@7GkiA5!6}h z96vYoEXG;coMg|*^!0_!0RiZAe%(OLg~p=p$c6X^WebkE*ZG|pJ|m2LSjx_7Oj2k6 znkJzjw`+~kRIc(-AMGr{JHL zyf|JH?}t&-g0rLKC+;EjxS4atYL{E&wY%=9QpK9N-7ktnj2PD zd^ot$T}CAxCR)i7|(W+nga^!uMR4P-M;u;jO) zEZ4|JA51v$(-ic>m@UfJ>4tJqA3j`UQT++ze*~uQ)~30U|78ep9>S<;;r|R-@&BNL?&J0> z*gc@ORZddCNNMLC9>z|r=fjxZW>t}6no77={`J`sELGa>y+ zPyZpaoCYnIX;hi~ou`4@N}w;k=DbhSl5G?6Uw+L$n~i*+G9TjS)|Xi`PZ~ZU345S_ zjPcJ`uDKGyjE2%=f_uJY{y!s$asdqNooxM0BqdgW?yVaPyQRauGOpn 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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 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