The default test script covers only default host cc compiler, either gcc or
clang, the fix is to increase the coverage by adding one more to cover
clang and the others for gcc.
Fixes: a55277a788 ("devtools: add test script for meson builds")
Cc: [email protected]
Signed-off-by: Gavin Hu <[email protected]>
Reviewed-by: Phil Yang <[email protected]>
Reviewed-by: Song Zhu <[email protected]>
Acked-by: Bruce Richardson <[email protected]>
---
devtools/test-meson-builds.sh | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 9bb5b93bd..f38304e6e 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -15,7 +15,7 @@ if command -v ninja >/dev/null 2>&1 ; then
elif command -v ninja-build >/dev/null 2>&1 ; then
ninja_cmd=ninja-build
else
- echo "## ERROR: ninja is missing, please install..."
+ echo "ERROR: ninja is not found"
exit 1
fi
@@ -45,10 +45,16 @@ done
build build-x86-default -Dmachine=nehalem
# enable cross compilation if gcc cross-compiler is found
-for f in config/arm/arm*gcc ; do
- c=aarch64-linux-gnu-gcc
- if ! command -v $c >/dev/null 2>&1 ; then
- continue
- fi
- build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) --cross-file $f
-done
+c=aarch64-linux-gnu-gcc
+if command -v $c >/dev/null 2>&1 ; then
+ # compile the general v8a also for clang to increase coverage
+ export CC="ccache clang"
+ build build-arm64-host-clang --cross-file \
+ config/arm/arm64_armv8_linuxapp_gcc
+
+ for f in config/arm/arm*gcc ; do
+ export CC="ccache gcc"
+ build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \
+ --cross-file $f
+ done
+fi
--
2.11.0