Skip to content
Permalink
Browse files

test

  • Loading branch information
3nids committed Mar 8, 2019
1 parent 96bd465 commit e655d0f6cd88732d5b2433f55ef649ef215f49c1
@@ -27,12 +27,12 @@ docker run -t --name qgis_container \
# commit container
docker commit qgis_container qgis_image

# running tests for the python test runner
docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf"

# running QGIS tests in commited image
docker-compose -f ${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh

# running tests for the python test runner
docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf"
sleep 10 # Wait for xvfb to finish starting

declare -A testrunners
# Passing cases:
@@ -135,5 +135,3 @@ ENV CXX=/usr/lib/ccache/clang++
ENV QT_SELECT=5
ENV LANG=C.UTF-8
ENV PATH="/usr/local/bin:${PATH}"

CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
@@ -153,4 +153,3 @@ ENV QT_SELECT=5
ENV LANG=C.UTF-8
ENV PATH="/usr/local/bin:${PATH}"

CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

0 comments on commit e655d0f

Please sign in to comment.
You can’t perform that action at this time.