summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2017-02-06 12:06:01 +0800
committerChase Qi <chase.qi@linaro.org>2017-02-06 12:33:01 +0800
commit475120c780a115a49a06276125bc728eb06b9b0d (patch)
treef2bff71795615c33e9a17694f4b1e85e36aa4be2
parentcaa8d4a0f5646b1e7d9a8df00b2583053b448470 (diff)
downloadtest-definitions-pipe-475120c780a115a49a06276125bc728eb06b9b0d.tar.gz
automated: use '*' instead of 'unknown' for unsupported distros
When dist_name() fails to detect distribution ID, it sets ${dist} to 'unknown'. install_deps() doesn't support 'unknown' distros, and it doesn't support some known distros like oe-rpb either. Using wildcard able to cover these two cases. Change-Id: I619e06d9dbc911c9629d6d6a7f1622c40ed1f234 Signed-off-by: Chase Qi <chase.qi@linaro.org>
-rw-r--r--automated/doc/test-writting-guidelines.rst4
-rwxr-xr-xautomated/lib/sh-test-lib6
2 files changed, 5 insertions, 5 deletions
diff --git a/automated/doc/test-writting-guidelines.rst b/automated/doc/test-writting-guidelines.rst
index eb422f6..6a84562 100644
--- a/automated/doc/test-writting-guidelines.rst
+++ b/automated/doc/test-writting-guidelines.rst
@@ -109,7 +109,7 @@ Example 2::
case "${dist}" in
debian|ubuntu) install_deps "lsb-release" "${SKIP_INSTALL}" ;;
fedora|centos) install_deps "redhat-lsb-core" "${SKIP_INSTALL}" ;;
- unknown) warn_msg "Unsupported distro: package install skipped" ;;
+ *) warn_msg "Unsupported distro: ${dist}! Package installation skipped." ;;
esac
Except automated package installation, you may also need to download and install
@@ -123,7 +123,7 @@ Example 3::
case "${dist}" in
debian|ubuntu) install_deps "${pkgs}" ;;
fedora|centos) install_deps "${pkgs}" ;;
- unknown) warn_msg "Unsupported distro: package install skipped" ;;
+ *) warn_msg "Unsupported distro: ${dist}! Package installation skipped." ;;
esac
# manually install steps.
diff --git a/automated/lib/sh-test-lib b/automated/lib/sh-test-lib
index 1429db6..9030899 100755
--- a/automated/lib/sh-test-lib
+++ b/automated/lib/sh-test-lib
@@ -205,8 +205,8 @@ install_deps() {
# shellcheck disable=SC2086
dnf -e 0 -y install ${pkgs}
;;
- unknown)
- warn_msg "Unsupported distro: package install skipped"
+ *)
+ warn_msg "Unsupported distro: ${dist}! Package installation skipped."
;;
esac
fi
@@ -322,7 +322,7 @@ add_repo() {
wget -O - "${url}" >> "/etc/yum.repos.d/3rd-party.repo"
;;
*)
- warn_msg "Unsupported distro: add_repo skipped"
+ warn_msg "Unsupported distro: ${dist}! add_repo skipped"
;;
esac
}