From 00c9ca0b030f6ec9072bcccc22cb07d46a4f12c4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 22 May 2020 12:58:32 +0800 Subject: strace: fix failing ptests 1. They need to be run under regular user. 2. Some tests genuinely need more time than 30 seconds 3. The Makefile patch erroneously introduced a test-breaking change. (From OE-Core rev: 3d6bf58c7080c1cacf3ed1f270ff5acf4858c790) (From OE-Core rev: 7bc11ef93b02ff3b223fc0b3b730ce7b06181156) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit a5e90281ac211e912ec6bfd6873e56152ec8bd4e) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-devtools/strace/strace/Makefile-ptest.patch | 2 +- meta/recipes-devtools/strace/strace/run-ptest | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 08fa5c53b8..36e93a2dcf 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -44,6 +44,6 @@ index 825c989..4623c48 100644 + done + for file in $(EXTRA_DIST); do \ + install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ -+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ ++ #sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done + for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done diff --git a/meta/recipes-devtools/strace/strace/run-ptest b/meta/recipes-devtools/strace/strace/run-ptest index 2fed984e90..4660207220 100755 --- a/meta/recipes-devtools/strace/strace/run-ptest +++ b/meta/recipes-devtools/strace/strace/run-ptest @@ -1,3 +1,6 @@ #!/bin/sh -export TIMEOUT_DURATION=30 -make -B -C tests -k test-suite.log +export TIMEOUT_DURATION=120 +chown nobody tests +chown nobody tests/* +chown nobody ../ptest +su nobody -c "make -B -C tests -k test-suite.log" -- cgit v1.2.3-54-g00ecf