Skip to contentSkip to conversation

devtools/test-meson-builds: fix support for plain bourne shell

PATCH In review Bruce Richardson 3 participants 3 messages Apr 19, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devtools/test-meson-builds: fix support for plain bourne shell

The pipefail option is not supported in /bin/sh, just in bash/ksh and similar shells - which means it's there by default on most Linux distros but not on e.g. FreeBSD. Therefore we check for it's presence before setting the option, and if it's missing, we upgrade verbosity level if needed to ensure we never hide any build failures.

---
This patch is a replacement for the previous patch: "fix support for FreeBSD" [1], which was an incorrect/incomplete fix.

[1]http://patches.dpdk.org/patch/52468/

---
 devtools/test-meson-builds.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
devtools/test-meson-builds.sh +8 -1
index 0ea79f461..630a1a6fe 100755
@@ -7,7 +7,9 @@
 # * if a build-directory already exists we assume it was properly configured
 # Run ninja after configuration is done.
 
-set -o pipefail
+# set pipefail option if possible
+PIPEFAIL=""
+set -o | grep -q pipefail && set -o pipefail && PIPEFAIL=1
 
 srcdir=$(dirname $(readlink -f $0))/..
 MESON=${MESON:-meson}
@@ -51,6 +53,11 @@ if [ "$1" = "-vv" ] ; then
 elif [ "$1" = "-v" ] ; then
 	TEST_MESON_BUILD_VERBOSE=1
 fi
+# we can't use plain verbose when we don't have pipefail option so up-level
+if [ -z "$PIPEFAIL" -a -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
+	echo "# Missing pipefail shell option, changing VERBOSE to VERY_VERBOSE"
+	TEST_MESON_BUILD_VERY_VERBOSE=1
+fi
 
 # shared and static linked builds with gcc and clang
 for c in gcc clang ; do
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw
Quoted 15 lines · Bruce Richardson

The pipefail option is not supported in /bin/sh, just in bash/ksh and similar shells - which means it's there by default on most Linux distros
but not on e.g. FreeBSD. Therefore we check for it's presence before setting the option, and if it's missing, we upgrade verbosity level if
needed to ensure we never hide any build failures.

Signed-off-by: Bruce Richardson <
[email protected]

Quoted 1 line

---
This patch is a replacement for the previous patch: "fix support for FreeBSD" [1], which was an incorrect/incomplete fix.

Quoted 6 lines

[1]
http://patches.dpdk.org/patch/52468/

---
 devtools/test-meson-builds.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Signature · 2 lines
Kind regards,
Luca Boccassi
#2 lore raw

19/04/2019 14:42, Luca Boccassi:

Quoted 16 lines · Bruce Richardson
Quoted 15 lines

The pipefail option is not supported in /bin/sh, just in bash/ksh and similar shells - which means it's there by default on most Linux distros
but not on e.g. FreeBSD. Therefore we check for it's presence before setting the option, and if it's missing, we upgrade verbosity level if
needed to ensure we never hide any build failures.

Signed-off-by: Bruce Richardson <
[email protected]

Quoted 1 line

---
This patch is a replacement for the previous patch: "fix support for FreeBSD" [1], which was an incorrect/incomplete fix.

Quoted 8 lines
Quoted 6 lines

[1]
http://patches.dpdk.org/patch/52468/

---
 devtools/test-meson-builds.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Looks good.
Applied, thanks