Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/SEGFAULTingUnitTests into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/SEGFAULTingUnitTests
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 61 lines (+11/-6)
2 files modified
tests/checkresults.sh (+2/-2)
tests/unit/runtest.sh (+9/-4)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/SEGFAULTingUnitTests
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Needs Fixing
Ubuntu SDK team Pending
Review via email: mp+291724@code.launchpad.net

Commit message

Allow SEGFAULTing tests to be flagged as exceptions

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

1941. By Cris Dywan

Enable aggressive garbage collection for all unit tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/checkresults.sh'
2--- tests/checkresults.sh 2016-04-08 16:49:52 +0000
3+++ tests/checkresults.sh 2016-04-13 09:55:29 +0000
4@@ -33,8 +33,8 @@
5
6 EXCEPTIONS='tst_components_benchmark \
7 tst_tabbar.qml \
8- tst_datepicker.qml \
9- tst_datepicker13.qml \
10+ tst_datepicker12.bug1567840.SEGFAULT.qml \
11+ tst_datepicker13.bug1567840.SEGFAULT.qml \
12 tst_swipearea \
13 tst_qquick_image_extension \
14 tst_page.qml \
15
16=== modified file 'tests/unit/runtest.sh'
17--- tests/unit/runtest.sh 2016-04-11 11:15:58 +0000
18+++ tests/unit/runtest.sh 2016-04-13 09:55:29 +0000
19@@ -66,9 +66,9 @@
20 function create_fallback_xml {
21 cat << EOF > $_XML
22 <?xml version="1.0" encoding="UTF-8" ?>
23-<testsuite errors="1" failures="1" tests="1" name="$_TESTFILE">
24+<testsuite errors="$1" failures="1" tests="1" name="$_TESTFILE">
25 <testcase result="fail" name="${_TESTFILE}_Execution">
26- <failure message="$1" result="fail"/>
27+ $2
28 </testcase>
29 </testsuite>
30 EOF
31@@ -112,12 +112,17 @@
32 # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
33 # https://bugreports.qt-project.org/browse/QTBUG-36243
34
35+ QV4_MM_AGGRESSIVE_GC=1 \
36 ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=no \
37 QT_LOGGING_RULES="[PERFORMANCE].warning=false" \
38 $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
39 if [ ! -s $_XML ]; then
40 # Write fallback in case it crashed and the file is empty
41- create_fallback_xml "Test results corrupted (crash)"
42+ if [[ $_XML == *".SEGFAULT"* ]]; then
43+ create_fallback_xml 0 '<!-- message="Test results corrupted (crashed)" type="qwarn" -->'
44+ else
45+ create_fallback_xml 1 '<failure message="Test results corrupted (crashed)" result="fail"/>'
46+ fi
47 fi
48 if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
49 ${BUILD_DIR}/tests/checkresults.sh $_XML
50@@ -140,7 +145,7 @@
51 }
52
53 # Always create XML in case the test can't be run, eg. .so file missing
54-create_fallback_xml "Test couldn't be run"
55+create_fallback_xml 1 '<failure message="Test couldnt be run" result="fail"/>'
56 create_test_cmd
57 execute_test_cmd
58 RESULT=$?
59
60=== renamed file 'tests/unit_x11/tst_components/tst_datepicker12.qml.SEGFAULT.bug1567840' => 'tests/unit_x11/tst_components/tst_datepicker12.bug1567840.SEGFAULT.qml'
61=== renamed file 'tests/unit_x11/tst_components/tst_datepicker13.SEGFAULT.bug1567840' => 'tests/unit_x11/tst_components/tst_datepicker13.bug1567840.SEGFAULT.qml'

Subscribers

People subscribed via source and target branches