summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-03-17 16:58:55 +0200
committerLars Wirzenius <liw@liw.fi>2018-03-30 10:08:12 +0300
commitb211b8918ba5dcbdfad04a7b84b2c7ba27b4070f (patch)
tree571ae3f389ee7cc10288cc637abfe258bbb422e5 /check
parent3f8b808f63fa5b321e45644df2c83f8d75aa623d (diff)
downloadick2-b211b8918ba5dcbdfad04a7b84b2c7ba27b4070f.tar.gz
Change: ./check to not run yarns when told not to
Diffstat (limited to 'check')
-rwxr-xr-xcheck35
1 files changed, 21 insertions, 14 deletions
diff --git a/check b/check
index 9519fac..4ba5b42 100755
--- a/check
+++ b/check
@@ -33,23 +33,27 @@ title()
title Remote or local yarns?
remote=no
unit=yes
+yarns=yes
if [ "$#" -gt 0 ]
then
case "$1" in
https://*)
remote=yes
unit=no
+ yarns=yes
remote_url="$1"
shift 1
;;
yarns)
remote=no
unit=no
+ yarns=yes
shift 1
;;
local)
remote=no
unit=yes
+ yarns=no
shift 1
;;
*)
@@ -85,22 +89,25 @@ then
pylint3 --rcfile pylint.conf $python_sources
fi
-title Yarns
-if [ "$remote" = no ]
+if [ "$yarns" = yes ]
then
- impl=yarns/900-local.yarn
- args=""
-else
- impl=yarns/900-remote.yarn
- args="--env ICK_URL=$remote_url"
+ title Yarns
+ if [ "$remote" = no ]
+ then
+ impl=yarns/900-local.yarn
+ args=""
+ else
+ impl=yarns/900-remote.yarn
+ args="--env ICK_URL=$remote_url"
+ fi
+ yarn yarns/[^9]*.yarn yarns/900-implements.yarn "$impl" \
+ --shell python2 \
+ --shell-arg '' \
+ --shell-library yarns/lib.py \
+ --cd-datadir \
+ $args \
+ "$@"
fi
-yarn yarns/[^9]*.yarn yarns/900-implements.yarn "$impl" \
- --shell python2 \
- --shell-arg '' \
- --shell-library yarns/lib.py \
- --cd-datadir \
- $args \
- "$@"
title OK
echo "All tests pass"