From 8bfb8c6a65617e1e340c9e6b8b9ad7845fe0e542 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 25 Jun 2020 05:01:02 -0400 Subject: [PATCH] test/vm_setup.sh: exit with error when unsupported pkg manager is detected Exit early from script execution when unsupported pkg manager is found. Just not before the "--help" has a chance to be called. Signed-off-by: Tomasz Zawadzki Change-Id: I176bf5778dd7b2bc510f54842202113c8614a9d4 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3054 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Michal Berger Reviewed-by: Shuhei Matsumoto --- test/common/config/vm_setup.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index d23caf945..59e515d0e 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -73,8 +73,6 @@ elif hash pacman &> /dev/null; then elif hash pkg &> /dev/null; then source "$vmsetupdir/pkgdep/pkg" else - echo "Supported package manager not found. Script supports:" - printf ' * %s\n' "${managers[@]##*/}" package_manager="undefined" fi @@ -110,6 +108,12 @@ while getopts 'd:siuht:c:-:' optchar; do esac done +if [[ "$package_manager" == "undefined" ]]; then + echo "Supported package manager not found. Script supports:" + printf ' * %s\n' "${managers[@]##*/}" + exit 1 +fi + if [ -n "$CONF_PATH" ]; then if [ ! -f "$CONF_PATH" ]; then echo Configuration file does not exist: "$CONF_PATH"