Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame^] | 1 | From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Tue, 9 Mar 2021 15:21:11 +0000 |
| 4 | Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid |
| 5 | inconsistencies with make version |
| 6 | |
| 7 | With make 4.1, INSTALL_TARGETS+=<tab> will add a space to the variable whereas |
| 8 | with make 4.3, it will not. This leads to differing run.sh files in installed |
| 9 | in packages which is undesireable. If tests is empty we don't have to add |
| 10 | the line to the makefiles at all which seems like the easiest way to |
| 11 | avoid the differences in make behaviour. |
| 12 | |
| 13 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 14 | Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021386.html] |
| 15 | |
| 16 | --- |
| 17 | .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +++++- |
| 18 | 1 file changed, 5 insertions(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh |
| 21 | index 200a631db..4b3aaa4a0 100755 |
| 22 | --- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh |
| 23 | +++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh |
| 24 | @@ -148,8 +148,12 @@ EOF |
| 25 | |
| 26 | fi |
| 27 | |
| 28 | - cat >> "$makefile.2" <<EOF |
| 29 | + if [ ! -z "${tests}" ]; then |
| 30 | + cat >> "$makefile.2" <<EOF |
| 31 | INSTALL_TARGETS+= ${tests} |
| 32 | +EOF |
| 33 | + fi |
| 34 | + cat >> "$makefile.2" <<EOF |
| 35 | MAKE_TARGETS+= ${targets} |
| 36 | |
| 37 | EOF |
| 38 | -- |
| 39 | 2.27.0 |
| 40 | |