From c36f13e44dae52086ca48e4f16b514642bc91106 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Tue, 23 Aug 2016 15:45:04 -0500
Subject: [PATCH] Added more missing dependencies
---
share/spack/qa/check_dependencies | 30 ++++++++++++++++++++++--------
share/spack/qa/run-doc-tests | 4 +++-
share/spack/qa/run-unit-tests | 4 +++-
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/share/spack/qa/check_dependencies b/share/spack/qa/check_dependencies
index 292eac7dd3..ba9ede4ae0 100755
--- a/share/spack/qa/check_dependencies
+++ b/share/spack/qa/check_dependencies
@@ -27,25 +27,39 @@ for dep in "$@"; do
spack_package=py-flake8
pip_package=flake8
;;
+ git)
+ spack_package=git
+ ;;
hg)
spack_package=py-mercurial
pip_package=mercurial
;;
+ svn)
+ spack_package=subversion
+ ;;
*)
spack_package=$dep
pip_package=$dep
;;
esac
- cat << EOF
-ERROR: $dep is required to run this script.
+ echo "ERROR: $dep is required to run this script."
+ echo
+
+ if [[ $spack_package ]]; then
+ echo "To install with Spack, run:"
+ echo " $ spack install $spack_package"
+ fi
+
+ if [[ $pip_package ]]; then
+ echo "To install with pip, run:"
+ echo " $ pip install $pip_package"
+ fi
+
+ if [[ $spack_package || $pip_package ]]; then
+ echo "Then add the bin directory to your PATH."
+ fi
-To install with Spack, run:
- $ spack install $spack_package
-or, to install with pip, run:
- $ pip install $pip_package
-Then add the bin directory to your PATH.
-EOF
exit 1
fi
done
diff --git a/share/spack/qa/run-doc-tests b/share/spack/qa/run-doc-tests
index 9feaa3b3e3..102eb72d5e 100755
--- a/share/spack/qa/run-doc-tests
+++ b/share/spack/qa/run-doc-tests
@@ -9,7 +9,7 @@
# run-doc-tests
#
# Notes:
-# Requires sphinx and mercurial.
+# Requires sphinx, git, mercurial, and subversion.
#
QA_DIR="$(dirname "$0")"
@@ -20,7 +20,9 @@ DOC_DIR="$SPACK_ROOT/lib/spack/docs"
deps=(
sphinx-apidoc
sphinx-build
+ git
hg
+ svn
)
# Check for dependencies
diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests
index fe2166d2dc..03dfe7cea1 100755
--- a/share/spack/qa/run-unit-tests
+++ b/share/spack/qa/run-unit-tests
@@ -11,7 +11,7 @@
# to only run these tests.
#
# Notes:
-# Requires coverage.
+# Requires coverage, git, mercurial, and subversion.
#
QA_DIR="$(dirname "$0")"
@@ -20,7 +20,9 @@ SPACK_ROOT="$QA_DIR/../../.."
# Array of dependencies
deps=(
coverage
+ git
hg
+ svn
)
# Check for dependencies
--
GitLab