mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 18:53:13 +01:00
24ad27878c
Remove two backported patches:
0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
strace-fix-64-bit-process-detection.patch
Update two patches to fit new version:
Makefile-ptest.patch
strace-add-configure-options.patch
Add coreutils, grep and gawk to RDEPENDS_${PN}-ptest for making
ptest pass.
(From OE-Core rev: 826e36643a3fcb8b4ee4ed79612c63c3a9cc1536)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
strace: Add ptest
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
|
|
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
|
---
|
|
configure.ac | 2 +-
|
|
tests/Makefile.am | 18 ++++++++++++++++++
|
|
2 files changed, 19 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 054f85b..9aec566 100644
|
|
--- 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 parallel-tests])
|
|
+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests])
|
|
AM_MAINTAINER_MODE
|
|
AC_CANONICAL_HOST
|
|
|
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
index 922452a..b17837f 100644
|
|
--- a/tests/Makefile.am
|
|
+++ b/tests/Makefile.am
|
|
@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh
|
|
EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS)
|
|
|
|
CLEANFILES = $(TESTS:=.tmp)
|
|
+
|
|
+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
|
|
+ sed -i -e 's/bash/sh/' $(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
|
|
+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done
|
|
--
|
|
1.9.1
|
|
|