From 48cec0b12729ea8e483fc600c49eb3ade4dd7655 Mon Sep 17 00:00:00 2001 From: yidong0635 Date: Tue, 11 Jun 2019 09:46:41 -0400 Subject: [PATCH] vm_setup: fix scan-build not found on ubuntu18 Report issue on ubuntu18 : "spdk/autobuild.sh: line 55: hash: scan-build: not found" Check that ubuntu18 should install this package: apt-get install -y clang-tools, to fit version of ubuntu18 and later. Move clang-analyzer which for fedora to vm_setup.sh as well. Change-Id: Ia702c492f8b0f64705c7c15ee57a861ca14521f9 signed-off-by: yidong0635 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457554 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Karol Latecki Reviewed-by: Darek Stojaczyk --- scripts/pkgdep.sh | 2 +- test/common/config/vm_setup.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/pkgdep.sh b/scripts/pkgdep.sh index 737aeb69a..9a1bdef3d 100755 --- a/scripts/pkgdep.sh +++ b/scripts/pkgdep.sh @@ -55,7 +55,7 @@ if [ -s /etc/redhat-release ]; then fi yum install -y gcc gcc-c++ make CUnit-devel libaio-devel openssl-devel \ - git astyle python-pycodestyle lcov python clang-analyzer libuuid-devel \ + git astyle python-pycodestyle lcov python libuuid-devel \ sg3_utils libiscsi-devel pciutils # Additional (optional) dependencies for showing backtrace in logs yum install -y libunwind-devel || true diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 6de47734e..e96874524 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -464,6 +464,7 @@ if $INSTALL; then btrfs-progs \ rpm-build \ iptables \ + clang-analyzer \ bc elif [ $PACKAGEMNG == 'apt-get' ]; then @@ -492,6 +493,9 @@ if $INSTALL; then if ! sudo apt-get install -y libpmempool1; then echo "Package libpmempool1 is available at Ubuntu 18 [universe] repositorium" >&2 fi + if ! sudo apt-get install -y clang-tools; then + echo "Package clang-tools is available at Ubuntu 18 [universe] repositorium" >&2 + fi if ! sudo apt-get install -y --no-install-suggests --no-install-recommends open-isns-utils; then echo "Package open-isns-utils is available at Ubuntu 18 [universe] repositorium" >&2 fi