Patchwork strace: Add ptest

login
register
mail settings
Submitter Gabriel Barbu
Date July 24, 2013, 12:06 p.m.
Message ID <1374667573-31160-1-git-send-email-gabriel.barbu@enea.com>
Download mbox | patch
Permalink /patch/54343/
State New
Headers show

Comments

Gabriel Barbu - July 24, 2013, 12:06 p.m.
Install strace test suite and run it as ptest.

Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
---
 .../strace/strace-4.8/Makefile-ptest.patch         |   23 ++++++++++++++++++++
 meta/recipes-devtools/strace/strace-4.8/run-ptest  |    2 ++
 meta/recipes-devtools/strace/strace_4.8.bb         |   19 ++++++++++++++--
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
 create mode 100755 meta/recipes-devtools/strace/strace-4.8/run-ptest
Saul Wold - July 24, 2013, 3:06 p.m.
On 07/24/2013 05:06 AM, Gabriel Barbu wrote:
> Install strace test suite and run it as ptest.
>
> Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
> ---
>   .../strace/strace-4.8/Makefile-ptest.patch         |   23 ++++++++++++++++++++
>   meta/recipes-devtools/strace/strace-4.8/run-ptest  |    2 ++
>   meta/recipes-devtools/strace/strace_4.8.bb         |   19 ++++++++++++++--
>   3 files changed, 42 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
>   create mode 100755 meta/recipes-devtools/strace/strace-4.8/run-ptest
>
> diff --git a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
> new file mode 100644
> index 0000000..9cd491b
> --- /dev/null

Please add an Upstream-Status and Signed-off-by per the OE-Core patch 
guidelines.

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

I have had to ask this of the recent ptest, maybe your team can do an 
internal review before sending these patches to the list.

Thanks
  	 Sau!

> +++ b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
> @@ -0,0 +1,23 @@
> +--- old/tests/Makefile.am	2013-07-23 13:44:24.660481381 +0200
> ++++ new/tests/Makefile.am	2013-07-23 16:22:42.937654391 +0200
> +@@ -9,3 +9,20 @@
> + EXTRA_DIST = init.sh $(TESTS)
> +
> + CLEANFILES = check.log
> ++
> ++buildtest-TESTS: $(check_PROGRAMS) $(TESTS)
> ++
> ++install-ptest:
> ++	install $(BUILDDIR)/strace $(DESTDIR)
> ++	install "$(srcdir)/.."/strace-log-merge $(DESTDIR)
> ++	install -d $(DESTDIR)/$(TESTDIR)
> ++	cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR)
> ++	sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile
> ++	for file in $(check_PROGRAMS); do \
> ++		install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \
> ++	done
> ++	for file in $(EXTRA_DIST); do \
> ++		install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \
> ++		sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
> ++	done
> ++	sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net
> diff --git a/meta/recipes-devtools/strace/strace-4.8/run-ptest b/meta/recipes-devtools/strace/strace-4.8/run-ptest
> new file mode 100755
> index 0000000..133cf92
> --- /dev/null
> +++ b/meta/recipes-devtools/strace/strace-4.8/run-ptest
> @@ -0,0 +1,2 @@
> +#!/bin/sh
> +make -C tests -k runtest-TESTS
> diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb
> index 0f4d2f0..79a4ad7 100644
> --- a/meta/recipes-devtools/strace/strace_4.8.bb
> +++ b/meta/recipes-devtools/strace/strace_4.8.bb
> @@ -7,11 +7,16 @@ PR = "r0"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
>              file://git-version-gen \
> -           file://strace-add-configure-options.patch"
> +           file://strace-add-configure-options.patch \
> +           file://Makefile-ptest.patch \
> +           file://run-ptest \
> +          "
>
>   SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575"
>   SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8"
> -inherit autotools
> +
> +inherit autotools ptest
> +RDEPENDS_${PN}-ptest += "make"
>
>   PACKAGECONFIG_class-target ?= "libaio"
>   PACKAGECONFIG_class-target += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
> @@ -21,6 +26,8 @@ PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
>
>   export INCLUDES = "-I. -I./linux"
>
> +TESTDIR = "tests"
> +
>   do_configure_prepend() {
>   	cp ${WORKDIR}/git-version-gen ${S}
>   }
> @@ -30,4 +37,12 @@ do_install_append() {
>   	rm ${D}${bindir}/strace-graph
>   }
>
> +do_compile_ptest() {
> +	oe_runmake -C ${TESTDIR} buildtest-TESTS
> +}
> +
> +do_install_ptest() {
> +	oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
> +}
> +
>   BBCLASSEXTEND = "native"
>

Patch

diff --git a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
new file mode 100644
index 0000000..9cd491b
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
@@ -0,0 +1,23 @@ 
+--- old/tests/Makefile.am	2013-07-23 13:44:24.660481381 +0200
++++ new/tests/Makefile.am	2013-07-23 16:22:42.937654391 +0200
+@@ -9,3 +9,20 @@
+ EXTRA_DIST = init.sh $(TESTS)
+ 
+ CLEANFILES = check.log
++
++buildtest-TESTS: $(check_PROGRAMS) $(TESTS)
++
++install-ptest:
++	install $(BUILDDIR)/strace $(DESTDIR)
++	install "$(srcdir)/.."/strace-log-merge $(DESTDIR)
++	install -d $(DESTDIR)/$(TESTDIR)
++	cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR)
++	sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile
++	for file in $(check_PROGRAMS); do \
++		install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \
++	done
++	for file in $(EXTRA_DIST); do \
++		install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \
++		sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
++	done
++	sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net
diff --git a/meta/recipes-devtools/strace/strace-4.8/run-ptest b/meta/recipes-devtools/strace/strace-4.8/run-ptest
new file mode 100755
index 0000000..133cf92
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace-4.8/run-ptest
@@ -0,0 +1,2 @@ 
+#!/bin/sh
+make -C tests -k runtest-TESTS
diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb
index 0f4d2f0..79a4ad7 100644
--- a/meta/recipes-devtools/strace/strace_4.8.bb
+++ b/meta/recipes-devtools/strace/strace_4.8.bb
@@ -7,11 +7,16 @@  PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
            file://git-version-gen \
-           file://strace-add-configure-options.patch"
+           file://strace-add-configure-options.patch \
+           file://Makefile-ptest.patch \
+           file://run-ptest \
+          "
 
 SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575"
 SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8"
-inherit autotools
+
+inherit autotools ptest
+RDEPENDS_${PN}-ptest += "make"
 
 PACKAGECONFIG_class-target ?= "libaio"
 PACKAGECONFIG_class-target += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
@@ -21,6 +26,8 @@  PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
 
 export INCLUDES = "-I. -I./linux"
 
+TESTDIR = "tests"
+
 do_configure_prepend() {
 	cp ${WORKDIR}/git-version-gen ${S}
 }
@@ -30,4 +37,12 @@  do_install_append() {
 	rm ${D}${bindir}/strace-graph
 }
 
+do_compile_ptest() {
+	oe_runmake -C ${TESTDIR} buildtest-TESTS
+}
+
+do_install_ptest() {
+	oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
+}
+
 BBCLASSEXTEND = "native"