[Fuego] [PATCH v2] rpm: Fix test case rpm02.
Tim.Bird at sony.com
Tim.Bird at sony.com
Tue Feb 5 18:47:33 UTC 2019
I'm not sure I understand the issue here.
Please see questions inline below.
> -----Original Message-----
> From: Zheng Ruoqin
>
> In some user's boards, the rpm provided in this suite is not fit for them, and
> rpm can't be installed.
>
> This patch provide an srpm file for user to rebuild it to produce the
> rpm file fit for them.
>
> Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
> Signed-off-by: Qiu Tingting <qiutt at cn.fujitsu.com>
> ---
> .../{ => data}/test-manual-1.2.3.noarch.rpm | Bin
> .../Functional.rpm/data/test-manual-1.2.3.src.rpm | Bin 0 -> 2335 bytes
> engine/tests/Functional.rpm/fuego_test.sh | 19
> +++++++++++++++++--
> engine/tests/Functional.rpm/tests/rpm_02.sh | 2 +-
> 4 files changed, 18 insertions(+), 3 deletions(-)
> rename engine/tests/Functional.rpm/{ => data}/test-manual-
> 1.2.3.noarch.rpm (100%)
> create mode 100644 engine/tests/Functional.rpm/data/test-manual-
> 1.2.3.src.rpm
>
> diff --git a/engine/tests/Functional.rpm/test-manual-1.2.3.noarch.rpm
> b/engine/tests/Functional.rpm/data/test-manual-1.2.3.noarch.rpm
> similarity index 100%
> rename from engine/tests/Functional.rpm/test-manual-1.2.3.noarch.rpm
> rename to engine/tests/Functional.rpm/data/test-manual-1.2.3.noarch.rpm
> diff --git a/engine/tests/Functional.rpm/data/test-manual-1.2.3.src.rpm
> b/engine/tests/Functional.rpm/data/test-manual-1.2.3.src.rpm
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..9c0f45da76baed63ab88be262
> 18c90f813ab260f
> GIT binary patch
> literal 2335
> zcma)+c~DbV6o+2|Dn?OSsiGwiTo6=V-
> %DOzlBx(55drs|#W8QgSdu^%tEjc&0xlp3
> zZle~pfICH0MC%`nOJzivx@%o)s|7|-sue|%o*Qo++L_Mu&Yb-6-E-
> c#=iGbWYuMj-
> z+l?S(gv=q at 9U*3;#c50qp-
> DBV2~ktDo~CFu at qdSm=<x5*?1Qy3JcoQ!z(T<~fkl9M
> z!P1_f9l_9mShreGcd#LtpMaux3Jl`io`NEO7?_ObC|0Ct9VZ%iLDDg-
> PSofPtVW=9
> zyg;k9T7lBB5~qb&7#^LX?Lmzv at 1)x{24)xJgbpczRA<29s;RB5trY&l8U)d<Zm2^
> p
> zz|;sZs6&o=Krv{}0}PG7>qdRZG1q}2?uNM at vo~hcS7$IK<_65cm>WSq^ojdM`
> 695t
> z3Hv8tehG^Fs6JHBD^Qew2Idw}RIh}&6%@rU!2AyLlK1S6)<%{I20gi>Shy-
> g4rY`a
> zaXw}RD2m^VxeF*-ZwKbC?^)ItGdg#Om-
> WZo9s6OwUF)GehUaC&Fn<Dy;$t!UU`G9-
> z`g((+_yo*-Ft5cN1PVRKwt>R_xa&btzCz3fQ1tvB%%5Yvf;k-
> XL(Gw&C|@1s(V&nI
> zN_k&T6lTcjs&5P^{FkG?P`#*56p!u$;zaEC#XJjh7$~Y&0EPABs1C#;W>g1a33JS
> Q
> z?vV$I^1JTGNTS{QO}O4~;=}vh-WBb%J5)v$no`+P%qqLn<bajpE2|Qct-
> LXLj at 9mf
> z#BlT at M^A_)BCNdAELt2!hskPbzXs_r+Q_6dBH3hd&L=EZqm7^AdQQF!q;lzzr
> AH7#
> z-
> uU>+)0ah_;W)iUt2anmMoZ~<o at FGSlO#?fQnbM!NIcE5YBkT&YKB#7MM2N
> <46Wfb
> zdQK;3IYQFujf|EN1ihMN8CuPAf<S4EdY!<*SAo(}ypE?RJtwg=XW-
> RFJ<W(ZJ*Cmm
> zMxN)@_yeIrHKolFElIZ2|5W%+xCU&x0vT*mvWW|dG$o4>rX<)ndoY3LMq1
> 4&HqmYu
> z1>_xPG>hP4NS35RXhK6$Bm>HjG)-
> #IUaYN*Lu;!hIjyNCi)t9Igp at 3HM;LD*CFfj|
> z!|o(`t2vYiQH`;f9IAPu&5rgSZ}EpiQqfwCLBmpdmO at Rr?g+XkE^}Q{*DU<BJAT
> rh
> zBJ%&3z{g1NDJCnClx9jH(0hUgy4S96Vq05l82tD0UxTLL#<^upPK@%N=>2VN5
> gG78
> zigJeZEH8L{+yATFD(}g$sb<eN{pP-GynA==>*qDw-
> ^N7m$t>J7rT${y%)$)63#Zlx
> z9jq<dF)6(;-
> A^H>!~F*(Y`vA}%<^pYYrLbmZ at 6!0PRaK2lBWk1=C*V^n>oJ9^OAqK
> zT+z}mxVp!S;w9&H^}hGKpmf3FrCeUwzQUR7Pi^TK*>&>Zy%j!W-
> )c8zHh2C+dDxn5
> z8PC(HX{7?$ae+G>q}bIde`eXoAp?SPcQT1(o)fHl_eI35wu^iEpAdzj&u-
> )vaaqw<
> zYr4!8mLEM3yTPg5G3%JesV_)vcJ%T!$K(%Ib3Hz~6}9Tg;aEjczJLFfim@@pH($~
> o
> z>^IeCuBuhHJ!X0aI<5uut<eyXos}#1nd7g=4hmM>RBX*uDsq<wTnkti{P1GWJ
> Z{6l
> zx{al5hpUq(ZV9{IbE>iOX+}wTzUq?m=bE9x^LKmSBUg+~42!(q)NA#k(2D%xiY
> =>s
> z&BfJSWWCC&e<CIZ#Bech&1B%<n~u01c|ij#1FwzCi1ANPtY>p#=Ita#j|ecO9;i
> (%
> zRZjEjz0zyNu7O(FvnctOsXpZ|B4;l9Ax^o5vC(f*7v}tU_CTIm8`7<=-cosL(AeT<
> zj<l0RKjG;&Nu!27$dV*w=fQVm))HmZ_^v!}|Gm%SyH!`dyHLOC()igvj|=kV`|f
> $8
> zz1jTB;&ZJfTi$s->a?)SdEL0?f~x(SnPYd3H$DI3!o{N<hToW*;a78FMBA&-sqxN=
> z%?-gV70X)F#I_YTk{XA9`owq113zWe8~cHSe>VO0>S@`bm&f0ZzOnoI_glBm-
> *B>}
> zVN^~*qw=`3e5`5CEoPWuVe_KP$zR9Y4xPB&C+%Ky;F2fRMU7Qq(`_Ynj~b5u
> 8nC}#
> zzV9Go&(zv6;XZ-
> WX^Uj)zUg#y>$_3HJDVyYZt7uO!i*WU`Axk}uA8;_417HQ0{fs{
> Ak^lez
>
> literal 0
> HcmV?d00001
>
> diff --git a/engine/tests/Functional.rpm/fuego_test.sh
> b/engine/tests/Functional.rpm/fuego_test.sh
> index 2a56a6d..b7856d8 100755
> --- a/engine/tests/Functional.rpm/fuego_test.sh
> +++ b/engine/tests/Functional.rpm/fuego_test.sh
> @@ -1,19 +1,34 @@
> NEED_ROOT=1
>
> +NEED_BUILD_RPM=false
> function test_pre_check {
> is_on_target_path rpm PROGRAM_RPM
> assert_define PROGRAM_RPM
> + is_on_target_path rpmbuild PROGRAM_RPMBUILD
> + if [ -n $PROGRAM_RPMBUILD ];
> + then
> + NEED_BUILD_RPM=true
> + fi
OK - just to clarify. The logic here is that if a board has 'rpm' but not 'rpmbuild',
then just use the default test rpm package for the test. But if a board has
the command 'rpmbuild' in the PATH, then use that to rebuild the
test rpm package, and use that instead of the default test rpm package.
Is that right?
What is deficient about the default test rpm package, that it cannot
be used in some circumstances?
I see that you are manipulating '_topdir' in the rebuild. Is there some problem
with the test package touching things outside the Fuego test directory?
Can you provide an error message or log for when using the default test rpm
package fails on some board - that this fix is trying to address?
This is a fairly heavy-weight fix. Not many embedded products will
have rpmbuild installed IMHO, so I hesitate to make that a requirement.
But it seems like the test still attempts to work even if 'rpmbuild' is missing.
But I want to get a sense for how many systems will have problems
with this test, in the case that rpmbuild is not present.
And I'm wondering if there's another way to resolve whatever problem
the test rpm package has (like maybe using --relocate option with 'rpm'
if there is some directory or path problem).
Thanks,
(Not applied yet)
-- Tim
> }
>
> function test_deploy {
> put $TEST_HOME/rpm_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/
> - put $TEST_HOME/test-manual-1.2.3.noarch.rpm
> $BOARD_TESTDIR/fuego.$TESTDIR/
> + put -r $TEST_HOME/data $BOARD_TESTDIR/fuego.$TESTDIR/
> put -r $TEST_HOME/tests $BOARD_TESTDIR/fuego.$TESTDIR/
> }
>
> function test_run {
> + if [ $NEED_BUILD_RPM ];
> + then
> + cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
> + mv /etc/rpm/platform /etc/rpm/platform.old; \
> + rpmbuild --define \"_topdir \${dir:-
> $BOARD_TESTDIR/fuego.$TESTDIR/rpm}\" --rebuild data/test-manual-
> 1.2.3.src.rpm; \
> + mv /etc/rpm/platform.old /etc/rpm/platform; \
> + mv rpm/RPMS/noarch/test-manual-1.2.3-20181012.noarch.rpm
> data/test-manual-1.2.3.noarch.rpm"
> + fi
> report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
> - sh -v rpm_test.sh"
> + sh -v rpm_test.sh; \
> + rpm -e test-manual"
> }
>
> function test_processing {
> diff --git a/engine/tests/Functional.rpm/tests/rpm_02.sh
> b/engine/tests/Functional.rpm/tests/rpm_02.sh
> index 9b0f411..4a7de3b 100644
> --- a/engine/tests/Functional.rpm/tests/rpm_02.sh
> +++ b/engine/tests/Functional.rpm/tests/rpm_02.sh
> @@ -11,7 +11,7 @@ then
> rpm -e $test_manual
> fi
>
> -rpm -ivh ${test_manual}.rpm --nodeps
> +rpm -ivh data/${test_manual}.rpm --nodeps
>
> if rpm -ql $test_manual | grep '.*/home/test/rpm-test/text1.txt.*'
> then
> --
> 1.8.3.1
>
>
>
> _______________________________________________
> Fuego mailing list
> Fuego at lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego
More information about the Fuego
mailing list