summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-14 15:00:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:09 +0000
commita5e90281ac211e912ec6bfd6873e56152ec8bd4e (patch)
tree57d794698a70dee0977a988a18c857918906104d /meta
parent2758f6d0337ec84c9143546bc65a80559e8d7808 (diff)
downloadpoky-a5e90281ac211e912ec6bfd6873e56152ec8bd4e.tar.gz
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) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch2
-rwxr-xr-xmeta/recipes-devtools/strace/strace/run-ptest7
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 2437d1fb6d..1f01ef79f2 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -42,6 +42,6 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
42+ done 42+ done
43+ for file in $(EXTRA_DIST); do \ 43+ for file in $(EXTRA_DIST); do \
44+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ 44+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \
45+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ 45+ #sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
46+ done 46+ done
47+ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done 47+ 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 @@
1#!/bin/sh 1#!/bin/sh
2export TIMEOUT_DURATION=30 2export TIMEOUT_DURATION=120
3make -B -C tests -k test-suite.log 3chown nobody tests
4chown nobody tests/*
5chown nobody ../ptest
6su nobody -c "make -B -C tests -k test-suite.log"