New upstream version 2.9upstream/2.9

2 files changed, 37 insertions, 11 deletions

diff --git a/test/docker/Dockerfile-tools b/test/docker/Dockerfile-tools
new file mode 100644
index 00000000..2328808e
--- /dev/null
+++ b/test/docker/Dockerfile-tools
@@ -0,0 +1,3 @@
+FROM vskytta/bash-completion:tools
+
+COPY . .
diff --git a/test/docker/docker-script.sh b/test/docker/docker-script.sh
index 6ba6fa90..ec310b35 100755
--- a/test/docker/docker-script.sh
+++ b/test/docker/docker-script.sh
@@ -1,19 +1,42 @@
 #!/bin/sh -ex
 
+if [ $DIST = tools ]; then
+    rc=0
+    perlcritic helpers/perl; rc=$((rc+$?))
+    perltidy -nst -nse helpers/perl; rc=$((rc+$?))
+    if [ -e helpers/perl.ERR ]; then
+        cat helpers/perl.ERR
+        rc=$((rc+1))
+    fi
+    flake8 helpers/python test test/generate; rc=$((rc+$?))
+    black --check -t py27 -t py33 -t py34 -t py35 -t py36 -t py37 -t py38 \
+        helpers/python; rc=$((rc+$?))
+    black --check test test/generate; rc=$((rc+$?))
+    exit $rc
+fi
+
+if [ "$BSD" ]; then
+    PATH=/usr/local/lib/bsd-bin:$PATH
+    export PATH
+fi
+
+case $DIST in
+    centos6|ubuntu14)
+        : ${PYTEST:=/root/.local/bin/pytest}
+        ;;
+    *)
+        : ${PYTEST:=pytest-3}
+        ;;
+esac
+
 export bashcomp_bash=bash
 env
 
 autoreconf -i
 ./configure
-make
-
-make -C completions check
-
-cd test
-xvfb-run ./runCompletion --all
-./runInstall --all
-./runUnit --all
+make -j
 
-cd ..
-mkdir install-test
-make install DESTDIR=$(pwd)/install-test
+xvfb-run make distcheck \
+    PYTEST=$PYTEST \
+    PYTESTFLAGS="--numprocesses=auto --dist=loadfile" \
+    RUNTESTFLAGS="--all --verbose"