Skip to content

Commit 0aa1eb0

Browse files
m-kuhnm-kuhn
authoredMay 6, 2020
Merge branch 'master' into pyflakes
2 parents 3e6c7c2 + 1e0b890 commit 0aa1eb0

File tree

62 files changed

+1605
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1605
-203
lines changed
 

‎.docker/qgis_resources/test_runner/qgis_testrunner.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,19 @@ TEST_NAME=$1
1313
TEST_RUNNER_PATH=${TEST_RUNNER_PATH:-/usr/bin/qgis_testrunner.py}
1414
QGIS_BUILD_PATH=${QGIS_BUILD_PATH:-qgis}
1515

16+
LOGFILE=/tmp/qgis_testrunner_$$
17+
1618
echo "Running test $1 ..."
17-
OUTPUT=$(QGIS_TEST_MODULE=${TEST_NAME} unbuffer ${QGIS_BUILD_PATH} --version-migration --nologo --code ${TEST_RUNNER_PATH} "$TEST_NAME" 2>/dev/null | tee /dev/tty)
19+
QGIS_TEST_MODULE=${TEST_NAME} unbuffer ${QGIS_BUILD_PATH} \
20+
--version-migration --nologo --code \
21+
${TEST_RUNNER_PATH} "$TEST_NAME" \
22+
2>/dev/null | \
23+
tee ${LOGFILE}
1824

25+
# NOTE: EXIT_CODE will always be 0 if "tee" works,
26+
# we could `set -o pipefail` to change this
1927
EXIT_CODE="$?"
28+
OUTPUT=$(cat $LOGFILE) # quick hack to avoid changing too many lines
2029
if [ -z "$OUTPUT" ]; then
2130
echo "ERROR: no output from the test runner! (exit code: ${EXIT_CODE})"
2231
exit 1

‎images/images.qrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@
675675
<file>themes/default/multieditSameValues.svg</file>
676676
<file>themes/default/locked_repeating.svg</file>
677677
<file>themes/default/sort.svg</file>
678+
<file>themes/default/sort-reverse.svg</file>
678679
<file>themes/default/styleicons/multibandcolor.svg</file>
679680
<file>themes/default/styleicons/paletted.svg</file>
680681
<file>themes/default/styleicons/singlebandgray.svg</file>

0 commit comments

Comments
 (0)