summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-04-02 16:22:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-06 08:01:12 -0700
commit20c9be46e76bdde31f6f0b6e057921de2c2ebe79 (patch)
tree39192ca7cd523c4c40201a61ff7f41f4a673c1c6 /meta/recipes-extended
parent5983fe176dae4cfdae3d43bd3a965fed15abb8e4 (diff)
downloadpoky-20c9be46e76bdde31f6f0b6e057921de2c2ebe79.tar.gz
LSB_Setup.sh: Add function to install all test packages
Add function to install all of lsb test suite packages instead of installing parts of test packages (From OE-Core rev: 7bcfbdda6f70bb7dad585091469f54cea89f07b4) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh50
1 files changed, 30 insertions, 20 deletions
diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
index 78c33b3a73..7ce823ea6e 100644
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
@@ -17,11 +17,38 @@
17 17
18##Prepare Steps 18##Prepare Steps
19#Steps 0; Confirm the installed LSB Packages 19#Steps 0; Confirm the installed LSB Packages
20 20ARCH=`uname -m`
21APP_FILE=`ls /lsb-Application/*.rpm`
21if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ] 22if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ]
22then 23then
23 if [ -d /lsb-dist-testkit ];then 24 if [ -d /lsb-dist-testkit ];then
24 cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application && rpm -ivh *.rpm --nodeps --force 25 if [ ${ARCH} == i686 ];then
26 echo "i486-suse" >> /etc/rpm/platform
27 echo "i486-noarch" >> /etc/rpm/platform
28 echo "i486-pc" >> /etc/rpm/platform
29 echo "noarch-suse" >> /etc/rpm/platform
30 else
31 echo "${ARCH}-suse" >> /etc/rpm/platform
32 echo "${ARCH}-noarch" >> /etc/rpm/platform
33 echo "${ARCH}-pc" >> /etc/rpm/platform
34 echo "noarch-suse" >> /etc/rpm/platform
35 fi
36 cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application
37 for i in ${APP_FILE}
38 do
39 echo "$i" |grep -q "apache"
40 if [ $? -eq 0 ]
41 then
42 rpm -ivh $i --noscripts --nodeps --force
43 else
44 rpm -ivh $i --nodeps --force
45 fi
46 done
47 mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
48 mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
49 cp expect-tests.tar test1.pdf test2.pdf /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
50 cp raptor-tests.tar tcl-tests.tar /var/opt/lsb//test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
51 cd ..
25 else 52 else
26 echo "Please install the realted LSB Packages" 53 echo "Please install the realted LSB Packages"
27 exit 1 54 exit 1
@@ -33,10 +60,6 @@ id tester
33if [ $? -eq 0 ] 60if [ $? -eq 0 ]
34then 61then
35 echo "User tester was existed" 62 echo "User tester was existed"
36 echo -n "Deleted tester(yes/no):"
37 read INPUT
38case $INPUT in
39yes|y)
40 sleep 1 63 sleep 1
41 userdel -rf tester 64 userdel -rf tester
42 if [ $? -eq 0 ] || [ $? -eq 6 ] 65 if [ $? -eq 0 ] || [ $? -eq 6 ]
@@ -45,19 +68,6 @@ yes|y)
45 else 68 else
46 echo "Fail to delete user tester" 69 echo "Fail to delete user tester"
47 fi 70 fi
48 ;;
49no|n)
50 sleep 1
51 echo "There must be deleted User test before ran LSB4 on Target"
52 echo ""
53 exit 1
54 ;;
55*)
56 sleep 1
57 echo "Input ERROR, pls reinput that your expected"
58 echo ""
59 exit 1
60esac
61else 71else
62 echo "There was not User tester" 72 echo "There was not User tester"
63fi 73fi
@@ -177,7 +187,7 @@ ping -c 5 ftp.linux-foundation.org
177check 187check
178 188
179#Step 7 189#Step 7
180insmod /lib/modules/2.6.37.2-yocto-standard\+/kernel/drivers/block/loop.ko 190insmod /lib/modules/2.6.*/kernel/drivers/block/loop.ko
181if [ $? != 0 ];then 191if [ $? != 0 ];then
182 echo "Please insmod loop.ko manully" 192 echo "Please insmod loop.ko manully"
183fi 193fi