Tidy up tst_globaldata to use better namings and document what it tests

In particular, document the mis-behavior it takes for granted in one
test.  Renamed some variables so that they're visually distinct from
one another and actually mean something intelligible.  Renamed the
sub-tests to say what's actually happening.  Reading the test output
now at least makes it possible to see what's wrong.  I'll fix that in
a later commit.

Task-number: QTBUG-61774
Change-Id: I3e5f83b8baa3c6afbca9231b5bbc89d17f3e57e2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>

7 files changed, 300 insertions, 299 deletions

diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index f66c4c552d..e536031899 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml
@@ -12,174 +12,174 @@
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1]]></DataTag>
+    <DataTag><![CDATA[global=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=true]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[global: false local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[global: false local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[skipping]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[Skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[global: true local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.tap b/tests/auto/testlib/selftests/expected_globaldata.tap
index 580cf3a7a8..318299992f 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.tap
+++ b/tests/auto/testlib/selftests/expected_globaldata.tap
@@ -2,48 +2,48 @@ TAP version 13
 # tst_globaldata
 # initTestCase initTestCase (null)
 ok 1 - initTestCase()
-# init testGlobal local 1
+# init testGlobal local=false
 # global: false
 # local: false
-# cleanup testGlobal local 1
-ok 2 - testGlobal(1:local 1)
-# init testGlobal local 2
+# cleanup testGlobal local=false
+ok 2 - testGlobal(global=false:local=false)
+# init testGlobal local=true
 # global: false
 # local: true
-# cleanup testGlobal local 2
-ok 3 - testGlobal(1:local 2)
-# init testGlobal local 1
+# cleanup testGlobal local=true
+ok 3 - testGlobal(global=false:local=true)
+# init testGlobal local=false
 # global: true
 # local: false
-# cleanup testGlobal local 1
-ok 4 - testGlobal(2:local 1)
-# init testGlobal local 2
+# cleanup testGlobal local=false
+ok 4 - testGlobal(global=true:local=false)
+# init testGlobal local=true
 # global: true
 # local: true
-# cleanup testGlobal local 2
-ok 5 - testGlobal(2:local 2)
-ok 6 - skip(1) # SKIP skipping
-# init skipLocal local 1
-ok 7 - skipLocal(1:local 1) # SKIP skipping
-# cleanup skipLocal local 1
-# init skipLocal local 2
-ok 8 - skipLocal(1:local 2) # SKIP skipping
-# cleanup skipLocal local 2
-# init skipSingle local 1
+# cleanup testGlobal local=true
+ok 5 - testGlobal(global=true:local=true)
+ok 6 - skip(global=false) # SKIP skipping
+# init skipLocal local=false
+ok 7 - skipLocal(global=false:local=false) # SKIP skipping
+# cleanup skipLocal local=false
+# init skipLocal local=true
+ok 8 - skipLocal(global=false:local=true) # SKIP skipping
+# cleanup skipLocal local=true
+# init skipSingle local=false
 # global: false local: false
-# cleanup skipSingle local 1
-ok 9 - skipSingle(1:local 1)
-# init skipSingle local 2
+# cleanup skipSingle local=false
+ok 9 - skipSingle(global=false:local=false)
+# init skipSingle local=true
 # global: false local: true
-# cleanup skipSingle local 2
-ok 10 - skipSingle(1:local 2)
-# init skipSingle local 1
-ok 11 - skipSingle(2:local 1) # SKIP skipping
-# cleanup skipSingle local 1
-# init skipSingle local 2
+# cleanup skipSingle local=true
+ok 10 - skipSingle(global=false:local=true)
+# init skipSingle local=false
+ok 11 - skipSingle(global=true:local=false) # SKIP Skipping
+# cleanup skipSingle local=false
+# init skipSingle local=true
 # global: true local: true
-# cleanup skipSingle local 2
-ok 12 - skipSingle(2:local 2)
+# cleanup skipSingle local=true
+ok 12 - skipSingle(global=true:local=true)
 # cleanupTestCase cleanupTestCase (null)
 ok 13 - cleanupTestCase()
 1..13
diff --git a/tests/auto/testlib/selftests/expected_globaldata.teamcity b/tests/auto/testlib/selftests/expected_globaldata.teamcity
index 5d623a3285..2f9f97d912 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.teamcity
+++ b/tests/auto/testlib/selftests/expected_globaldata.teamcity
@@ -2,30 +2,30 @@
 ##teamcity[testStarted name='initTestCase()' flowId='tst_globaldata']
 ##teamcity[testStdOut name='initTestCase()' out='QDEBUG: initTestCase initTestCase (null)' flowId='tst_globaldata']
 ##teamcity[testFinished name='initTestCase()' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 1)' out='QDEBUG: init testGlobal local 1|nQDEBUG: global: false|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local 1' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 2)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 2)' out='QDEBUG: init testGlobal local 2|nQDEBUG: global: false|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 2)' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 1)' out='QDEBUG: init testGlobal local 1|nQDEBUG: global: true|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local 1' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 2)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 2)' out='QDEBUG: init testGlobal local 2|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 2)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=false)' out='QDEBUG: init testGlobal local=false|nQDEBUG: global: false|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=true)' out='QDEBUG: init testGlobal local=true|nQDEBUG: global: false|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=false)' out='QDEBUG: init testGlobal local=false|nQDEBUG: global: true|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=true)' out='QDEBUG: init testGlobal local=true|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=true)' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skip()' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipLocal(local 1)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipLocal(local 2)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testStarted name='skipSingle(local 1)' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local 1)' out='QDEBUG: init skipLocal local 1|nQDEBUG: cleanup skipLocal local 1|nQDEBUG: init skipLocal local 2|nQDEBUG: cleanup skipLocal local 2|nQDEBUG: init skipSingle local 1|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local 1' flowId='tst_globaldata']
-##teamcity[testFinished name='skipSingle(local 1)' flowId='tst_globaldata']
-##teamcity[testStarted name='skipSingle(local 2)' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local 2)' out='QDEBUG: init skipSingle local 2|nQDEBUG: global: false local: true|nQDEBUG: cleanup skipSingle local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='skipSingle(local 2)' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipSingle(local 1)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local 2)' out='QDEBUG: init skipSingle local 1|nQDEBUG: cleanup skipSingle local 1|nQDEBUG: init skipSingle local 2|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='skipSingle(local 2)' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStarted name='skipSingle(local=false)' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='skipSingle(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=true|nQDEBUG: global: false local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipSingle(local=false)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=false|nQDEBUG: cleanup skipSingle local=false|nQDEBUG: init skipSingle local=true|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_globaldata']
 ##teamcity[testStdOut name='cleanupTestCase()' out='QDEBUG: cleanupTestCase cleanupTestCase (null)' flowId='tst_globaldata']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_globaldata']
diff --git a/tests/auto/testlib/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt
index b12f4a2a69..b18568009a 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.txt
+++ b/tests/auto/testlib/selftests/expected_globaldata.txt
@@ -2,52 +2,52 @@
 Config: Using QtTest library
 QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null)
 PASS   : tst_globaldata::initTestCase()
-QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1
-QDEBUG : tst_globaldata::testGlobal(1:local 1) global: false
-QDEBUG : tst_globaldata::testGlobal(1:local 1) local: false
-QDEBUG : tst_globaldata::testGlobal(1:local 1) cleanup testGlobal local 1
-PASS   : tst_globaldata::testGlobal(1:local 1)
-QDEBUG : tst_globaldata::testGlobal(1:local 2) init testGlobal local 2
-QDEBUG : tst_globaldata::testGlobal(1:local 2) global: false
-QDEBUG : tst_globaldata::testGlobal(1:local 2) local: true
-QDEBUG : tst_globaldata::testGlobal(1:local 2) cleanup testGlobal local 2
-PASS   : tst_globaldata::testGlobal(1:local 2)
-QDEBUG : tst_globaldata::testGlobal(2:local 1) init testGlobal local 1
-QDEBUG : tst_globaldata::testGlobal(2:local 1) global: true
-QDEBUG : tst_globaldata::testGlobal(2:local 1) local: false
-QDEBUG : tst_globaldata::testGlobal(2:local 1) cleanup testGlobal local 1
-PASS   : tst_globaldata::testGlobal(2:local 1)
-QDEBUG : tst_globaldata::testGlobal(2:local 2) init testGlobal local 2
-QDEBUG : tst_globaldata::testGlobal(2:local 2) global: true
-QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true
-QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2
-PASS   : tst_globaldata::testGlobal(2:local 2)
-SKIP   : tst_globaldata::skip(1) skipping
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) init testGlobal local=false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) global: false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) local: false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) cleanup testGlobal local=false
+PASS   : tst_globaldata::testGlobal(global=false:local=false)
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) init testGlobal local=true
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) global: false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) local: true
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) cleanup testGlobal local=true
+PASS   : tst_globaldata::testGlobal(global=false:local=true)
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) init testGlobal local=false
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) global: true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) local: false
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) cleanup testGlobal local=false
+PASS   : tst_globaldata::testGlobal(global=true:local=false)
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) init testGlobal local=true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) global: true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) local: true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) cleanup testGlobal local=true
+PASS   : tst_globaldata::testGlobal(global=true:local=true)
+SKIP   : tst_globaldata::skip(global=false) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1
-SKIP   : tst_globaldata::skipLocal(1:local 1) skipping
+QDEBUG : tst_globaldata::skipLocal(global=false:local=false) init skipLocal local=false
+SKIP   : tst_globaldata::skipLocal(global=false:local=false) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1
-QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2
-SKIP   : tst_globaldata::skipLocal(1:local 2) skipping
+QDEBUG : tst_globaldata::skipLocal(global=false:local=false) cleanup skipLocal local=false
+QDEBUG : tst_globaldata::skipLocal(global=false:local=true) init skipLocal local=true
+SKIP   : tst_globaldata::skipLocal(global=false:local=true) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2
-QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1
-QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false
-QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1
-PASS   : tst_globaldata::skipSingle(1:local 1)
-QDEBUG : tst_globaldata::skipSingle(1:local 2) init skipSingle local 2
-QDEBUG : tst_globaldata::skipSingle(1:local 2) global: false local: true
-QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2
-PASS   : tst_globaldata::skipSingle(1:local 2)
-QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1
-SKIP   : tst_globaldata::skipSingle(2:local 1) skipping
+QDEBUG : tst_globaldata::skipLocal(global=false:local=true) cleanup skipLocal local=true
+QDEBUG : tst_globaldata::skipSingle(global=false:local=false) init skipSingle local=false
+QDEBUG : tst_globaldata::skipSingle(global=false:local=false) global: false local: false
+QDEBUG : tst_globaldata::skipSingle(global=false:local=false) cleanup skipSingle local=false
+PASS   : tst_globaldata::skipSingle(global=false:local=false)
+QDEBUG : tst_globaldata::skipSingle(global=false:local=true) init skipSingle local=true
+QDEBUG : tst_globaldata::skipSingle(global=false:local=true) global: false local: true
+QDEBUG : tst_globaldata::skipSingle(global=false:local=true) cleanup skipSingle local=true
+PASS   : tst_globaldata::skipSingle(global=false:local=true)
+QDEBUG : tst_globaldata::skipSingle(global=true:local=false) init skipSingle local=false
+SKIP   : tst_globaldata::skipSingle(global=true:local=false) Skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1
-QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2
-QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true
-QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2
-PASS   : tst_globaldata::skipSingle(2:local 2)
+QDEBUG : tst_globaldata::skipSingle(global=true:local=false) cleanup skipSingle local=false
+QDEBUG : tst_globaldata::skipSingle(global=true:local=true) init skipSingle local=true
+QDEBUG : tst_globaldata::skipSingle(global=true:local=true) global: true local: true
+QDEBUG : tst_globaldata::skipSingle(global=true:local=true) cleanup skipSingle local=true
+PASS   : tst_globaldata::skipSingle(global=true:local=true)
 QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
 PASS   : tst_globaldata::cleanupTestCase()
 Totals: 9 passed, 0 failed, 4 skipped, 0 blacklisted, 0ms
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index 0f705ef352..b2f92016e5 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
@@ -14,174 +14,174 @@
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1]]></DataTag>
+    <DataTag><![CDATA[global=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=true]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[global: false local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[global: false local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[skipping]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[Skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[global: true local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
index bdd7e3f00a..b135240d26 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
@@ -9,88 +9,88 @@
     <!-- message="initTestCase initTestCase (null)" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="testGlobal">
-    <!-- tag="1:local 1" message="init testGlobal local 1" type="qdebug" -->
-    <!-- tag="1:local 1" message="global: false" type="qdebug" -->
-    <!-- tag="1:local 1" message="local: false" type="qdebug" -->
-    <!-- tag="1:local 1" message="cleanup testGlobal local 1" type="qdebug" -->
-    <!-- tag="1:local 2" message="init testGlobal local 2" type="qdebug" -->
-    <!-- tag="1:local 2" message="global: false" type="qdebug" -->
-    <!-- tag="1:local 2" message="local: true" type="qdebug" -->
-    <!-- tag="1:local 2" message="cleanup testGlobal local 2" type="qdebug" -->
-    <!-- tag="2:local 1" message="init testGlobal local 1" type="qdebug" -->
-    <!-- tag="2:local 1" message="global: true" type="qdebug" -->
-    <!-- tag="2:local 1" message="local: false" type="qdebug" -->
-    <!-- tag="2:local 1" message="cleanup testGlobal local 1" type="qdebug" -->
-    <!-- tag="2:local 2" message="init testGlobal local 2" type="qdebug" -->
-    <!-- tag="2:local 2" message="global: true" type="qdebug" -->
-    <!-- tag="2:local 2" message="local: true" type="qdebug" -->
-    <!-- tag="2:local 2" message="cleanup testGlobal local 2" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="init testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="global: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="local: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="global: false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="local: true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="global: true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="local: false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="global: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="local: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
   </testcase>
   <testcase name="skip">
-    <!-- tag="1" message="skipping" type="skip" -->
+    <!-- tag="global=false" message="skipping" type="skip" -->
   </testcase>
   <testcase name="skipLocal">
-    <!-- tag="1:local 1" message="init skipLocal local 1" type="qdebug" -->
-    <!-- tag="1:local 1" message="skipping" type="skip" -->
-    <!-- tag="1:local 1" message="cleanup skipLocal local 1" type="qdebug" -->
-    <!-- tag="1:local 2" message="init skipLocal local 2" type="qdebug" -->
-    <!-- tag="1:local 2" message="skipping" type="skip" -->
-    <!-- tag="1:local 2" message="cleanup skipLocal local 2" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="init skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="skipping" type="skip" -->
+    <!-- tag="global=false:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="skipping" type="skip" -->
+    <!-- tag="global=false:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="skipSingle">
-    <!-- tag="1:local 1" message="init skipSingle local 1" type="qdebug" -->
-    <!-- tag="1:local 1" message="global: false local: false" type="qdebug" -->
-    <!-- tag="1:local 1" message="cleanup skipSingle local 1" type="qdebug" -->
-    <!-- tag="1:local 2" message="init skipSingle local 2" type="qdebug" -->
-    <!-- tag="1:local 2" message="global: false local: true" type="qdebug" -->
-    <!-- tag="1:local 2" message="cleanup skipSingle local 2" type="qdebug" -->
-    <!-- tag="2:local 1" message="init skipSingle local 1" type="qdebug" -->
-    <!-- tag="2:local 1" message="skipping" type="skip" -->
-    <!-- tag="2:local 1" message="cleanup skipSingle local 1" type="qdebug" -->
-    <!-- tag="2:local 2" message="init skipSingle local 2" type="qdebug" -->
-    <!-- tag="2:local 2" message="global: true local: true" type="qdebug" -->
-    <!-- tag="2:local 2" message="cleanup skipSingle local 2" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="init skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="global: false local: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="global: false local: true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="Skipping" type="skip" -->
+    <!-- tag="global=true:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="global: true local: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase">
     <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
   </testcase>
   <system-err>
 <![CDATA[initTestCase initTestCase (null)]]>
-<![CDATA[init testGlobal local 1]]>
+<![CDATA[init testGlobal local=false]]>
 <![CDATA[global: false]]>
 <![CDATA[local: false]]>
-<![CDATA[cleanup testGlobal local 1]]>
-<![CDATA[init testGlobal local 2]]>
+<![CDATA[cleanup testGlobal local=false]]>
+<![CDATA[init testGlobal local=true]]>
 <![CDATA[global: false]]>
 <![CDATA[local: true]]>
-<![CDATA[cleanup testGlobal local 2]]>
-<![CDATA[init testGlobal local 1]]>
+<![CDATA[cleanup testGlobal local=true]]>
+<![CDATA[init testGlobal local=false]]>
 <![CDATA[global: true]]>
 <![CDATA[local: false]]>
-<![CDATA[cleanup testGlobal local 1]]>
-<![CDATA[init testGlobal local 2]]>
+<![CDATA[cleanup testGlobal local=false]]>
+<![CDATA[init testGlobal local=true]]>
 <![CDATA[global: true]]>
 <![CDATA[local: true]]>
-<![CDATA[cleanup testGlobal local 2]]>
+<![CDATA[cleanup testGlobal local=true]]>
 <![CDATA[skipping]]>
-<![CDATA[init skipLocal local 1]]>
+<![CDATA[init skipLocal local=false]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipLocal local 1]]>
-<![CDATA[init skipLocal local 2]]>
+<![CDATA[cleanup skipLocal local=false]]>
+<![CDATA[init skipLocal local=true]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipLocal local 2]]>
-<![CDATA[init skipSingle local 1]]>
+<![CDATA[cleanup skipLocal local=true]]>
+<![CDATA[init skipSingle local=false]]>
 <![CDATA[global: false local: false]]>
-<![CDATA[cleanup skipSingle local 1]]>
-<![CDATA[init skipSingle local 2]]>
+<![CDATA[cleanup skipSingle local=false]]>
+<![CDATA[init skipSingle local=true]]>
 <![CDATA[global: false local: true]]>
-<![CDATA[cleanup skipSingle local 2]]>
-<![CDATA[init skipSingle local 1]]>
-<![CDATA[skipping]]>
-<![CDATA[cleanup skipSingle local 1]]>
-<![CDATA[init skipSingle local 2]]>
+<![CDATA[cleanup skipSingle local=true]]>
+<![CDATA[init skipSingle local=false]]>
+<![CDATA[Skipping]]>
+<![CDATA[cleanup skipSingle local=false]]>
+<![CDATA[init skipSingle local=true]]>
 <![CDATA[global: true local: true]]>
-<![CDATA[cleanup skipSingle local 2]]>
+<![CDATA[cleanup skipSingle local=true]]>
 <![CDATA[cleanupTestCase cleanupTestCase (null)]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
index 6c0ae1f43c..f425648ecc 100644
--- a/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
+++ b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
@@ -66,9 +66,10 @@ void tst_globaldata::initTestCase()
 
 void tst_globaldata::initTestCase_data()
 {
-    QTest::addColumn<bool>("booli");
-    QTest::newRow("1") << false;
-    QTest::newRow("2") << true;
+    // QFETCH_GLOBAL shall iterate these, for every test:
+    QTest::addColumn<bool>("global");
+    QTest::newRow("global=false") << false;
+    QTest::newRow("global=true") << true;
 }
 
 void tst_globaldata::cleanupTestCase()
@@ -94,41 +95,41 @@ void tst_globaldata::cleanup()
 
 void tst_globaldata::testGlobal_data()
 {
-    QTest::addColumn<bool>("booll");
-    QTest::newRow("local 1") << false;
-    QTest::newRow("local 2") << true;
+    QTest::addColumn<bool>("local");
+    QTest::newRow("local=false") << false;
+    QTest::newRow("local=true") << true;
 }
 
 void tst_globaldata::testGlobal()
 {
-    QFETCH_GLOBAL(bool, booli);
-    qDebug() << "global:" << booli;
-    QFETCH(bool, booll);
-    qDebug() << "local:" << booll;
+    QFETCH_GLOBAL(bool, global);
+    qDebug() << "global:" << global;
+    QFETCH(bool, local);
+    qDebug() << "local:" << local;
 }
 
 void tst_globaldata::skip_data()
 {
-    QTest::addColumn<bool>("booll");
-    QTest::newRow("local 1") << false;
-    QTest::newRow("local 2") << true;
-
+    testGlobal_data();
     QSKIP("skipping");
 }
 
 void tst_globaldata::skip()
 {
-    qDebug() << "this line should never be reached";
+    // A skip in _data() causes the whole test to be skipped, for all global rows.
+    QVERIFY(!"This line should never be reached.");
 }
 
 void tst_globaldata::skipSingle()
 {
-    QFETCH_GLOBAL(bool, booli);
-    QFETCH(bool, booll);
-
-    if (booli && !booll)
-        QSKIP("skipping");
-    qDebug() << "global:" << booli << "local:" << booll;
+    QFETCH_GLOBAL(bool, global);
+    QFETCH(bool, local);
+
+    // A skip in the last run of one global row suppresses the test in the next
+    // global row (where a skip in an earlier run of the first row does not).
+    if (global && !local)
+        QSKIP("Skipping");
+    qDebug() << "global:" << global << "local:" << local;
 }
 
 void tst_globaldata::skipLocal()