1
=== modified file 'tests/checkresults.sh'
2
--- tests/checkresults.sh	2016-04-08 16:49:52 +0000
3
+++ tests/checkresults.sh	2016-04-13 11:10:47 +0000
4
@@ -33,8 +33,8 @@
5
33
33
6
34
    EXCEPTIONS='tst_components_benchmark \
34
    EXCEPTIONS='tst_components_benchmark \
7
35
                tst_tabbar.qml \
35
                tst_tabbar.qml \
10
36
                tst_datepicker.qml \
36
                tst_datepicker12.bug1567840.SEGFAULT.qml \
11
37
                tst_datepicker13.qml \
37
                tst_datepicker13.bug1567840.SEGFAULT.qml \
12
38
                tst_swipearea \
38
                tst_swipearea \
13
39
                tst_qquick_image_extension \
39
                tst_qquick_image_extension \
14
40
                tst_page.qml \
40
                tst_page.qml \
15
41
41
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 11:10:47 +0000
19
@@ -66,9 +66,9 @@
20
66
function create_fallback_xml {
66
function create_fallback_xml {
21
67
  cat << EOF > $_XML
67
  cat << EOF > $_XML
22
68
<?xml version="1.0" encoding="UTF-8" ?>
68
<?xml version="1.0" encoding="UTF-8" ?>
24
69
<testsuite errors="1" failures="1" tests="1" name="$_TESTFILE">
69
<testsuite errors="$1" failures="1" tests="1" name="$_TESTFILE">
25
70
  <testcase result="fail" name="${_TESTFILE}_Execution">
70
  <testcase result="fail" name="${_TESTFILE}_Execution">
27
71
    <failure message="$1" result="fail"/>
71
    $2
28
72
  </testcase>
72
  </testcase>
29
73
</testsuite>
73
</testsuite>
30
74
EOF
74
EOF
31
@@ -112,12 +112,17 @@
32
112
    # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
112
    # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
33
113
    # https://bugreports.qt-project.org/browse/QTBUG-36243
113
    # https://bugreports.qt-project.org/browse/QTBUG-36243
34
114
	
114
	
35
115
    # QV4_MM_AGGRESSIVE_GC=1 \
36
115
    ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=no \
116
    ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=no \
37
116
    QT_LOGGING_RULES="[PERFORMANCE].warning=false" \
117
    QT_LOGGING_RULES="[PERFORMANCE].warning=false" \
38
117
    $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
118
    $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
39
118
    if [ ! -s $_XML ]; then
119
    if [ ! -s $_XML ]; then
40
119
        # Write fallback in case it crashed and the file is empty
120
        # Write fallback in case it crashed and the file is empty
42
120
        create_fallback_xml "Test results corrupted (crash)"
121
        if [[ $_XML == *".SEGFAULT"* ]]; then
43
122
            create_fallback_xml 0 '<!-- message="Test results corrupted (crashed)" type="qwarn" -->'
44
123
        else
45
124
            create_fallback_xml 1 '<failure message="Test results corrupted (crashed)" result="fail"/>'
46
125
        fi
47
121
    fi
126
    fi
48
122
    if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
127
    if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
49
123
        ${BUILD_DIR}/tests/checkresults.sh $_XML
128
        ${BUILD_DIR}/tests/checkresults.sh $_XML
50
@@ -140,7 +145,7 @@
51
140
}
145
}
52
141
146
53
142
# Always create XML in case the test can't be run, eg. .so file missing
147
# Always create XML in case the test can't be run, eg. .so file missing
55
143
create_fallback_xml "Test couldn't be run"
148
create_fallback_xml 1 '<failure message="Test couldnt be run" result="fail"/>'
56
144
create_test_cmd
149
create_test_cmd
57
145
execute_test_cmd
150
execute_test_cmd
58
146
RESULT=$?
151
RESULT=$?
59
147
152
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'
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-04-15
Tim Peeters		2016-04-13	Approve on 2016-04-15
Review via email: mp+291738@code.launchpad.net