quilt: upgrade to 0.61 and enable ptest support
v2 cover quilt: upgrade to 0.61 and enable ptest support
Changes since V1:
1. Add ptest in quilt-0.61.inc.
2. Exclude *.in source files to target.
3. Add patch-wrapper.test test case.
4. Add RDEPENDS_${PN}-ptest in quilt-0.61.inc.
5. Remove unused variable in Makefile.
The following changes since commit 005af45191ded6185c618c708181b31281e43092:
bitbake: fetch2: avoid printing "no checksum" error message twice (2013-12-22 14:29:13 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib chonglu/quilt
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/quilt
Chong Lu (2):
quilt: upgrade to 0.61
quilt: enable ptest support
.../quilt/{quilt-0.60.inc => quilt-0.61.inc} | 28 ++++++++++++++++++----
.../{quilt-native_0.60.bb => quilt-native_0.61.bb} | 1 -
meta/recipes-devtools/quilt/quilt/Makefile | 13 ++++++++++
meta/recipes-devtools/quilt/quilt/run-ptest | 5 ++++
.../quilt/{quilt_0.60.bb => quilt_0.61.bb} | 4 +---
5 files changed, 43 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/quilt/{quilt-0.60.inc => quilt-0.61.inc} (50%)
rename meta/recipes-devtools/quilt/{quilt-native_0.60.bb => quilt-native_0.61.bb} (98%)
create mode 100644 meta/recipes-devtools/quilt/quilt/Makefile
create mode 100755 meta/recipes-devtools/quilt/quilt/run-ptest
rename meta/recipes-devtools/quilt/{quilt_0.60.bb => quilt_0.61.bb} (95%)Signature · 1 line
1.8.1.2
PATCH v2 1/2 quilt: upgrade to 0.61
Upgrade quilt to 0.61.
Signed-off-by Chong Lu <[email protected]>
---
meta/recipes-devtools/quilt/{quilt-0.60.inc => quilt-0.61.inc} | 4 ++--
.../quilt/{quilt-native_0.60.bb => quilt-native_0.61.bb} | 1 -
meta/recipes-devtools/quilt/{quilt_0.60.bb => quilt_0.61.bb} | 4 +---
3 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/quilt/{quilt-0.60.inc => quilt-0.61.inc} (87%)
rename meta/recipes-devtools/quilt/{quilt-native_0.60.bb => quilt-native_0.61.bb} (98%)
rename meta/recipes-devtools/quilt/{quilt_0.60.bb => quilt_0.61.bb} (95%)meta/recipes-devtools/quilt/quilt-0.61.inc renamed from meta/recipes-devtools/quilt/quilt-0.60.inc +2 -2
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ file://install.patch" -SRC_URI[md5sum] = "058a08a9b626bdec9ec8c519dc92158c" -SRC_URI[sha256sum] = "3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b" +SRC_URI[md5sum] = "24417eba5961592b64103bdda001ebf4" +SRC_URI[sha256sum] = "1eec0a270ac4d41eea0fd5823603c9d2a35ab6b8ab73a90dd92ce1291b2a9fc3" inherit autotools
meta/recipes-devtools/quilt/quilt-native_0.61.bb renamed from meta/recipes-devtools/quilt/quilt-native_0.60.bb +0 -1
@@ -1,3 +1,2 @@ require quilt-${PV}.inc require quilt-native.inc -
meta/recipes-devtools/quilt/quilt_0.61.bb renamed from meta/recipes-devtools/quilt/quilt_0.60.bb +1 -3
@@ -1,11 +1,9 @@ require quilt-${PV}.inc -inherit gettext +inherit gettext RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" SRC_URI += "file://aclocal.patch \ file://gnu_patch_test_fix_target.patch \ " -PR = "r1" - CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
Signature · 1 line
1.8.1.2
PATCH v2 2/2 quilt: enable ptest support
In reply to Chong LuInstall quilt test suite and run it as ptest.
Exclude delete.test and mail.test.
delete.test need execute with normal user and mail.test need depend on mail agent, else these test cases will fail. So exclude them order to make ptest all pass.
Signed-off-by Chong Lu <[email protected]>
--- meta/recipes-devtools/quilt/quilt-0.61.inc | 24 ++++++++++++++++++++++-- meta/recipes-devtools/quilt/quilt/Makefile | 13 +++++++++++++ meta/recipes-devtools/quilt/quilt/run-ptest | 5 +++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/quilt/quilt/Makefile create mode 100755 meta/recipes-devtools/quilt/quilt/run-ptest
meta/recipes-devtools/quilt/quilt-0.61.inc +22 -2
@@ -5,12 +5,15 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ - file://install.patch" + file://install.patch \ + file://run-ptest \ + file://Makefile \ +" SRC_URI[md5sum] = "24417eba5961592b64103bdda001ebf4" SRC_URI[sha256sum] = "1eec0a270ac4d41eea0fd5823603c9d2a35ab6b8ab73a90dd92ce1291b2a9fc3" -inherit autotools +inherit autotools ptest EXTRA_OECONF_darwin += "--without-date \ --without-getopt \
@@ -34,3 +37,20 @@ do_install () { # cleanup unpackaged files rm -rf ${D}/${datadir}/emacs } + +do_compile_ptest() { + oe_runmake bin/patch-wrapper test/.depend +} + +do_install_ptest() { + tar -cf - bin/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -cf - compat/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -cf - quilt/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -cf - test/ --exclude mail.test --exclude delete.test | ( cd ${D}${PTEST_PATH} && tar -xf - ) + cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} +} + +RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ + perl-module-filehandle perl-module-getopt-std \ + perl-module-posix perl-module-file-temp \ +"
meta/recipes-devtools/quilt/quilt/Makefile new file +13 -0
@@ -0,0 +1,13 @@ +PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH) +QUILT_DIR := $(CURDIR)/quilt +QUILTRC := $(CURDIR)/test/test.quiltrc +export QUILT_DIR QUILTRC +CHECK_ENV := P=patches/; _P=../patches/; export P _P +-include test/.depend + +check-% : test/%.test + @LANG=C; LC_ALL=C; \ + export LANG LC_ALL; \ + $(CHECK_ENV); \ + cd $(<D); \ + ./run -q $(<F)
meta/recipes-devtools/quilt/quilt/run-ptest new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/sh + +ln -sf /bin/ed /usr/bin/ed +for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? == 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done +rm -f /usr/bin/ed
Signature · 1 line
1.8.1.2