Skip to content
Permalink
Browse files

remove unbuffer

  • Loading branch information
3nids committed Mar 6, 2019
1 parent 9b01e6f commit 08f1f7ed842154db139bb907c0b4ed5b20fdf940
Showing with 16 additions and 14 deletions.
  1. +15 −13 .ci/travis/linux/docker-build-test.sh
  2. +1 −1 .docker/qgis_resources/test_runner/qgis_testrunner.sh
@@ -93,6 +93,21 @@ if [ $rv -eq 124 ] ; then
exit #$rv
fi

##############################
# Run Python Tests on QGIS app
##############################
# Passing cases:
echo "QGIS tests runner"
pushd /root/qgis_test_runner
./qgis_testrunner.sh test_testrunner.run_passing && echo "1/5 succeeded" || exit 1
./qgis_testrunner.sh test_testrunner.run_skipped_and_passing && echo "2/5 succeeded" || exit 1
# Failing cases:
./qgis_testrunner.sh test_testrunner && exit 1 || echo "3/5 succeeded"
./qgis_testrunner.sh test_testrunner.run_all && exit 1 || echo "5/5 succeeded"
./qgis_testrunner.sh test_testrunner.run_failing && exit 1 || echo "5/5 succeeded"
popd


# Temporarily uncomment to debug ccache issues
# echo "travis_fold:start:ccache-debug"
# cat /tmp/cache.debug
@@ -167,16 +182,3 @@ popd > /dev/null # /root/QGIS

[ -r /tmp/ctest-important.log ] && cat /tmp/ctest-important.log || true

##############################
# Run Python Tests on QGIS app
##############################
# Passing cases:
echo "QGIS tests runner"
pushd /root/qgis_test_runner
./qgis_testrunner.sh test_testrunner.run_passing && echo "1/5 succeeded" || exit 1
./qgis_testrunner.sh test_testrunner.run_skipped_and_passing && echo "2/5 succeeded" || exit 1
# Failing cases:
./qgis_testrunner.sh test_testrunner && exit 1 || echo "3/5 succeeded"
./qgis_testrunner.sh test_testrunner.run_all && exit 1 || echo "5/5 succeeded"
./qgis_testrunner.sh test_testrunner.run_failing && exit 1 || echo "5/5 succeeded"
popd
@@ -11,7 +11,7 @@
TEST_NAME=$1

echo "Running test $1 ..."
OUTPUT=$(QGIS_TEST_MODULE=${TEST_NAME} unbuffer qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py "$TEST_NAME" 2>/dev/null)
OUTPUT=$(QGIS_TEST_MODULE=${TEST_NAME} qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py "$TEST_NAME" 2>/dev/null)
EXIT_CODE="$?"
if [ -z "$OUTPUT" ]; then
echo "ERROR: no output from the test runner! (exit code: ${EXIT_CODE})"

0 comments on commit 08f1f7e

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