[gentoo-commits] repo/gentoo:master commit in: eclass/tests/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     2d60db117655b37a8c3864f68d30c199a5d3b802
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 19:40:54 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 19:53:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d60db11

eclass/tests: Fail the .%.sh.ok Makefile recipe if the test fails

With .ONESHELL active, only the return status of the final recipe line
will be checked.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/tests/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/tests/Makefile b/eclass/tests/Makefile
index e5d1c3915fe1..99e824dea86d 100644
--- a/eclass/tests/Makefile
+++ b/eclass/tests/Makefile
@@ -2,18 +2,20 @@ SH_FILES := $(wildcard *.sh)
 TEST_FILES := $(filter-out tests-common.sh version-funcs.sh, $(SH_FILES))
 TEST_OK_FILES := $(patsubst %.sh, .%.sh.ok,$ $(TEST_FILES))
 
+# !!! _All_ recipe lines for each target will be provided to a single
+# !!! invocation of the shell.
+.ONESHELL:
+
 # We cache a successful test result if the testfile itself did not
 # change (%.sh) and the contents of the eclass/ directory did not
 # change (.eclasssum).
 .%.sh.ok: %.sh .eclasssum
-	./$<
-	touch $@
+	./$< && touch $@
 
 .PHONY: test
 test: $(TEST_OK_FILES)
 
 .PHONY: force
-.ONESHELL:
 .eclasssum: SHELL = /bin/bash
 .eclasssum: force
 	set -euo pipefail