Patchwork [2/3] strace: fix ptest execution failure

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date Aug. 5, 2014, 8:33 a.m.
Message ID <74981f17a6e413de376a24ca45126e7f8c16482b.1407227521.git.Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/77277/
State Accepted
Commit 5dfec59b9a21128d284b383853e78a9a52c68e45
Headers show

Comments

Chong.Lu@windriver.com - Aug. 5, 2014, 8:33 a.m.
ptest needs runtest-TESTS target.
serial-tests is required to generate this target.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 .../strace/strace-4.8/Makefile-ptest.patch              | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
Chong.Lu@windriver.com - Aug. 11, 2014, 1:19 a.m.
ping

On 08/05/2014 04:33 PM, Chong Lu wrote:
> ptest needs runtest-TESTS target.
> serial-tests is required to generate this target.
>
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>   .../strace/strace-4.8/Makefile-ptest.patch              | 17 +++++++++++++++--
>   1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
> index f5556b2..3a0eb39 100644
> --- a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
> +++ b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
> @@ -1,11 +1,13 @@
>   strace: Add ptest
>   
> +Upstream-Status: Inappropriate
> +
>   Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
> -Upstream-Status: Pending
> +Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
>   
>   --- 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 @@
> +@@ -9,3 +9,21 @@
>    EXTRA_DIST = init.sh $(TESTS)
>    
>    CLEANFILES = check.log
> @@ -18,6 +20,7 @@ Upstream-Status: Pending
>   +	install -d $(DESTDIR)/$(TESTDIR)
>   +	cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR)
>   +	sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile
> ++	sed -i -e 's/bash/sh/' $(DESTDIR)/$(TESTDIR)/Makefile
>   +	for file in $(check_PROGRAMS); do \
>   +		install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \
>   +	done
> @@ -26,3 +29,13 @@ Upstream-Status: Pending
>   +		sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
>   +	done
>   +	sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -6,7 +6,7 @@ AC_INIT([strace],
> + AC_CONFIG_SRCDIR([strace.c])
> + AC_CONFIG_AUX_DIR([.])
> + AC_CONFIG_HEADERS([config.h])
> +-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules])
> ++AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests])
> + AM_MAINTAINER_MODE
> + AC_CANONICAL_HOST

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
index f5556b2..3a0eb39 100644
--- a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
@@ -1,11 +1,13 @@ 
 strace: Add ptest
 
+Upstream-Status: Inappropriate
+
 Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
-Upstream-Status: Pending
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
 
 --- 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 @@
+@@ -9,3 +9,21 @@
  EXTRA_DIST = init.sh $(TESTS)
  
  CLEANFILES = check.log
@@ -18,6 +20,7 @@  Upstream-Status: Pending
 +	install -d $(DESTDIR)/$(TESTDIR)
 +	cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR)
 +	sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile
++	sed -i -e 's/bash/sh/' $(DESTDIR)/$(TESTDIR)/Makefile
 +	for file in $(check_PROGRAMS); do \
 +		install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \
 +	done
@@ -26,3 +29,13 @@  Upstream-Status: Pending
 +		sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
 +	done
 +	sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT([strace],
+ AC_CONFIG_SRCDIR([strace.c])
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules])
++AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests])
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST