summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-22 04:58:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-02 12:32:50 (GMT)
commit00c9ca0b030f6ec9072bcccc22cb07d46a4f12c4 (patch)
tree3bc594793570f5aa2e37a385c24bd6fcc5e4ef19
parentfb2a7918923d01f69dd2fe4f7c223eaecb14af3e (diff)
downloadpoky-00c9ca0b030f6ec9072bcccc22cb07d46a4f12c4.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) (From OE-Core rev: 7bc11ef93b02ff3b223fc0b3b730ce7b06181156) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a5e90281ac211e912ec6bfd6873e56152ec8bd4e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 08fa5c5..36e93a2 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
44+ done 44+ done
45+ for file in $(EXTRA_DIST); do \ 45+ for file in $(EXTRA_DIST); do \
46+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ 46+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \
47+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ 47+ #sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
48+ done 48+ done
49+ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done 49+ 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 2fed984..4660207 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"