Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c53beb8

Browse files
committedAug 15, 2017
...
1 parent 7b6d9e8 commit c53beb8

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed
 

‎.ci/travis/linux/docker-build-test.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
set -e
3+
#set -e
44

55
# locale-gen en_US.UTF-8
66
# export LANG=en_US.UTF-8
@@ -14,7 +14,7 @@ ccache -z
1414

1515
cd /root/QGIS
1616

17-
sleep 20
17+
#sleep 20
1818

1919
printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf
2020
export PGUSER=docker
@@ -49,9 +49,15 @@ cmake \
4949
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
5050
export CTEST_BUILD_COMMAND="/usr/bin/ninja"
5151

52+
ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centroid.*
53+
5254
ninja
5355

54-
python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
56+
python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -R ProcessingQgisAlgorithmsTest -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
57+
58+
find / -iname "*.shp"
59+
60+
#python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
5561

5662
ccache -s
5763

‎.docker/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
FROM ubuntu:16.04
42
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
53

@@ -20,6 +18,7 @@ RUN apt-get update \
2018
dh-python \
2119
flex \
2220
gdal-bin \
21+
git \
2322
graphviz \
2423
grass-dev \
2524
libexpat1-dev \
@@ -103,8 +102,6 @@ ENV QT_SELECT=5
103102
# RUN ${CC} --version
104103
# RUN ${CXX} --version
105104

106-
RUN apt-get install -y git
107-
108105
# RUN locale-gen en_US.UTF-8
109106
# ENV LANG=en_US.UTF-8
110107
# ENV LANGUAGE=en_US:en
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.