quilt: upgrade to 0.61 and enable ptest support
cover quilt: upgrade to 0.61 and enable ptest support
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} | 6 +-
.../{quilt-native_0.60.bb => quilt-native_0.61.bb} | 1 -
meta/recipes-devtools/quilt/quilt-ptest.inc | 13 ++
meta/recipes-devtools/quilt/quilt/Makefile | 153 +++++++++++++++++++++
meta/recipes-devtools/quilt/quilt/run-ptest | 3 +
.../quilt/{quilt_0.60.bb => quilt_0.61.bb} | 4 +-
6 files changed, 174 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/quilt/{quilt-0.60.inc => quilt-0.61.inc} (85%)
rename meta/recipes-devtools/quilt/{quilt-native_0.60.bb => quilt-native_0.61.bb} (98%)
create mode 100644 meta/recipes-devtools/quilt/quilt-ptest.inc
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 1/2 quilt: upgrade to 0.61
---
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 2/2 quilt: enable ptest support
In reply to Chong LuInstall quilt test suite and run it as ptest.
Make all ptest pass.
--- meta/recipes-devtools/quilt/quilt-0.61.inc | 2 + meta/recipes-devtools/quilt/quilt-ptest.inc | 13 +++ meta/recipes-devtools/quilt/quilt/Makefile | 153 ++++++++++++++++++++++++++++ meta/recipes-devtools/quilt/quilt/run-ptest | 3 + 4 files changed, 171 insertions(+) create mode 100644 meta/recipes-devtools/quilt/quilt-ptest.inc 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 +2 -0
@@ -34,3 +34,5 @@ do_install () { # cleanup unpackaged files rm -rf ${D}/${datadir}/emacs } + +require quilt-ptest.inc
meta/recipes-devtools/quilt/quilt-ptest.inc new file +13 -0
@@ -0,0 +1,13 @@ +inherit ptest + +SRC_URI += "file://run-ptest \ + file://Makefile \ +" + +do_install_ptest() { + tar -cf - bin/ compat/ quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -cf - test/ --exclude delete.test --exclude mail.test --exclude patch-wrapper.test --exclude setup.test| ( cd ${D}${PTEST_PATH} && tar -xf - ) + cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} +} + +RDEPENDS_${PN} += "make gawk diffutils findutils ed perl perl-module-filehandle perl-module-getopt-std perl-module-posix"
meta/recipes-devtools/quilt/quilt/Makefile new file +153 -0
153 lines not on this page · raw message
meta/recipes-devtools/quilt/quilt/run-ptest new file +3 -0
@@ -0,0 +1,3 @@ +#!/bin/sh + +for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ -f test/.$i.ok ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done
Signature · 1 line
1.8.1.2
Re: [PATCH 2/2] quilt: enable ptest support
Quoted 19 lines · Chong Lu
Install quilt test suite and run it as ptest.
Make all ptest pass.Signed-off-by Chong Lu <[email protected]>--- meta/recipes-devtools/quilt/quilt-0.61.inc | 2 + meta/recipes-devtools/quilt/quilt-ptest.inc | 13 +++ meta/recipes-devtools/quilt/quilt/Makefile | 153 ++++++++++++++++++++++++++++ meta/recipes-devtools/quilt/quilt/run-ptest | 3 + 4 files changed, 171 insertions(+)create mode 100644 meta/recipes-devtools/quilt/quilt-ptest.inc 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 +0
-0
meta/recipes-devtools/quilt/quilt-0.61.inc do_install () { · line 38
Quoted 5 lines
meta/recipes-devtools/quilt/quilt-0.61.inc +2
-0@@ -34,3 +34,5 @@ do_install () { # cleanup unpackaged files rm -rf ${D}/${datadir}/emacs } + +require quilt-ptest.inc
Couldn't this just go in the quilt_0.61.bb since it's not needed for the -native version?
Quoted 6 lines
meta/recipes-devtools/quilt/quilt-ptest.inc new file +0
-0
meta/recipes-devtools/quilt/quilt-ptest.inc line 8
Quoted 8 lines
meta/recipes-devtools/quilt/quilt-ptest.inc new file +8
-0@@ -0,0 +1,13 @@ +inherit ptest + +SRC_URI += "file://run-ptest \ + file://Makefile \ +" + +do_install_ptest() { + tar -cf - bin/ compat/ quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
Do you really need everything in those directories? Do you need the *.in source files?
meta/recipes-devtools/quilt/quilt-ptest.inc line 9
Quoted 1 line
meta/recipes-devtools/quilt/quilt-ptest.inc new file +1
-0+ tar -cf - test/ --exclude delete.test --exclude mail.test --exclude patch-wrapper.test --exclude setup.test| ( cd ${D}${PTEST_PATH} && tar -xf - )
Why exclude some of these tests?
meta/recipes-devtools/quilt/quilt-ptest.inc line 13
Quoted 4 lines
meta/recipes-devtools/quilt/quilt-ptest.inc new file +4
-0+ cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} +} + +RDEPENDS_${PN} += "make gawk diffutils findutils ed perl perl-module-filehandle perl-module-getopt-std perl-module-posix"
I think this should be RDEPENDS_${PN}-ptest
meta/recipes-devtools/quilt/quilt/Makefile
Quoted 2 lines
meta/recipes-devtools/quilt/quilt/Makefile new file +0
-0
I also think that you can cut down this makefile to just the check bits and remove alot of the additional unused setting up variable.
Sau!
Quoted 167 lines
index 0000000..737c9b8
meta/recipes-devtools/quilt/quilt/Makefile new file +153
-0@@ -0,0 +1,153 @@ +PACKAGE := quilt +VERSION := 0.61 +RELEASE := 1 +PACKAGE_TARNAME := quilt +PACKAGE_BUGREPORT := [email protected] + +prefix := /usr +exec_prefix := /usr +bindir := /usr/bin +datarootdir := ${prefix}/share +datadir := /usr/share +docdir := ${datarootdir}/doc/${PACKAGE_TARNAME} +mandir := /usr/share/man +localedir := $(datadir)/locale +emacsdir := $(datadir)/emacs/site-lisp +etcdir := /etc + +INSTALL := /usr/bin/install -c +POD2MAN := /usr/bin/pod2man +CP := /bin/cp +DATE := /bin/date +PERL := /usr/bin/perl +BASH := /bin/bash +SHELL:= /bin/bash # It does not work if dash is used as a shell, for example +GREP := /bin/grep +TAIL := /usr/bin/tail +TR := /usr/bin/tr +SED := sed +AWK := /usr/bin/gawk +FIND := /usr/bin/find +XARGS := /usr/bin/xargs +DIFF := /usr/bin/diff +PATCH := /usr/bin/patch +MKTEMP := /bin/mktemp +DIFFSTAT := /usr/bin/diffstat + +USE_NLS := yes +STAT_HARDLINK := -c '%h' + +#----------------------------------------------------------------------- +DIRT += $(shell $(FIND) . -name '*~') +DIRT += $(shell $(FIND) . -name '.\#*') + +BIN_IN := quilt guards +BIN_SRC := $(BIN_IN:%=%.in) +BIN := $(BIN_IN) +SRC += $(BIN_SRC:%=bin/%) bin/patch-wrapper.in +DIRT += $(BIN_IN:%=bin/%) bin/patch-wrapper + +QUILT_IN := $(patsubst quilt/%.in,%,$(wildcard quilt/*.in)) +QUILT_SRC := $(QUILT_IN:%=%.in) +QUILT := $(QUILT_IN) +SRC += $(QUILT_SRC:%=quilt/%) +DIRT += $(QUILT_IN:%=quilt/%) + +SCRIPTS_IN := patchfns inspect dependency-graph edmail \ + remove-trailing-ws backup-files + +SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) +SCRIPTS := $(SCRIPTS_IN) +SRC += $(SCRIPTS_SRC:%=quilt/scripts/%) +SRC += quilt/scripts/utilfns +DIRT += $(SCRIPTS_IN:%=quilt/scripts/%) + +COMPAT := $(COMPAT_PROGRAMS:%=compat/%) $(COMPAT_SYMLINKS:%=compat/%) +SRC += $(wildcard compat/*.in) $(wildcard compat/*.sh) +DIRT += $(patsubst %.in,%,$(wildcard compat/*.in)) $(COMPAT_SYMLINKS:%=compat/%) + +LIB_SRC := quilt.el +SRC += $(LIB_SRC:%=lib/%) + +ifneq ($(POD2MAN),) +MAN1 += bin/guards.1 +DIRT += bin/guards.1 +endif + +LINGUAS := fr de ja ru +PO := quilt.pot $(LINGUAS:%=%.po) +SRC += $(PO:%=po/%) +DIRT += po/*.mo po/*~ + +SRC += $(wildcard test/*.test) test/run test/test.quiltrc +SRC += changes2changelog + +NON_EXEC_IN := doc/quilt.1 doc/README quilt/scripts/patchfns quilt/scripts/utilfns + +TESTS := test/*.test +DIRT += test/.depend $(wildcard test/.*.ok) + +# Settings for running the uninstalled version of quilt in the source tree: +PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH) +QUILT_DIR := $(CURDIR)/quilt +QUILTRC := $(CURDIR)/test/test.quiltrc +export QUILT_DIR QUILTRC + +#----------------------------------------------------------------------- +scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) \ + $(SCRIPTS:%=quilt/scripts/%) \ + $(if $(PATCH_WRAPPER),bin/patch-wrapper) + +bin/guards.1 : bin/guards + $(POD2MAN) $< > $@ + +compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm -0100)) + +.PHONY :: compat +compat :: $(COMPAT) + $(if $(compat_leftover),rm -f $(compat_leftover)) + + +check-% : test/.%.ok + @/bin/true + +# Only include the test suite dependencies when required +ifneq ($(findstring test,$(MAKECMDGOALS))$(findstring check,$(MAKECMDGOALS)),) +-include test/.depend +endif # (test|check) + +# Include a run-time generated list of dependencies for each test case +test/.depend : $(TESTS) + @( printf "%s : bin/quilt quilt/scripts/patchfns quilt/scripts/utilfns quilt/scripts/backup-files $(COMPAT)\n" $(TESTS); \ + $(AWK) 'sub(/.*\$$ *quilt /, "") \ + { print FILENAME, ":", "quilt/"$$1}' $(TESTS); \ + $(AWK) 'sub(/.*\<quilt_command /, "") && ($$1 !~ /[^a-z]/) \ + { print FILENAME, ":", "quilt/"$$1 }' quilt/*.in; \ + $(AWK) 'sub(/.*\$$ *%{QUILT_DIR}\/scripts\//, "") \ + { print FILENAME, ":", "quilt/scripts/"$$1 }' $(TESTS); \ + ) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' \ + -e 's:quilt/graph:quilt/graph quilt/scripts/dependency-graph:' \ + -e 's:quilt/mail:quilt/mail quilt/scripts/edmail:' \ + -e 's:quilt/refresh:quilt/refresh quilt/scripts/remove-trailing-ws:' \ + -e 's:quilt/setup:quilt/setup quilt/scripts/inspect:' \ + > $@ + +ifneq ($(shell . $(QUILTRC) ; echo $$QUILT_PATCHES_PREFIX),) +CHECK_ENV := P=patches/; _P=../patches/; export P _P +endif + +# Each tests dependencies are stored in test/.depend +ifneq ($(findstring check-,$(MAKECMDGOALS)),) +test/.%.ok : test/%.test FORCE +else +test/.%.ok : test/%.test +endif + @LANG=C; LC_ALL=C; \ + export LANG LC_ALL; \ + unset POSIXLY_CORRECT; \ + $(CHECK_ENV); \ + cd $(@D); \ + ./run -q $(<F) + @touch $@ + +FORCE:meta/recipes-devtools/quilt/quilt/run-ptest new file +3
-0@@ -0,0 +1,3 @@ +#!/bin/sh + +for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ -f test/.$i.ok ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done