blob: 2152875d63dad5718fca5351aec0fb34cc5385a6 [file] [log] [blame]
Patrick Williamsb58112e2024-03-07 11:16:36 -06001From d49f6a135762ec1f1831d0e80b8df2a4269b0a66 Mon Sep 17 00:00:00 2001
Andrew Geissler90fd73c2021-03-05 15:25:55 -06002From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 1 May 2019 16:37:48 +0100
4Subject: [PATCH] Changes to allow ptest to run standalone on target:
Brad Bishopc342db32019-05-15 21:57:59 -04005
6a) Run the tests serially
7b) Use the standalone test mode which allows the tests to be run in their
8 'installled' locations on target (but not any of the standalone build pieces)
9c) We want to use the binaries from their installed locations so the run-subr
10 script needs tweaking to run them like that. The rpath conditional isn't
11 enough since we want the second entry in the case statement.
12d) Add an oecheck make target which we can use to build the test binaries we need
13
14Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
15
16Upstream-Status: Inappropriate [oe specific]
Andrew Geissler90fd73c2021-03-05 15:25:55 -060017---
18 configure.ac | 2 +-
19 tests/Makefile.am | 2 ++
20 tests/test-subr.sh | 6 ------
21 3 files changed, 3 insertions(+), 7 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
Patrick Williamsb58112e2024-03-07 11:16:36 -060024index bbe8673..488712b 100644
Andrew Geissler90fd73c2021-03-05 15:25:55 -060025--- a/configure.ac
26+++ b/configure.ac
Patrick Williamsb58112e2024-03-07 11:16:36 -060027@@ -49,7 +49,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2024 The elfutils developers.])
Brad Bishopc342db32019-05-15 21:57:59 -040028 AC_PREREQ(2.63) dnl Minimum Autoconf version required.
29
30 dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
31-AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip parallel-tests])
32+AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip serial-tests])
33 AM_MAINTAINER_MODE
34
35 AM_SILENT_RULES([yes])
Andrew Geissler90fd73c2021-03-05 15:25:55 -060036diff --git a/tests/Makefile.am b/tests/Makefile.am
Patrick Williamsb58112e2024-03-07 11:16:36 -060037index ee49d07..3bd8e58 100644
Andrew Geissler90fd73c2021-03-05 15:25:55 -060038--- a/tests/Makefile.am
39+++ b/tests/Makefile.am
Patrick Williamsb58112e2024-03-07 11:16:36 -060040@@ -852,3 +852,5 @@ check: check-am coverage
Brad Bishopc342db32019-05-15 21:57:59 -040041 coverage:
42 -$(srcdir)/coverage.sh
43 endif
44+oecheck:
45+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
Andrew Geissler90fd73c2021-03-05 15:25:55 -060046diff --git a/tests/test-subr.sh b/tests/test-subr.sh
47index 411e5f2..a638ff9 100644
48--- a/tests/test-subr.sh
49+++ b/tests/test-subr.sh
Brad Bishopc342db32019-05-15 21:57:59 -040050@@ -91,12 +91,6 @@ installed_testrun()
51 program="$1"
52 shift
53 case "$program" in
54- ${abs_builddir}/*)
55- if [ "x$elfutils_tests_rpath" != xno ]; then
56- echo >&2 installcheck not possible with --enable-tests-rpath
57- exit 77
58- fi
59- ;;
60 ${abs_top_builddir}/src/*)
61 program=${bindir}/`program_transform ${program##*/}`
62 ;;