diff options
Diffstat (limited to 'meta/recipes-devtools/elfutils/files/ptest.patch')
-rw-r--r-- | meta/recipes-devtools/elfutils/files/ptest.patch | 61 |
1 files changed, 24 insertions, 37 deletions
diff --git a/meta/recipes-devtools/elfutils/files/ptest.patch b/meta/recipes-devtools/elfutils/files/ptest.patch index 35b23f43b3..fe6f272a83 100644 --- a/meta/recipes-devtools/elfutils/files/ptest.patch +++ b/meta/recipes-devtools/elfutils/files/ptest.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Changes to allow ptest to run standalone on target: | 1 | From bfbf393e7d5b1b41df85ce1c37e887776c45d529 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Wed, 1 May 2019 16:37:48 +0100 | ||
4 | Subject: [PATCH] Changes to allow ptest to run standalone on target: | ||
2 | 5 | ||
3 | a) Run the tests serially | 6 | a) Run the tests serially |
4 | b) Use the standalone test mode which allows the tests to be run in their | 7 | b) Use the standalone test mode which allows the tests to be run in their |
@@ -12,11 +15,17 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
12 | 15 | ||
13 | Upstream-Status: Inappropriate [oe specific] | 16 | Upstream-Status: Inappropriate [oe specific] |
14 | 17 | ||
15 | Index: elfutils-0.176/configure.ac | 18 | --- |
16 | =================================================================== | 19 | configure.ac | 2 +- |
17 | --- elfutils-0.176.orig/configure.ac | 20 | tests/Makefile.am | 2 ++ |
18 | +++ elfutils-0.176/configure.ac | 21 | tests/test-subr.sh | 6 ------ |
19 | @@ -45,7 +45,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2018 Th | 22 | 3 files changed, 3 insertions(+), 7 deletions(-) |
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index d345495..67933d1 100644 | ||
26 | --- a/configure.ac | ||
27 | +++ b/configure.ac | ||
28 | @@ -48,7 +48,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2021 The elfutils developers.]) | ||
20 | AC_PREREQ(2.63) dnl Minimum Autoconf version required. | 29 | AC_PREREQ(2.63) dnl Minimum Autoconf version required. |
21 | 30 | ||
22 | dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. | 31 | dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. |
@@ -25,42 +34,20 @@ Index: elfutils-0.176/configure.ac | |||
25 | AM_MAINTAINER_MODE | 34 | AM_MAINTAINER_MODE |
26 | 35 | ||
27 | AM_SILENT_RULES([yes]) | 36 | AM_SILENT_RULES([yes]) |
28 | Index: elfutils-0.176/tests/Makefile.am | 37 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
29 | =================================================================== | 38 | index 72afd0e..a2dfd43 100644 |
30 | --- elfutils-0.176.orig/tests/Makefile.am | 39 | --- a/tests/Makefile.am |
31 | +++ elfutils-0.176/tests/Makefile.am | 40 | +++ b/tests/Makefile.am |
32 | @@ -445,10 +445,10 @@ installed_TESTS_ENVIRONMENT = libdir=$(D | 41 | @@ -698,3 +698,5 @@ check: check-am coverage |
33 | installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \ | ||
34 | installed $(tests_rpath) \ | ||
35 | '$(program_transform_name)' | ||
36 | -if STANDALONE | ||
37 | +if !STANDALONE | ||
38 | TESTS_ENVIRONMENT = $(installed_TESTS_ENVIRONMENT) | ||
39 | LOG_COMPILER = $(installed_LOG_COMPILER) | ||
40 | -else !STANDALONE | ||
41 | +else STANDALONE | ||
42 | TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \ | ||
43 | abs_srcdir=$(abs_srcdir); abs_builddir=$(abs_builddir); \ | ||
44 | abs_top_builddir=$(abs_top_builddir); \ | ||
45 | @@ -463,7 +463,7 @@ installcheck-local: | ||
46 | $(MAKE) $(AM_MAKEFLAGS) \ | ||
47 | TESTS_ENVIRONMENT="$(installed_TESTS_ENVIRONMENT)" \ | ||
48 | LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS | ||
49 | -endif !STANDALONE | ||
50 | +endif STANDALONE | ||
51 | |||
52 | if STANDALONE | ||
53 | libdw = -ldw | ||
54 | @@ -612,3 +612,5 @@ check: check-am coverage | ||
55 | coverage: | 42 | coverage: |
56 | -$(srcdir)/coverage.sh | 43 | -$(srcdir)/coverage.sh |
57 | endif | 44 | endif |
58 | +oecheck: | 45 | +oecheck: |
59 | + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) | 46 | + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) |
60 | Index: elfutils-0.176/tests/test-subr.sh | 47 | diff --git a/tests/test-subr.sh b/tests/test-subr.sh |
61 | =================================================================== | 48 | index 411e5f2..a638ff9 100644 |
62 | --- elfutils-0.176.orig/tests/test-subr.sh | 49 | --- a/tests/test-subr.sh |
63 | +++ elfutils-0.176/tests/test-subr.sh | 50 | +++ b/tests/test-subr.sh |
64 | @@ -91,12 +91,6 @@ installed_testrun() | 51 | @@ -91,12 +91,6 @@ installed_testrun() |
65 | program="$1" | 52 | program="$1" |
66 | shift | 53 | shift |