Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Aug 15, 2017
1 parent 7b6d9e8 commit c53beb8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
12 changes: 9 additions & 3 deletions .ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

set -e
#set -e

# locale-gen en_US.UTF-8
# export LANG=en_US.UTF-8
Expand All @@ -14,7 +14,7 @@ ccache -z

cd /root/QGIS

sleep 20
#sleep 20

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

ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centroid.*

ninja

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
python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -R ProcessingQgisAlgorithmsTest -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure

find / -iname "*.shp"

#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

ccache -s

Expand Down
5 changes: 1 addition & 4 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


FROM ubuntu:16.04
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>

Expand All @@ -20,6 +18,7 @@ RUN apt-get update \
dh-python \
flex \
gdal-bin \
git \
graphviz \
grass-dev \
libexpat1-dev \
Expand Down Expand Up @@ -103,8 +102,6 @@ ENV QT_SELECT=5
# RUN ${CC} --version
# RUN ${CXX} --version

RUN apt-get install -y git

# RUN locale-gen en_US.UTF-8
# ENV LANG=en_US.UTF-8
# ENV LANGUAGE=en_US:en
Expand Down
Binary file modified tests/testdata/polys_overlapping_with_id.dbf
Binary file not shown.

0 comments on commit c53beb8

Please sign in to comment.