Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove Qt4 travis test scripts
  • Loading branch information
m-kuhn committed Sep 27, 2016
1 parent 47c3726 commit 9c32fcc
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 235 deletions.
24 changes: 18 additions & 6 deletions ci/travis/linux/before_install.sh
@@ -1,10 +1,9 @@
#!/bin/bash
###########################################################################
# before_install.sh
# ---------------------
# Date : August 2015
# Copyright : (C) 2015 by Nyall Dawson
# Email : nyall dot dawson at gmail dot com
# Date : March 2016
# Copyright : (C) 2016 by Matthias Kuhn
# Email : matthias at opengis dot ch
###########################################################################

This comment has been minimized.

Copy link
@nyalldawson

nyalldawson Sep 27, 2016

Collaborator

Oi!! ;)

DW - your scripts are much more elegant then mine so happy for you to have the credit!

This comment has been minimized.

Copy link
@m-kuhn

m-kuhn Sep 27, 2016

Author Member

I can assign some server files to you in return if you like ;)

# #
# This program is free software; you can redistribute it and/or modify #
Expand All @@ -14,6 +13,19 @@
# #
###########################################################################

export DEBIAN_FRONTEND=noninteractive
export CORES=2

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
${DIR}/qt${QT_VERSION}/before_install.sh
##################################################
#
# Get precompiled dependencies
#
##################################################

pushd ${HOME}

curl -L https://github.com/opengisch/osgeo4travis/archive/qt5bin.tar.gz | tar -xzC /home/travis --strip-components=1
curl -L https://cmake.org/files/v3.5/cmake-3.5.0-Linux-x86_64.tar.gz | tar --strip-components=1 -zxC /home/travis/osgeo4travis
popd

pip install psycopg2 numpy nose2 pyyaml mock future termcolor
File renamed without changes.
49 changes: 43 additions & 6 deletions ci/travis/linux/install.sh
@@ -1,10 +1,9 @@
#!/bin/bash
###########################################################################
# install.sh
# ---------------------
# Date : August 2015
# Copyright : (C) 2015 by Nyall Dawson
# Email : nyall dot dawson at gmail dot com
# Date : March 2016
# Copyright : (C) 2016 by Matthias Kuhn
# Email : matthias at opengis dot ch
###########################################################################
# #
# This program is free software; you can redistribute it and/or modify #
Expand All @@ -14,6 +13,44 @@
# #
###########################################################################

mkdir build
cd build

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
${DIR}/qt${QT_VERSION}/install.sh
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}

ccache -s

export CXX="clang++-${LLVM_VERSION}"
export CC="clang-${LLVM_VERSION}"
#export CXX="g++-6"
#export CC="gcc-6"
export PATH=${HOME}/osgeo4travis/bin:${PATH}
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/

cmake --version
${CC} --version
${CXX} --version

# CLANG_WARNINGS="-Wimplicit-fallthrough"
CLANG_WARNINGS=""

# Include this line for debug reasons
# -DCMAKE_BUILD_TYPE=RelWithDebInfo \
#
cmake \
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
-DWITH_STAGED_PLUGINS=ON \
-DWITH_GRASS=ON \
-DSUPPRESS_QT_WARNINGS=ON \
-DENABLE_MODELTEST=ON \
-DENABLE_PGTEST=ON \
-DWITH_QSPATIALITE=ON \
-DWITH_QWTPOLAR=OFF \
-DWITH_APIDOC=ON \
-DWITH_ASTYLE=ON \
-DWITH_SERVER=ON \
-DWITH_INTERNAL_YAML=OFF \
-DDISABLE_DEPRECATED=ON \
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
..
24 changes: 0 additions & 24 deletions ci/travis/linux/qt4/before_install.sh

This file was deleted.

59 changes: 0 additions & 59 deletions ci/travis/linux/qt4/install.sh

This file was deleted.

23 changes: 0 additions & 23 deletions ci/travis/linux/qt4/script.sh

This file was deleted.

31 changes: 0 additions & 31 deletions ci/travis/linux/qt5/before_install.sh

This file was deleted.

56 changes: 0 additions & 56 deletions ci/travis/linux/qt5/install.sh

This file was deleted.

25 changes: 0 additions & 25 deletions ci/travis/linux/qt5/script.sh

This file was deleted.

16 changes: 11 additions & 5 deletions ci/travis/linux/script.sh
@@ -1,10 +1,9 @@
#!/bin/bash
###########################################################################
# script.sh
# ---------------------
# Date : August 2015
# Copyright : (C) 2015 by Nyall Dawson
# Email : nyall dot dawson at gmail dot com
# Date : March 2016
# Copyright : (C) 2016 by Matthias Kuhn
# Email : matthias at opengis dot ch
###########################################################################
# #
# This program is free software; you can redistribute it and/or modify #
Expand All @@ -14,6 +13,13 @@
# #
###########################################################################

export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${PATH}
export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib
export CTEST_PARALLEL_LEVEL=1
export CCACHE_TEMPDIR=/tmp

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
${DIR}/qt${QT_VERSION}/script.sh

xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsOfflineEditingWFS|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure

0 comments on commit 9c32fcc

Please sign in to comment.