From 608ecc4e9bb334364b3036b9ffe3f355b9ee6ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Tue, 26 Apr 2022 09:03:51 +0200 Subject: [PATCH] tests: Use `/bin/cat` as target on most platforms --- tests/data/__init__.py | 10 +--------- tests/data/unixvictim-freebsd-arm64 | Bin 4984 -> 0 bytes tests/data/unixvictim-freebsd-x86_64 | Bin 4928 -> 0 bytes tests/data/unixvictim-linux-arm64 | Bin 6008 -> 0 bytes tests/data/unixvictim-linux-armhf | Bin 2880 -> 0 bytes tests/data/unixvictim-linux-x86 | Bin 3012 -> 0 bytes tests/data/unixvictim-linux-x86_64 | Bin 4048 -> 0 bytes 7 files changed, 1 insertion(+), 9 deletions(-) delete mode 100755 tests/data/unixvictim-freebsd-arm64 delete mode 100755 tests/data/unixvictim-freebsd-x86_64 delete mode 100755 tests/data/unixvictim-linux-arm64 delete mode 100755 tests/data/unixvictim-linux-armhf delete mode 100755 tests/data/unixvictim-linux-x86 delete mode 100755 tests/data/unixvictim-linux-x86_64 diff --git a/tests/data/__init__.py b/tests/data/__init__.py index f18c749..8c0676d 100644 --- a/tests/data/__init__.py +++ b/tests/data/__init__.py @@ -2,7 +2,6 @@ import os import platform -import sys system = platform.system() @@ -11,14 +10,7 @@ if system == 'Windows': elif system == 'Darwin': target_program = os.path.join(os.path.dirname(__file__), "unixvictim-macos") else: - machine = platform.machine() - if machine == 'aarch64': - arch = 'arm64' - elif machine.startswith('arm'): - arch = 'armhf' - else: - arch = 'x86_64' if sys.maxsize > 2**32 else 'x86' - target_program = os.path.join(os.path.dirname(__file__), "unixvictim-" + system.lower() + "-" + arch) + target_program = "/bin/cat" __all__ = ['target_program'] diff --git a/tests/data/unixvictim-freebsd-arm64 b/tests/data/unixvictim-freebsd-arm64 deleted file mode 100755 index 83440598d373a33b17102b6913833cd46ab3fe29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4984 zcmb_gYfKzf6h5=VwhKi=Ez(-l9nl(EWlF^dKB6m>29;Puk~YR`&wX z`x7bS*>O7Eqvqif`^n8fJM-@0al6NFs2+*DT4?|xW$Yh89`*CzCgM}h^1Nqx-bL1P zgCfP>`dGBf+G%yKkM-19v2A85VQwH(ieK8?l(ej-M>nb#1SdCcTvcA=QHj_U7s0Fl z0$=kN_&UT5%-(b_0vBta=3zOkg4$)y`jGjgXZ3%2ltw+M#iQ3~ST!5|k zP&Ao{LpVH;O!USh{T4*h*3M`e!qIp%9Zttm;HVD{g*&X?Xew%Pe|x;FWT4(lEOII!YP zzkPTK3_hem=gYp3U8=#fvK{o>YyFT}Hy>^cAA-S=LZS1OLgBWT07e6m78~VsPS+<7 z;!$`lhVd5SR5!D&#STPU?4VZl%LyNJzKz(q?JYL;uku_MWD35jUuqDaEem}Xysly} zg6(42K99b0dT{bM<`bAtVm^iWH0GZ$|BM;5`)2TkVEgaon#^T&Eu-#)JF$9*v0U8G!&QUOe85x^rkynLSfa3YMDihd`S*!ZC^cu(n zHJGp6|I+S2zWI$=9IK!o=2yP(-fk7&5}2QeCU8II|Jlcx&CR$5nlS#5ogY3jp4G!M`Qa~cO=xOOtl$_^#TZvCim?)7oW?bB zX7l|M`Qfj|Z^Aj8E)=HwF0Xtw@ND?}*b+DdhLejM@q z@L}asjeUQMJ&Wr{mEYf}*3t;g0j$ZGYRu(?m4XU-K^@A{vzr%F8vkM zn_T*9sCT*a*HM4Y(WPS{zAwocw2>?1{vvjCo>CewF_a9bClt>Detj49m0X`?dpXN? zGA?J>EZ;BW+z~(Wj-K-wim{A&a`woX*2eAgbp^Jt-5(bU2`c7vLm_e=m9YI)3I%B8 zdkVcTDM?&%Z5-wCxy-4CDc0u-PWw~b{sq>vtQT09aby6spXgY+s?};w6JJEkvEH>1?o*s4h9^7tq zr%kLh2uLJ*>l{*DeO+(Q9bLEIerH!hq@liHEwn}BJFMhgMqAs)V#DJ0@40mwZmq|3 z%UTM{O!cMG$#kR(%xE0nuLEGl6KTs#M|#2R*%eRi>Ibto{)EXvEKGtfx;SzFu|VsR)|Big`Rn&_2=Tsvf$lmoPy2v5sOZ@V^Cf{-D4#{nk;BFO>=dna>34g2K zP<30`f2YzG9@2k7Uc&21Uw|{w` zOkE;>uZO>I{yQE998r9F{eQ@OSs(I$fc#J39WSpwiTukk3t!%!t$YFS+I#hb$fdCt zzPtzJe}e&DD8dsdaU4c2nFv42-&a|_02o;3PQn-L2o~IY`Cmi+@9^4t^=~|UxxdV^ z|ByIh>E(ZiIAPL%`F^hD3y#;`tN(yp>VG|EcM|@%8^kgXXHnAf7T<2uqwN2<8+7pn F{u5k4kx&2t diff --git a/tests/data/unixvictim-freebsd-x86_64 b/tests/data/unixvictim-freebsd-x86_64 deleted file mode 100755 index 3661b9d1ab92bdadd342b44c69730ea90c98e35d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4928 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 Hf)nw-v_$Li diff --git a/tests/data/unixvictim-linux-armhf b/tests/data/unixvictim-linux-armhf deleted file mode 100755 index c0536a918a8e7187ee7033edaa6e0dfab1a1255e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2880 zcmb7GU1%It6h5=rq}!O*wM|W$1{tN;6y3?BiKP_5G-*v*YKT>_;=^_}nKUceA7&?# zir9^fAS$G_>05NSTA^Sb@=#Dpq6L4DBIrXOiU{r|SxoGM!50fk*YBIzTO+ohCwz1M zzI*P^%(Gmig5wz@$B${yn$#oE2ykBJ15lU1 zzl0pI44+^gVGsS__mBJ7j~JnHPnX<5xc?H44+E_u@mTA~U}Pko936{TPGWe-$fS&R z4qy#(P+ofap2O2$563nE%+~`v1LiNk-?03_NAJG6vg5+#AI|1pIQwSr+stvV)Z7cl ztQFS2liY{kmDl~uCa4DB+co}9Kjl4jJnsRP*5n2I8sJWLixo>bu4G1RJ1x;DHK9yjxgRgy3MS}xxZvwz`_a=D51Wj4Pkh5TYL{NB!iXvE=5lNCbL@K#plnBOdxhWKmM?zz#Hqp;;n^bVhB24O z5pRx77{@VcTo`+7>_pzY=G6{o=No^*dNu4@%r8sum&s*qo`;yHJsys|miyp(Fnw)1 z>V`V!m$`>o^bzIe0q~FIi@p81Qg1$2s_vgG)aD7hpr!N0KsH}IgSif!pDo^eV?HFE zI8XE3QVq^~T{vG1;as)Oi3QfKm1m2;gLg-zuNm>Tzcs}AGXlXLKEp}PR~1ABK1K*4#) zG|njitpn^^_89vri}AF_pxJA@|29|jt#Uba6!9`N*SQMa2mk*H?=B@X7{3;b_jGsf z)msLfR3_u5QX`SR9vxSb<)k8QMq9hl_DJj%XV>n>Og*9>_ToB5=)26e4#RBUsdpHA zjCRj8+s$^pCGFUbJz`rKd#CI(QQxwySX{J+VOH;!nwpTdUaJjk3f5~|w1%oiZL8K4 z*jCl7J)}LViIEx3xQ=VZ#E2(d+ewR&Ou4qPuj^pMwT@T3xe^t(5VUNWJ$HcIQ zqeG6Buzgz8avbY~PgC|w1E`9MRw6!t*;1$y%VfkDNF@?>5+18ruIt2OqpqFdvHvIG zx5T#>0KDHhIQ%}9s5i@R20yVL&-*<>LRTbcezTMZ0mVy?;|CbL?Ow)zC?4-3NPNbB*M&2j;-*hs~aV>G9YLT>$%lJoZc-491j@OF0Dadnb?IdLIn- z71u&xoOm8!f6!)+9EG97UOO*b83NV=#N)+!c z1i(w9l>dKKg~z*%qIlW*I|q9sz<0+xk^e8c4tbt2dH(-jfB)}=khccz|0_V%;~hJV7p5bogli?P0_3wEf3xPm xV_XSqP`(3b^WLJ6_o8olPv(g00BWVZARY}^Y@2eRRXu9XsiYUYW#vFC-d_W}{zU)) diff --git a/tests/data/unixvictim-linux-x86 b/tests/data/unixvictim-linux-x86 deleted file mode 100755 index d1ac40656c0f47708cf7869d0b7655e8450398e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3012 zcmb7GZERCz6n<}aH>yl1IKRfC)f5H8E0~C0E~bgd^?7dhlKDZRCpq_= z_nhZ^ytn6lZ;!UMZ&4IQNOFlX!POc|b=N_jUsUqc39oRARiauvASz&@ukIKyU?%`U z<*=#XGWxKt8-yQxH`ZkOn49bnW5J^cBr{%kN`A-o7JT3$?FeFB`dtv00lo|$c>-%P z{j5RW2K+YECVR0aOP~Lm8LC2jRa$kEeejW`e<%D{{)3nw<;B{8aPQiIQ0+iCnoMbl zn6|zYOCR^P_4(a+milDOaxmWs_s8B@higfUxgAw6a4-)_-6Aiv#b6Kiz?{p(5@(-K z9U@+!*FN^RK?Jt%2qer2oL~!Fm47S!Eh9o{gGI7-VzX7+qXBj z1lDU$Fd4g7=AVkQSMHhQ35V~Zzp1nor`}fG6@Y&Xxdv9r*ON`v{6m{Dt{(qA|OoORKY9!<_> z_2S;H?riWzzCV{+_w&A??-A^OVVB{516h0U*ty4;eO+}Ijw5I;mm3~Ix!PeotYXEX z>S2@-=}~hT3RyE%1|9Y!l3)5YpUaw$ieXwD{8-U7^x4=?4=Iyh7tIx)I)PK>awpK^ zFGWt3A{m&y@E9S-o@N4(^m8X8U*a?jUZ21d@Akb5@QnTLvaTzQR}v3qKOx>4RodK)3xyW+KVHscigi)#>X!XY0+sQkr;_E*31O`0_cJ zyYmbB!}`TN9fchzJ(#b@L|QX71^W;D5F=j1WGy~de=%me(zfYa_gkjTGt}yHXWA+u z)J&UuNcGt#&JkseD~&hf-&q%Hy7mRS^DNiTdL1LYB)DNm7H#w1>>>Gntm~>hnJKf1 zc5=?y7bb}@3uf>1GR)ceo3_0dbH?dbR+Me>qG6uVQ)rd5@-1W!O^lHj)*5gp@S7pU68DxRmCr6+Y^o{oO!cP6*ZUsfQKHWTrV&!KRw|<1 zQ|?NN)}>|1RE4L^l{^v{gS9E&^mz+XJNJ$W=sW0>XI&E7v8hW*9c?&V37Nud;$Vt7 zj4I;{+=sk}u0rx|%0b=<`5f4}OCaw7lequW7zi9eaX*-Q#=8>tfqRgbdM70B86G&^ z@swyW)&M(tim{hj$Te6){olmxMHE885Ejs1p4E_h#oLPh?Fa# z^_j7F0_95Lp9j=EcO?%*Xl40q2L#Sf~z$7xG##XN)+` z<5f60hmwdTZ3J_ch~pfsfx?-Ub!jKJf;oHCIe!gMywDfc#Zq*D?*J3W`R#%IyDaXhE|ui(K8kv?LnlaGRlV=3pq5pX`}l4ML4 z28nAxz6RjllpsinJ2{WzZ_KNC6ga+DNfP%i49rIyKS~p~!F{*@$IsFva54v6xAc#o z^S59==RYEF6VM?XVhsB@2bOjDf8`W{{+^F(e#9k?_u*;aI0ur5A&-HXmv#9e9R}{- e_B#$g^T`<@t`=)a^hsteN!Nh;N-iLYA^izA=tqeF diff --git a/tests/data/unixvictim-linux-x86_64 b/tests/data/unixvictim-linux-x86_64 deleted file mode 100755 index 8eb8c2554fc4f8675f5fb8057def02c1af0da182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4048 zcmcInU2GIp6uvv#Evq7}hzg|%`>>E=(qU;zv;JTPsW6SJDJluU#@+4yunYUs?9P&6 znux5JjtjDnL|^dD7Zc)xH0guIBBf8FMkLYbhS<1Rh&2K!7+BA_b50p1G$baTWahi) z-1FUY?wNb%&b;$dXq)142^K}XAW*BhHEFW$Li9f*Rk8(zS7@S5tP;&&@xZ0Y9z?6f zI6*@*ddbfX*o19`42oto2-_`9Fmi^781JrV)U+^;34t&Q;gdS@uq#FVspg2ZGtN^0 zFXux%RFP68UX^%^Cy2+$^TWB})lTEJD;j91YY4(G?{`tw0&M*=MjYGcXp-kVn)GB` zjJE@Ll%n*1(2eulkVy~rbZ^MSJ2UBAX}EJZ*wfk5trqiYm&|_!41~{W`>Q*}Hy>YX zy>fH!?jr{u`{mU5{??Xbvp4xUA}*B97M#i>5c#roKd^}$-+jE$w){T!wngkB9Nv@7 z=fXuJS}?+40n?7*EPF&TlSm9fH(IDW8%^iL_E6u8Tf<#ym%2&DQRMtwFpE~u@j@xJ zrD10%qRUc6z#EY*d={8HOF!9{fWcm;T{b(`kVP+F@z(c&R=B4YtPERJ2 zNwsCodpIYtQ!j7+)#ZZ$%o$_(7@9CQ@0X(xXSz|Fp2TFvo(H=*Rljqm(KtL&y1sjo zbN(AgvyG>l8UMwQ8TZ%pqn$CAPlS%H9Y6qkJ!BgGxsW;HpV!R+Kg|A0FtmPVi+Q`x zyrG}I?d~&wtj8dPe)y`*ne{N~4_*pMc!klLdf9RC~Ka?`#Zw*!A z{*@tU`9c-L-w~>e_yaJ_ASbv`PpIHUSm}CszG18y$JY|oZPp9Vp#t@sZRP>YiMI-?1?}x{ zeGc3w(V=&lT;gc&hHDJ$_H~P~LU5e~y9p?E9Pzy09A2hvD=#^weCR&fgvPr9DM(?9 zQ)fFaTom44OD$C#cWbisDCuMLUgR*EqRF1?cN%$Yq!bNd;jE}D8mjVLjyS4l2;yOR z7jWuX@(AHd!Y2qBc#j5Y-*Qa?!1tLZHv%Q~mFZFXgK4w{m^2+%H$RFw^ zbrYT} zp{8?2qA(=XT;52idvYapu#|>FDIFJ5OGS$*p~es7iU+b58U?Fof1*%K=X3WcVdyI) zGEpQ@Ybax2kTl$l#4y~Gpa?aQ3MUKEY$BYB1BW%C#*BQS2!Slv8-q?5E1FHmAW$CY za8u=&gGKO*<+IsD&TtmvKj^sr@Y(XZ5{d>I2pMpX+68^>@;E5=Gp1e9WH*0@;J&pB z?;o~34Gj-m9A8s3(1g&)zRCKT25mo^$f8ULkNFVGWqi z`*f5H5prw>#JO{P-Y-G0;T~mvUC}^;6O;_R&!rJ=&iZL!!#&1)-dF2r<8wUDpZyqL z0Y2_o)_LCsi0^}b6leaHRfqv-U@e)??}>im^E^2|=fn1-gU|1s6!G~zg?xOsI{8Cj z!!y_q`vL9z8u4qyzkr=KVIG@C zpke3pIWa~BTgHxr9G}gHh|l%s?{5Ac_p{?7{HlXLN9WWW#dp3Vxc)rsN5rS;!v9J{ zcJY6UbG}agCk{S-X`u|$1AP$xQ}D(5aeVyDLK!8#GoDlb41Cd*`Fu|B|I-P2e!RYz z&v|_TTzh=}o(_;B`-7Vl))~jaYUlGg9VCYi;xRCf@eFieoAZy*IUgYh&eO?feHt1V dKfne;<}ddCrn20VyM2feivOM62yN!E`CoV^{*eFx