From c3bbd129abe5fe3eb931e0191d4adf3ed0168712 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Sep 2016 11:55:25 +0100 Subject: [PATCH] Add riscv64 test binaries, and new tests of guestfs_file_architecture. --- generator/actions.ml | 4 ++++ test-data/Makefile.am | 2 ++ test-data/binaries/Makefile.am | 2 ++ test-data/binaries/bin-riscv64-dynamic | Bin 0 -> 10728 bytes test-data/binaries/lib-riscv64.so | Bin 0 -> 7208 bytes 5 files changed, 8 insertions(+) create mode 100755 test-data/binaries/bin-riscv64-dynamic create mode 100755 test-data/binaries/lib-riscv64.so diff --git a/generator/actions.ml b/generator/actions.ml index 179902efe..9053180a3 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -795,6 +795,8 @@ to specify the QEMU interface emulation to use at run time." }; [["file_architecture"; "/bin-ppc64-dynamic"]], "ppc64"), []; InitISOFS, Always, TestResultString ( [["file_architecture"; "/bin-ppc64le-dynamic"]], "ppc64le"), []; + InitISOFS, Always, TestResultString ( + [["file_architecture"; "/bin-riscv64-dynamic"]], "riscv64"), []; InitISOFS, Always, TestResultString ( [["file_architecture"; "/bin-sparc-dynamic"]], "sparc"), []; InitISOFS, Always, TestResultString ( @@ -813,6 +815,8 @@ to specify the QEMU interface emulation to use at run time." }; [["file_architecture"; "/lib-ppc64.so"]], "ppc64"), []; InitISOFS, Always, TestResultString ( [["file_architecture"; "/lib-ppc64le.so"]], "ppc64le"), []; + InitISOFS, Always, TestResultString ( + [["file_architecture"; "/lib-riscv64.so"]], "riscv64"), []; InitISOFS, Always, TestResultString ( [["file_architecture"; "/lib-sparc.so"]], "sparc"), []; InitISOFS, Always, TestResultString ( diff --git a/test-data/Makefile.am b/test-data/Makefile.am index 93d094a4d..86cd5a280 100644 --- a/test-data/Makefile.am +++ b/test-data/Makefile.am @@ -41,6 +41,7 @@ image_files = \ $(srcdir)/binaries/bin-mipsel-dynamic \ $(srcdir)/binaries/bin-ppc64-dynamic \ $(srcdir)/binaries/bin-ppc64le-dynamic \ + $(srcdir)/binaries/bin-riscv64-dynamic \ $(srcdir)/binaries/bin-sparc-dynamic \ $(srcdir)/binaries/bin-win32.exe \ $(srcdir)/binaries/bin-win64.exe \ @@ -52,6 +53,7 @@ image_files = \ $(srcdir)/binaries/lib-mipsel.so \ $(srcdir)/binaries/lib-ppc64.so \ $(srcdir)/binaries/lib-ppc64le.so \ + $(srcdir)/binaries/lib-riscv64.so \ $(srcdir)/binaries/lib-sparc.so \ $(srcdir)/binaries/lib-win32.dll \ $(srcdir)/binaries/lib-win64.dll \ diff --git a/test-data/binaries/Makefile.am b/test-data/binaries/Makefile.am index 094cb3502..ccc7d0046 100644 --- a/test-data/binaries/Makefile.am +++ b/test-data/binaries/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ bin-mipsel-dynamic \ bin-ppc64-dynamic \ bin-ppc64le-dynamic \ + bin-riscv64-dynamic \ bin-sparc-dynamic \ bin-win32.exe \ bin-win64.exe \ @@ -37,6 +38,7 @@ EXTRA_DIST = \ lib-ppc64.so \ lib-ppc64le.so \ lib-mipsel.so \ + lib-riscv64.so \ lib-sparc.so \ lib-win32.dll \ lib-win64.dll \ diff --git a/test-data/binaries/bin-riscv64-dynamic b/test-data/binaries/bin-riscv64-dynamic new file mode 100755 index 0000000000000000000000000000000000000000..a8b4baa0ec221868ab0282eac96ff76c8c7b40ab GIT binary patch literal 10728 zcmeHNYiwM_6+W}q>vtTlH^E8M!Ul%|6}w&>+u1-uHhv^=8WxwB{H?%kuicleYdX+HXpn0h(r^5RDD?t0N6ic^eQaSzegs1a;G zuDB7$wKdbOebna)1U4Hz3$Ov#w2@EyTz!EnjGjPOO4=*;xzws9L{A%k&l*Ubt|n`7 zoWg&$%e51D3kQTIu-cCMi*;x*#Uieqz;{je0>zHIXS;pIZlAFe__VPTD0$(W@HJ=R zpEG$87=nyjNZ(yuM#b)21GS|#lHEf%$qn>W_<6Stsg^l&ejG=7p~u!_o1SQaU^*ZgJj!` z+of`%ShjPCOrCb`9vd3A`yzc&sJjnRAp(xUOh=k~=rM%j!yDwb&L~UWIqG6A|M4E8 zjn?zqt>>&4gVylp3r7L357PY4k5ZaCs5^ojT+{JF+UlSnOdfxKadF{@$}KecsTgss%2mW)~ z1(jOti5{W(m(-D-{s1MPXrh0-ck0uHrcUZP@&4RAWL7_7RZ4L`XEp&pcKogRO@2x~ z(u6oqeR>9QFC1^8H}7vctNp>xJ9ACMwrp2;&;B@wakD+>&w64OTgFD|B$a|%ay7pwq5n~U#EgMZH^~fTYL+xehS|2r-hbATEJwR z-_$_Cds}G1--?)8Y2lt#y5C^KJ@n?o8y3;Oh1jk6{v$qXv+~VvKBBCvl$yUv$JM~` z@TJySS0fZXZ*M)jxEKeXU0hte5%4p>6M)=!ZgW$I$4NCSwQhwwkC^{eTx(z(V+GT$ z0PM%r4j&IPZ=@r>E71J?K-Zm90d;qv<*q>Rdx2Gl1FL6Qs{N+`xo-^bd^?|k^BFjw zf%6$SpMmokIG=$p%)rT2Zk3ufPz45L17*)U?)s} z!WUZNmi}6dozN)T^mwL>J<2alOTOMS^sPp2%)c~%{&kZMPMdyZpSp8+_^Qxl*kN5B z8i;I+M5&4~7`YM*eqwIcWbES0gMXWoNPUOv{kL$n#?7X^ zO&#zZqc(N3?;hN5@y$a>?ai<2`(JT4<6ps+9T&4pJ8NuZ6QEA6>_FFib;6b(R^W2n zx;W4-jz`}p_)jp^6&CKn0DFosN-Cf(=?J!29qT$e@vitbP+QwIAn`y9iufD)$?CYO z?drC%;I_3syc+(m(-`kwtE>a6tI6x(f{Gb@EV=VX)V8&*!%Nq)U3|^sLu(ZrHu@_T zK19>B)GzYbrfvYQ1-xcA7FKD!@2El)L~ZvU#o5D}hlUVd`$~+016<+8*%6^S9TKfn zYAne8cCN=@0;|=fI*Km89$j#$_ibyp@WR-KtAQ@$fh+a#2P+upB!WSie5M>pLWb7j z(+`4CrLKcY1N}pwY z(zPD!56|Skn=jmv4`(y^nM3TYS1%F0nS3%klX8fh>}1#s12LD%sgyGrnQ~W)7N5Kp z2Qa*M&7$xP;GY@X$|+EtW`45dGK1sAx7L7;8Tta?TMW+pkt+VKB^z1`nauYKfy*Hm zlA0~#)1jGsDU;4SsSvLmrKv)(T#v;%&4!bOJkE>qqv$Ddc57vjHwl_DEQ@CEJ|%?or06Ciu7Gxfg$(51CT?QlQvb`{LeAwoLbaWR zl}FCeYxx#Q6;R7>!1n}RkZYTTFA4J9pju+#gjwp;T7DBreOk+JuGF!${1&QL|5^Cz zB6VY}ep{s;t>w3q)N{4`6_xKhwfv6C`F|~cB|Ra_XqCW1g&=i(6&q)p0g`&YmfuCY zOr2lL50ccIwft2?rY^7Ld#iX?YS9JNY8Bif{IJ()R%KUEE41)KQLkAfyOmn0MY5~$ z@?|%(#6JVHf!<$S;H^n|j)eLB=10`937-kHzIVSi z0=`1eGS6kUU$6PgpCec2?Ej?4|Gip&`F!{>`1Qv1%sKey%ENQo|4Qn-Kq3SK?f1Cq z<%ebU`sG?!(en4=12({X_Rd=_YVj3f+5BwRVJsi-MVi0-J?hhbR?!;IeBK3q7xF1( ziIm|9@I!c$yzA19;CJHmKIHLZYyNWmEcgMRML+edW3$Y!@-O|K0H5QL;!J*K&g$$e z@7FQ<^1V2w^N39g`1Rs^(&)cp=8x1xMzQi*Z`_6$s&1fo>1 zrxN*87WGnX#b`c?R_ZX@o+y=!o&H9;?5k-!UiI13w)bBNh)icuR+gPZxI0tkK~JS16^bHDPlO^%6NMtTC83566S+(h&I@pX z$(F+e0^6CGNn=JO@@dRWLuT@m1;G;&6Gi8sP`srO9GMU_TYzKNmGM;la{T`||HAQ` zhMm4{QeVmcH{^dBMyz!OXV`;_k4D5^>aaP(2tiieWIYld|5JsH2$iEkK&*z4mX z=z8Nh03M%ZioMj6&1OJR$hff`$1e6bz0hp}cUBd9IX{gV`^#Ll%H2Eu+aSR~VI_X4 zPj5B$GG2*a`Vn{s?D_0dXsKhTjD5)T?2X^BiR%mQW5_U0m~+Y##$LwB{iAAJHvR{| z<1sbj;wE+RX=5+>bEW*-Ze-@BKM{b^6aBp>4MF=H>|m!k*y-;F$f(f8Uv z>9Lo3{0YBnaiD9>NmPXWOpTxI@C-7f#%@#+gL@RzV%S!FMEQk(ZYWb z0#1=hSEZia^#%6g?{`4>*@?aE7v%p{Pn-Npe*)$Cy#m|n{ww)yz7&@7Lk6$-~B;kBh6DhosLT^zvALUzckY z_6R*Bj+5)#--XjoZVz}2JS24+`>3m4xi_1w+$MQ3j701OUTo|uh6dSYwsym!=&=`l z9-l`=i;kLw!yA`ZHvny!d*YMfPeLwrwa36i>b^Zg)P~QR{@0j==^}79;*xnM>l%MY Ss@MO^e0q%bnx{h#N&g1rIN~P& literal 0 HcmV?d00001 diff --git a/test-data/binaries/lib-riscv64.so b/test-data/binaries/lib-riscv64.so new file mode 100755 index 0000000000000000000000000000000000000000..764965cc798237e00835617d2fca52dda763b516 GIT binary patch literal 7208 zcmeHMU2GIp6h7N&+47^5Kf(VAV8lem@=x$(+htpdZ84=JXf(rgciOJ*kM2yNB}A(P z+wg>zAc;hHz(@>eUowoXox5o4#JA&TouAL%Jo=3LMdOvHw;Z`V#7$nijDz@j z;}O$EtQQ%%HzzJ#zj*b%13$gK`w@m`B#k{VZ!nTzI+Ot4#Pafh4zYy=9ZG;dIs=|! zyn*IZOb-~dxX;5IXj=$>RpDWKGTXX4%#>ZQ`_hhU7rHy*nS9Rfwt6zQ-&VQBOb%LR zZ#rjX()-zP`(Cq4MTloC$FUvCqw)0FKb&u{nSTpUO2OHm_rR=w2)}1feCo-Kw z;^e_ib(B0BrTpYCw^f|;R}V+;BDTa4fAPytp1jG!P^Ib!R7apX0@V?yjzDz;sv}Sx zf&bYEVE-+9Z=nZ$M%ZsZtaO}}9#T5?-8e9z{np*7yqFBDz}Op)s?D~XyM#Vd?Q?vU zMiif`_%g+#if>b!a`baX;j=^bcc=XRS1J1`rQ<#)mENG*|5UnCRkZ(}aULEaGS1V` zXX35#_!fN?pKzbjHyG=TMhXBMjWrD1n>0RK;XEF+*7yX3c`C)V;{252wS;*r#p?*; zS&Gjh%tI+2CCq0jUVgroc8zA!<>28{hssUl+W*k zhnJ57!xiIy@7dp&3fE_@d3gCe%HcJ_;~$>)zdXErerNLyi2X914FdEy<9a}c_$=d< z>Nd@cFNaZpzwFtU*K>Ll9@7KHEan&wL7u_eGvJggxQ;u}+iN7bK(jsGWwy8N>^4oB zE(w`#)=WxK$YG0A-t5cdd#sF^a`Oepv<3z#na{qKv0Xc5Y}mYRO=Tmg6{St9P_Tx$ z_Tv_YsJCEcZ8J5H%?`0kKr`9WEivU%(&|FmN$%aa-b=HktEnSlCOWrro_^9we!go* zJh63GSAy@N^SP$hgxTHH+@27tl#@66tz1gVT3cV}Z0cx>Gs@*I#A$8c(cIK-?r3S* zndmP1{Zn-eWvyT-EEWq?wY(}fzTAM( zGmy@tR;N?sY5kVdPey7e$DTfS3x3O9yWphrxe~?Xwt}6p#DNUg9(2jD`~A5fV|p6M zn4Uc{UP-bWdsx|Yk_9R48GU(nuMC9_z3xcf zcenXl4*y|(4urt*oy2z@`v~8P>v=55-UI&FpMd|U45eSOfj{;sF~%e|{PCRx$Nq** zJW}aFrEM(n2BDZgzNg>|l_l~=Kj6E#UG_fE@!bX2mA~XKeItJbQ;G%Ln_&1pgP&1` z=pX*L{~WhVTwvJ$TqYtiQp&{Fe9TfLU>0fd4BXUuhG9 z4t|)i`F!F2uzxrrL78CZYtuULW85J5!yo&MEgL?W-WjGW-CGj