projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15881: Add LDAP option to install docs.
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index d403296c0cb10f61b7ef8c022e1d3ff43d3798c6..0212d1bc0e13e7b6202a04f4da00436a6c278ed1 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-127,7
+127,7
@@
sdk/go/blockdigest
sdk/go/asyncbuf
sdk/go/stats
sdk/go/crunchrunner
sdk/go/asyncbuf
sdk/go/stats
sdk/go/crunchrunner
-sdk/cwl
+sdk/cwl
:py3
sdk/R
sdk/java-v2
tools/sync-groups
sdk/R
sdk/java-v2
tools/sync-groups
@@
-260,6
+260,9
@@
sanity_checks() {
echo -n 'libpq libpq-fe.h: '
find /usr/include -path '*/postgresql/libpq-fe.h' | egrep --max-count=1 . \
|| fatal "No libpq libpq-fe.h. Try: apt-get install libpq-dev"
echo -n 'libpq libpq-fe.h: '
find /usr/include -path '*/postgresql/libpq-fe.h' | egrep --max-count=1 . \
|| fatal "No libpq libpq-fe.h. Try: apt-get install libpq-dev"
+ echo -n 'libpam pam_appl.h: '
+ find /usr/include -path '*/security/pam_appl.h' | egrep --max-count=1 . \
+ || fatal "No libpam pam_appl.h. Try: apt-get install libpam-dev"
echo -n 'postgresql: '
psql --version || fatal "No postgresql. Try: apt-get install postgresql postgresql-client-common"
echo -n 'phantomjs: '
echo -n 'postgresql: '
psql --version || fatal "No postgresql. Try: apt-get install postgresql postgresql-client-common"
echo -n 'phantomjs: '
@@
-552,9
+555,10
@@
setup_ruby_environment() {
(
export HOME=$GEMHOME
bundlers="$(gem list --details bundler)"
(
export HOME=$GEMHOME
bundlers="$(gem list --details bundler)"
- for v in 1.11 1.17.3 2.0.2; do
+ versions=(1.11.0 1.17.3 2.0.2)
+ for v in ${versions[@]}; do
if ! echo "$bundlers" | fgrep -q "($v)"; then
if ! echo "$bundlers" | fgrep -q "($v)"; then
- gem install --user
bundler:1.11 bundler:1.17.3 bundler:2.0.2
+ gem install --user
$(for v in ${versions[@]}; do echo bundler:${v}; done)
break
fi
done
break
fi
done
@@
-1003,7
+1007,6
@@
pythonstuff=(
sdk/pam
sdk/python
sdk/python:py3
sdk/pam
sdk/python
sdk/python:py3
- sdk/cwl
sdk/cwl:py3
services/dockercleaner:py3
services/fuse
sdk/cwl:py3
services/dockercleaner:py3
services/fuse
@@
-1281,7
+1284,8
@@
else
${verb}_${target}
;;
*)
${verb}_${target}
;;
*)
- testargs["$target"]="${opts}"
+ argstarget=${target%:py3}
+ testargs["$argstarget"]="${opts}"
tt="${testfuncargs[${target}]}"
tt="${tt:-$target}"
do_$verb $tt
tt="${testfuncargs[${target}]}"
tt="${tt:-$target}"
do_$verb $tt