summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2016-03-25 04:28:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-28 15:55:48 +0100
commitddedab4d1d6d14cd08a0b084a2da705ef3c191e7 (patch)
treecddd3d3bfb653969dd107f10a0d4a5b976375f2e /meta
parentafa4d5ebfab310d2e1ddbe3bf55e3dbb5b806d7f (diff)
downloadpoky-ddedab4d1d6d14cd08a0b084a2da705ef3c191e7.tar.gz
quilt: run ptest as normal user
When the user is root, run quilt ptest, the faildiff.test failed. Because in the faildiff.test, we drop the read permission of the file test.txt, we can't "quilt refresh" as normal user, so we got the following: >~ .*diff:test\.txt: Permission denied > Diff failed on file 'test.txt', aborting But when the user is root, we can access the file, so we got the following: > Nothing in patch patchs/test.diff So the faildiff.test was failed. We should create a normal user to run the ptest in the run-ptest scripts to slove the problem. (From OE-Core rev: f7d52d12f943b9e1f79b32758308607036d6a760) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc4
-rwxr-xr-xmeta/recipes-devtools/quilt/quilt/run-ptest5
-rwxr-xr-xmeta/recipes-devtools/quilt/quilt/test.sh1
3 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 837b36ba8c..4e393c4d8f 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -8,6 +8,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
8 file://install.patch \ 8 file://install.patch \
9 file://run-ptest \ 9 file://run-ptest \
10 file://Makefile \ 10 file://Makefile \
11 file://test.sh \
11" 12"
12 13
13SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43" 14SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43"
@@ -50,8 +51,9 @@ do_install_ptest() {
50 tar -cf - bin/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) 51 tar -cf - bin/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - )
51 tar -cf - compat/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) 52 tar -cf - compat/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - )
52 tar -cf - quilt/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) 53 tar -cf - quilt/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - )
53 tar -cf - test/ --exclude mail.test --exclude delete.test | ( cd ${D}${PTEST_PATH} && tar -xf - ) 54 tar -cf - test/ --exclude mail.test --exclude delete.test | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test)
54 cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} 55 cp ${WORKDIR}/Makefile ${D}${PTEST_PATH}
56 cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
55} 57}
56 58
57RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ 59RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/meta/recipes-devtools/quilt/quilt/run-ptest
index 958a9df5b6..4b808aee4f 100755
--- a/meta/recipes-devtools/quilt/quilt/run-ptest
+++ b/meta/recipes-devtools/quilt/quilt/run-ptest
@@ -1,5 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3THIS_SH=/bin/sh
3ln -sf /bin/ed /usr/bin/ed 4ln -sf /bin/ed /usr/bin/ed
4for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done 5/usr/sbin/adduser --disabled-password quilttest
6su -c "${THIS_SH} ./test.sh" quilttest
7/usr/sbin/deluser quilttest
5rm -f /usr/bin/ed 8rm -f /usr/bin/ed
diff --git a/meta/recipes-devtools/quilt/quilt/test.sh b/meta/recipes-devtools/quilt/quilt/test.sh
new file mode 100755
index 0000000000..6563e4a2fb
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/test.sh
@@ -0,0 +1 @@
for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done