From bc6f3d5cd9b79970472f067d5f810c431cf02101 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 8 Apr 2014 10:07:37 -0400 Subject: [PATCH 1/2] add `ant javadoc` to generate javadoc for FDroid sources --- custom_rules.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/custom_rules.xml b/custom_rules.xml index 8306b3fb5..944377a7c 100644 --- a/custom_rules.xml +++ b/custom_rules.xml @@ -12,4 +12,12 @@ + + + + From d813f1ec173e71aec5549b3ed772a1cb0971e224 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 10 Apr 2014 13:05:59 -0400 Subject: [PATCH 2/2] run JUnit tests using android-junit-report to get XML output Jenkins needs some kind of report from the JUnit tests in order to tell whether the tests succeeded or not. android-junit-report is a library to do exactly that. With this setup, Jenkins should now successfully understand the status of the JUnit tests, where before it just ran them and ignored the results --- custom_rules.xml | 13 +------------ test/.gitignore | 1 + test/AndroidManifest.xml | 2 +- test/ant.properties | 1 + test/custom_rules.xml | 19 +++++++++++++++++++ test/libs/android-junit-report-1.5.8.README | 5 +++++ test/libs/android-junit-report-1.5.8.jar | Bin 0 -> 9202 bytes 7 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 test/custom_rules.xml create mode 100644 test/libs/android-junit-report-1.5.8.README create mode 100644 test/libs/android-junit-report-1.5.8.jar diff --git a/custom_rules.xml b/custom_rules.xml index 944377a7c..7747834aa 100644 --- a/custom_rules.xml +++ b/custom_rules.xml @@ -1,16 +1,5 @@ - - - - Downloading XML test report… - - - - - - - - + - diff --git a/test/ant.properties b/test/ant.properties index 16244024c..99458bdd5 100644 --- a/test/ant.properties +++ b/test/ant.properties @@ -16,3 +16,4 @@ # The password will be asked during the build when you use the 'release' target. tested.project.dir=.. +test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner diff --git a/test/custom_rules.xml b/test/custom_rules.xml new file mode 100644 index 000000000..ee90d3fac --- /dev/null +++ b/test/custom_rules.xml @@ -0,0 +1,19 @@ + + + + + + Downloading XML test report (/data/data/${tested.package}/files/junit-report.xml)… + + + + + + + + + + diff --git a/test/libs/android-junit-report-1.5.8.README b/test/libs/android-junit-report-1.5.8.README new file mode 100644 index 000000000..a89c98533 --- /dev/null +++ b/test/libs/android-junit-report-1.5.8.README @@ -0,0 +1,5 @@ + +Needed for Jenkins to get JUnit reports. + +* https://github.com/jsankey/android-junit-report +* https://github.com/downloads/jsankey/android-junit-report/android-junit-report-1.5.8.jar diff --git a/test/libs/android-junit-report-1.5.8.jar b/test/libs/android-junit-report-1.5.8.jar new file mode 100644 index 0000000000000000000000000000000000000000..09e6a2d4f5ffab82e583fe6fc7b327ce6626e95c GIT binary patch literal 9202 zcmbVy1ymhNw)Vl@B^=z{-5nC#gF6RzcY;HZ1b2tS36?;BAi*uTySuw<{@l59=f1gb zX5Rl^_3B=`*V^Cys;X=4u2uU}Re*s-2K?3>MARhyX8iqu1b_u7$!JQj$SKRRy$k>V zs(*Jy1la#_^>29V`yH1lGp#7o1nCS#q$3r}3vJgi1Hj!C!?QOh~j;AqMY70vH~3G1$V2 zY23<@8RAKKiu%zN2GSTuAHIi8^I&s(p0P3qyCADh=Fg~4O$u*>b!XzRx%BfJcTl+= zu^4y~dv#@&b2+}_m9Ek(;tV^J1YBqk0NCW#&D!}}?z zwgWTt;mw;U8$##^Rf{*(C0l( zTd(>eIVICm&ffGA@6Z%KU4^sbgA6*&feLr>oi(u(*4PuKvGO_zUk+4+u|C#L_ZWD3 zs*x8S@A);^?%$+lo*PWA$RiubmDYUF-gS%lWY2odou#LrG3|<7wgm1^^zNr zt~w99j@sCP@B7Hqn|e%*Yje4#kI}@pEn7D8=5Y*@Y5@QJJCcz@g|ZV z8OY9+Y+%>Tm$v4@)w;6)L6<8SuFNgcefo+mvgA45G0HCdMp9oQMpF0?9cWj?7lbAG zC$vI^JB*97J`g5T8Sqto%srVZrs})yzeatRGfo!B0Ham~A6eY4}edYp$^v(=wp$3!a3- z6P}Bfk#-F?rg@#eiB_CE{4C1i;KeA#>+uU&7_!`bhiv)!wJ}KcQZ=X&d z2SNRj34c#HC13loh@b(0W*7kA&HtQo<7lPr zYV*tZJrR{?h&fG)69=U6yKqEAq=rSPW6RSk;jE7Z2j`>0Qs9M$ywR7=U>zAZ+Rh!E zw=~&NAm^xN_k!vk!)SlCt`BH)(-5aX>Fm0{yf9>>XKeCq%tA!C)ZETtA07%{o=j`Xdd*DD@Kyi zwfu-4Mo%{=zvdof`X&@c z7pPs#!ZNJu&HhN<#mNd*owBe)1=>I-Ze4XrKZd+X#Bjs8TV)q#wO5?iadjaXajJdP_KNNQ*?$-PmSPnLR}!lj1@0~^JnSf zvSHQZ28c45ZQ#J- zpjb-pgXljMvs|U-80zJ;bD45RW{W(4Y5Q~ zWaBKx2IsO?f(*lB*bs$3>%crry#vTE_Ll`HUt{WNfCT^)Q2_w_|EC4``-02SK{C;t z^=Q#1v}u(k!-T;mXGeWx*NYgQBey4rhC-<|i36b6$9x`7BS@FYz3RR;?0F>2B*!s{{flhQUXtmeUot zQ=!`ypZnv_K}k_>&o;Fz##Kaci};FfxEKOYz{cK?kd?7L^TB1e`=P322R9h_AW&NBr-m5VbA#r#lV8F*XnTtJ=adP}I-4|vY$+tqq(;3^aYV&!<6TNi z6)viq+cnnVk%B%Yz2z3pb-3E{)w1=i1H;;bXL@n7HcJ~j*Q8CkpA%T?j`SFKt-q@k z%~}M$*?fCnZ*x`Fo3%uIGp2MEk;Uf+$@|uDFNgvB-qUsbT}yTao2cGqNv$Vmsl?@5 z);Dd(?@ms5$rMr3q~L(t>h|Z?$nD9Zsudf67{c}bSKiVC?<6oIxJ@`G}m99?kz6`@k|!iYjTzv-_N`F4pI7NFB&NH2zBfy?|u<&u2$>9IYVxY5O5=EZT#dzKJM{Mbb;X}SuVfyaF=(zK?iG8cbI54CB7X4c5WR=e-KEN z*9VZEd1udn3G(xjzqE{J@fL=NoTeh>%s1eDwNjCHx2jC22+vWX>dC5lUk44tsyV()S6v9Wn5q^%Ju$-z?T3|;VBmVAF^omX=Y7d3O zSrjb7kt#S7cw}140*r{)&tRPGOXN7z1B<*Mq2+n6L5s5;&A0f?E7NN0+hPhS??=%L zSJ|5Z#DOr-G2f{0cs7L4bVBPV_iJu?-mM?RTQg#P=dlAJm~~{MKYktKt9*yyxE$Pc z92TzwU&g?_G@i{yr)wT?DEF%IGo#^It|)h}k5+WZY8fXoJ9*^XnHS_ZRLX|RlvKV1 z0~VAo!#u@2wGbQo$w1#MHC95XH*Dei>0)zNWYJC(o&t@2w_}}>;l5$IZQ?XUgjU^AUjG$+1_fG@lyZx@X! zc#<;g7rG_6Y)d9ycSd5dNhTn1C2>U1?8r`)T}UKU0z*UB-33$X>zKFWD3|?iOEe;> zUGa?Yz%5_uw@~-s=Ck5-h!5Bu(p4WCRxs&BSgMjrz?Inxj{Vz8b+^m8$`VK>Wc0z$ zVfg11cuD9BH}*o?;`WUo)GlB-i^@Co^sdn05$0n5c&gpPep*}nIbQg?NG(#oj-5&9ray6t4C{z zAO@FYx&0>u|1>h${QD{Pi_B3goR6dGsI?<>3TEOfMeuke0vGCCAsMvFml-j3uFK2idpHS?%&_xNi|$?f2UE zk6lGj*#$}TJ%k+k*2tlBq|Zj#+{72drjN?shkfwR@W;o~TpdNA#tsA=KRl*(@(F^?ot9$|*b*_#yhxEgEMzr{{>nUm^ zZ|n8PXp-$CDSE5^9S>sOhgR<~5etn9{)Tlr2#P`yPP)0molJ=lR%aAh?|U?)4HIBEu?SgUGiF#dg#cq zMeiMl5El>Ey>zgpT0XFvII?j#2VBR-Ge@jIsz}2A9F?QUn?aUrpG)dkzs)gB#-@|e zq*srQMo2YKiWlY3|0RjoI&-_h^!Uht2%)->~ALoO$09O2ROdEM0T8aW7h`E5zL} zrw>CoH*4B|pT(-OQ$ot76%n3c!qVP!StI=-#_O^PTr-f4!6yrDa|UJ-))}j~y6wmI zY+l^7Kf`^dQZm9wL~^O=TdNeL@ET}fZ6JMROO*@s%BvrBAFNsCgz}>7_-sa>JA6cR z%4r>+ue1?j9M&`%WJACO25Hc0go*{}6S;-626W`NP=-ooSYlT7KEj!QGytJj4796u+{O!_sRyc?h}C-=3+ zLAJ$BkM)ARt@}|98kbWF#=CvpfBuvb?L2KBFUhu_E-%b_NfEt#_MSmg)g!v@i#Q)uKKuy==dup&W45l6@9UJm=#9}Lodwp3czf>1B*&;1(t)4)ye_Q@-F45QTmYG8t9J;5 zZAJdz5yExKVMRPj=5P0N>hpS zvqekYTXo2FJ8PQWmPuCbRylFU!sczEfV{?t`f!!_rcEZHwV={UJM*kfCO)K+UuhDi zE~WI-4N}R-D^=D4#^i4aF&mI&<;C?0k}IPHC9er1eosW&?)5n~vl);2!Yi7Gnukh3 z31cYs3R`2DO2ui?zW1(Le$YH=Wg;By<#K7RM+&{Tl_+@x<-lrncdF+Vj7u-)suhh!>3b%~1XF2=WNrHCS&nfvjEeg&g3(@* zY9~+5H#Pi1goD-eJl`LX2*K<^Iy%;gc{rm%O5xR%u{%71&g8IF^mhyOw-ghYU#<~n z?h&=cLU^LYTi_*{fD(;pT#qK(qB@i>czyx(Gd_!n1FqBv(tUjEo1DJzEv#3FHQuR0 zxdD^aw-CrRwgVb0G@2FU9u-by($(9h$0n0O>aK06`GUBTkq*=@KdY-35MQM^ypR-S zwphVapHNEA-&?)AU)H)5+(;M+P_61g=mT)gh?qaN#8i>(-qNk#mRbu^y6~ED0J3H} z%i_*JuPT~IR}OBjN z@cDxRtTs1&K6_6Ceb9F|efF-QxqYhoB1!a@U>GQO;q1AO zX>6G(6YK!8q3qptyo^>hp|Ar}@T&d2eV|r8Zuv@n--$u1PnBQKY05%jPicu(!vj{% zfD2EkAD1Vlw^|&N7gWZQ!LF*4Z)ex&9S)J_%*LvXAhLQ^kWFEa8#z3q(*x!S$l}ce zzM8F{#HUO505XFajdn1eh1?aV@HKM!ftH@~YQgo@E-v^~U8n`#=?O0C$5chH&gh9$2_L5ub%3iBJIoknXBNsxmx#=r_^}zZ(wKKl5r3in*Ua83% zpEdk5s^?2~71)?u?uB!de{lU)o5ay!_;5i!2<%=dc@_9tSA8rqc*-lsdg(yA2>YgkK(b2xvXZl1~g|7pH&x^;*{Q)V{KlcIdrll0}APiI| zAt-?`%S@r?QhjBngP0PJQzk`SLMxeb_LKaG7m(GJN>Y8nC;W+S^dQ1g_-*}zm?|R9 zV+KP9$ek%|lEgsHt2!p$1#Wrt#NR$*t&eQN7^c8nnHQ@fez#gMzCjf1DROd`uNYY7 zO6dw~XJJpm%_=6R4R4SL=b#voTWoqNIy;Gb$n@Gs`V{)|WWQF-BXuL;Yx0+BMsKBR zEWaPa)5Twv?R?%(Ow4zTL->0GlSj8O_^ZDRjBL4~R3#CMl1^av`#`abNHqaWC4@=d zPpR|Fjx*;0_D4=97UF(q#8_aYYu5>s_Ut^6A4=85cu&iw-mC9a z9;VHVeHQIs#;_OTo_)wny;d#v$wc@4r;oY7eKb$cs2sHToWuj8VxJ3O306jp|5Gwu zetuR&hZRbK_DSzEHG&+5E6lm1cukn)g?c+?KCNRuz9aZ8`h=&EM8Nk%cyBzkOTvZG z@_m4!Xt&)y{kO54@3|*CXzm!sQnwd%?uk-9h#35sHBBhIiIqKbgUv`lTt%0rODR+%5!y|5^?N#Z%iE-ntYVqi{2=RXT z8EN#DmakLXRb$I()RoQ3B4q$i%F3czQ_E{L+ZC_Eii=j1lD0HV{%C@h= zE)-u*m8V|hbnizS1O^c|TdgUGd|ojA`N&X*`neeu9sp281poy9S0^@_AUAh)5654J zhJQb^d8@CDqmBCl4-MQP$CQ9`QqxC@&XjM_tgbhJmZ6%%tTwYFPK1(80%j{>I+R!5 zSf1X#eT4Bpmso_ZYI;lNQTb9V>V7T6B^CAVZF7z5$h_ap%4%zl$mOh9&=Zo$t3afD zG&daJu*~t0GbQa$kZoWbD$JO%ZV8sx&({pmxgj6Dha{xEZ@;(+IG~}hY zD9b9#8bwfaC37&Cj3Ag4tVNQv`(|T?$cTZv10|Rzq3km3=k;5bP?S7wS)-dIR$ z3d+z^2~w8~H5n6U%vCH+%vnCCP}$o%mo8i7TAsi;J*LhfJs{gt=qBrN$PL=F6}}kC zBREnh6?~+g+QRYem_Z#*{34XVaapY()68Gir%7d(;mhk;Z@pJvqLi6RBIKXFTkMuQ zYsSoU!CJ08%8~f)_4Qt@P8QwdOhs~uWo-zojWi-L%Z~kWN|h*Na*F~fWxd`MsnwB7 z!O>8XuQu2$Fgf!8@)3o0C^nPmEsNn8>7;SI<2S{xrSb z{T-|u<$)JxuY8C}It`ie=J*Wc4Svf)B{kd2(>%!SmTBwmTZ6rj`t@5amh3`0W?sS0 zen{eUucl@1VN@A|m(xJ`Zmsg{Ovo*Eeb}NrChvVU4d+#5LMuy=zJpKXSWp&()I1y+ z2YV*$ku0g`T?yV^gTBzGyyI=obk2Jd+FdPvb_@K<*qxac(0t|*E|R)4fCTwwod)i) zXCj_{{MBw%Ib^qnGNR5A?P~!_lL!`L%Axq14lRSrO&B<`4Jrx$iZvXA+f5C)ymhy} z)B9GfGq_gGFR#U?buQ5=Og@{?n}d`p$m5M%obWRnY}yUl(UkOdl5?kPP$z6UNvax2 z_T390i+X}BZi0D9s>Uy4pt`FDl6D;f&!~32AG}hPLw4mM%I^2)DIuTF~Z@^GJ+8M&g&v+;iJj@-LQbtoC6eL2S3eH1`p zp$jOh%<848EK^ptg->dv`hN9L%VO$d*wN~sGf~d%socz8eD2E|CNf=Exoc+O!3<46 zEK&|SqJ#cXzhC1$+^GP^peA-25}L@)z_5?4mlkc2G3Wik);nOAqh3VoiSi6CmoIg$ zBdJVlOx|MBwZ7Y$meg3Wo_CnIl8J~N*uj02eyiFoJC2*xs<^IsSAFpz=nOZ50Ei_8 zRvs2yZaHgO7^0W%>*-}iA436qu)bwoiv^b{jxa~@4TMaeWb3V2l;Jf_UnU7Syjz$X zdgVvdCV*Q@9zsuTPp1{EHz72z=Q|-ZxJSOP16+Rd5YFj~wr>c!vYjBd9?7^Jn7{SD zGIHA8bGvySIVokOqnr&b7VJ-Jn3dTfm+|LSc6v(0F+y)GI*I~Tg{Glw#4TAn)Me*87jVq>|`R!7uD%mC7vnnoXk5xj;{`tM0y3|FZ(Gp`#f?mZ_R2eAg8&q*4jyiei277( z$$0%Q845_Q=qxA+bzJDq4|mS7+rByd@|+%0v9vNH?8+Bj@KjIlg?iRK2>CvG78)PR z?#ZwzFYlQ?;h81+`Fwe!<>D0UXl0GyKinD#S#WNi_rf@IOcO@LCi?M(TKA!lV|Ek0 z(^30d*w`LLlm^*zg|qVK>g<%MN*OU9(Nf9R!cU%`D=q>mtmJu@7);*^Jzau4l0}Hg zuxSEf>hS506LjqrrBBQ!<#HvTobaQ!+k$^0tAz>JXLQWaf6%u&H@F%p+yfH~!rhE= zFW#ByzAT7LF&ae{5s+6=ufUQ9W+p_p+F@Igk+10miPkti64x&q!n$P0HFRzng4C-7 zFe$VfliO)i`SxKKyPpM(7iJ;I+8`>)H5f5vC}wWIiLV*fr(e~k9OcJ}|f`1n`W zzt))kWUWB_zp(zkd-*HNU-w0SvKSHmZ&?1iOHx&U`!zQJ0P?Sk@K>3(ll-^0{|BC) Bv5Wu! literal 0 HcmV?d00001