summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/testlib/selftests')
-rw-r--r--tests/auto/testlib/selftests/expected_assert.junitxml (renamed from tests/auto/testlib/selftests/expected_assert.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_badxml.junitxml (renamed from tests/auto/testlib/selftests/expected_badxml.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml (renamed from tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_benchlibcounting.junitxml (renamed from tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml (renamed from tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_benchliboptions.junitxml (renamed from tests/auto/testlib/selftests/expected_benchliboptions.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml (renamed from tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml (renamed from tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_blacklisted.junitxml (renamed from tests/auto/testlib/selftests/expected_blacklisted.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_cmptest.junitxml (renamed from tests/auto/testlib/selftests/expected_cmptest.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_commandlinedata.junitxml (renamed from tests/auto/testlib/selftests/expected_commandlinedata.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_counting.junitxml (renamed from tests/auto/testlib/selftests/expected_counting.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_datatable.junitxml (renamed from tests/auto/testlib/selftests/expected_datatable.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_datetime.junitxml (renamed from tests/auto/testlib/selftests/expected_datetime.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_differentexec.junitxml (renamed from tests/auto/testlib/selftests/expected_differentexec.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_exceptionthrow.junitxml (renamed from tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_expectfail.junitxml (renamed from tests/auto/testlib/selftests/expected_expectfail.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_failcleanup.junitxml (renamed from tests/auto/testlib/selftests/expected_failcleanup.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_faildatatype.junitxml (renamed from tests/auto/testlib/selftests/expected_faildatatype.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_failfetchtype.junitxml (renamed from tests/auto/testlib/selftests/expected_failfetchtype.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_failinit.junitxml (renamed from tests/auto/testlib/selftests/expected_failinit.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_failinitdata.junitxml (renamed from tests/auto/testlib/selftests/expected_failinitdata.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_fetchbogus.junitxml (renamed from tests/auto/testlib/selftests/expected_fetchbogus.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_findtestdata.junitxml (renamed from tests/auto/testlib/selftests/expected_findtestdata.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_float.junitxml (renamed from tests/auto/testlib/selftests/expected_float.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_globaldata.junitxml (renamed from tests/auto/testlib/selftests/expected_globaldata.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_keyboard.junitxml (renamed from tests/auto/testlib/selftests/expected_keyboard.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_longstring.junitxml (renamed from tests/auto/testlib/selftests/expected_longstring.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_maxwarnings.junitxml (renamed from tests/auto/testlib/selftests/expected_maxwarnings.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_multiexec.junitxml (renamed from tests/auto/testlib/selftests/expected_multiexec.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml (renamed from tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_qexecstringlist.junitxml (renamed from tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_signaldumper.junitxml (renamed from tests/auto/testlib/selftests/expected_signaldumper.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_silent.junitxml (renamed from tests/auto/testlib/selftests/expected_silent.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_singleskip.junitxml (renamed from tests/auto/testlib/selftests/expected_singleskip.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_skip.junitxml (renamed from tests/auto/testlib/selftests/expected_skip.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_skipcleanup.junitxml (renamed from tests/auto/testlib/selftests/expected_skipcleanup.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_skipinit.junitxml (renamed from tests/auto/testlib/selftests/expected_skipinit.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_skipinitdata.junitxml (renamed from tests/auto/testlib/selftests/expected_skipinitdata.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_sleep.junitxml (renamed from tests/auto/testlib/selftests/expected_sleep.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_strcmp.junitxml (renamed from tests/auto/testlib/selftests/expected_strcmp.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_subtest.junitxml (renamed from tests/auto/testlib/selftests/expected_subtest.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_testlib.junitxml (renamed from tests/auto/testlib/selftests/expected_testlib.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml (renamed from tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_verbose1.junitxml (renamed from tests/auto/testlib/selftests/expected_verbose1.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_verbose2.junitxml (renamed from tests/auto/testlib/selftests/expected_verbose2.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml (renamed from tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_warnings.junitxml (renamed from tests/auto/testlib/selftests/expected_warnings.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_watchdog.junitxml (renamed from tests/auto/testlib/selftests/expected_watchdog.xunitxml)0
-rw-r--r--tests/auto/testlib/selftests/expected_xunit.junitxml (renamed from tests/auto/testlib/selftests/expected_xunit.xunitxml)0
-rwxr-xr-xtests/auto/testlib/selftests/generate_expected_output.py4
-rw-r--r--tests/auto/testlib/selftests/tst_selftests.cpp46
52 files changed, 29 insertions, 21 deletions
diff --git a/tests/auto/testlib/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.junitxml
index ca12a45e20..ca12a45e20 100644
--- a/tests/auto/testlib/selftests/expected_assert.xunitxml
+++ b/tests/auto/testlib/selftests/expected_assert.junitxml
diff --git a/tests/auto/testlib/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml
index 49048fdad6..49048fdad6 100644
--- a/tests/auto/testlib/selftests/expected_badxml.xunitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.junitxml
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
index 95d90e6ee7..95d90e6ee7 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
index 05d1da9874..05d1da9874 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
index ce0a81110d..ce0a81110d 100644
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
index 370d1c7c5c..370d1c7c5c 100644
--- a/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
index 779d3bdcbc..779d3bdcbc 100644
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
index 6a0510c4c9..6a0510c4c9 100644
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
index 6e192687fb..6e192687fb 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml
index 397db4c3e4..397db4c3e4 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml
diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
index 5072a7e6f4..5072a7e6f4 100644
--- a/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
diff --git a/tests/auto/testlib/selftests/expected_counting.xunitxml b/tests/auto/testlib/selftests/expected_counting.junitxml
index cb3a7815af..cb3a7815af 100644
--- a/tests/auto/testlib/selftests/expected_counting.xunitxml
+++ b/tests/auto/testlib/selftests/expected_counting.junitxml
diff --git a/tests/auto/testlib/selftests/expected_datatable.xunitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml
index 89fc7ee819..89fc7ee819 100644
--- a/tests/auto/testlib/selftests/expected_datatable.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datatable.junitxml
diff --git a/tests/auto/testlib/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml
index 6fc95719f3..6fc95719f3 100644
--- a/tests/auto/testlib/selftests/expected_datetime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.junitxml
diff --git a/tests/auto/testlib/selftests/expected_differentexec.xunitxml b/tests/auto/testlib/selftests/expected_differentexec.junitxml
index 30ee50bc08..30ee50bc08 100644
--- a/tests/auto/testlib/selftests/expected_differentexec.xunitxml
+++ b/tests/auto/testlib/selftests/expected_differentexec.junitxml
diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
index 7d10bf6f04..7d10bf6f04 100644
--- a/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
diff --git a/tests/auto/testlib/selftests/expected_expectfail.xunitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml
index 47483d71bf..47483d71bf 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.xunitxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml
diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xunitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml
index 813e284ee0..813e284ee0 100644
--- a/tests/auto/testlib/selftests/expected_failcleanup.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml
diff --git a/tests/auto/testlib/selftests/expected_faildatatype.xunitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
index fcc0db3892..fcc0db3892 100644
--- a/tests/auto/testlib/selftests/expected_faildatatype.xunitxml
+++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.xunitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
index a54a37a913..a54a37a913 100644
--- a/tests/auto/testlib/selftests/expected_failfetchtype.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
diff --git a/tests/auto/testlib/selftests/expected_failinit.xunitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml
index 3715725ea5..3715725ea5 100644
--- a/tests/auto/testlib/selftests/expected_failinit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failinit.junitxml
diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xunitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml
index d245bc0dff..d245bc0dff 100644
--- a/tests/auto/testlib/selftests/expected_failinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml
diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
index 77ccbd896a..77ccbd896a 100644
--- a/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xunitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
index c1138da6cb..c1138da6cb 100644
--- a/tests/auto/testlib/selftests/expected_findtestdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
diff --git a/tests/auto/testlib/selftests/expected_float.xunitxml b/tests/auto/testlib/selftests/expected_float.junitxml
index 602f9252a4..602f9252a4 100644
--- a/tests/auto/testlib/selftests/expected_float.xunitxml
+++ b/tests/auto/testlib/selftests/expected_float.junitxml
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml
index de184c2fdd..de184c2fdd 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml
diff --git a/tests/auto/testlib/selftests/expected_keyboard.xunitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml
index 93b5f7bfff..93b5f7bfff 100644
--- a/tests/auto/testlib/selftests/expected_keyboard.xunitxml
+++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml
diff --git a/tests/auto/testlib/selftests/expected_longstring.xunitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml
index 269c06fe08..269c06fe08 100644
--- a/tests/auto/testlib/selftests/expected_longstring.xunitxml
+++ b/tests/auto/testlib/selftests/expected_longstring.junitxml
diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
index 329fae5f1d..329fae5f1d 100644
--- a/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
diff --git a/tests/auto/testlib/selftests/expected_multiexec.xunitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml
index 8ab914842b..8ab914842b 100644
--- a/tests/auto/testlib/selftests/expected_multiexec.xunitxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml
diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
index cf2a30b84a..cf2a30b84a 100644
--- a/tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml
+++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
index b352b8e6b9..b352b8e6b9 100644
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml
+++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
index cbf7075ba1..cbf7075ba1 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
diff --git a/tests/auto/testlib/selftests/expected_silent.xunitxml b/tests/auto/testlib/selftests/expected_silent.junitxml
index ea229d1dc7..ea229d1dc7 100644
--- a/tests/auto/testlib/selftests/expected_silent.xunitxml
+++ b/tests/auto/testlib/selftests/expected_silent.junitxml
diff --git a/tests/auto/testlib/selftests/expected_singleskip.xunitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml
index 2b2da2f504..2b2da2f504 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.xunitxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml
diff --git a/tests/auto/testlib/selftests/expected_skip.xunitxml b/tests/auto/testlib/selftests/expected_skip.junitxml
index 63e582f96a..63e582f96a 100644
--- a/tests/auto/testlib/selftests/expected_skip.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skip.junitxml
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xunitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
index 9934584ec5..9934584ec5 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
diff --git a/tests/auto/testlib/selftests/expected_skipinit.xunitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml
index bab08c375c..bab08c375c 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
index e61d50b06b..e61d50b06b 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
diff --git a/tests/auto/testlib/selftests/expected_sleep.xunitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml
index e4ed66bcb8..e4ed66bcb8 100644
--- a/tests/auto/testlib/selftests/expected_sleep.xunitxml
+++ b/tests/auto/testlib/selftests/expected_sleep.junitxml
diff --git a/tests/auto/testlib/selftests/expected_strcmp.xunitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml
index 66dce857c9..66dce857c9 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.xunitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml
diff --git a/tests/auto/testlib/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml
index b49c006940..b49c006940 100644
--- a/tests/auto/testlib/selftests/expected_subtest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.junitxml
diff --git a/tests/auto/testlib/selftests/expected_testlib.xunitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml
index c9c67c7c9a..c9c67c7c9a 100644
--- a/tests/auto/testlib/selftests/expected_testlib.xunitxml
+++ b/tests/auto/testlib/selftests/expected_testlib.junitxml
diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
index 0a276a17f5..0a276a17f5 100644
--- a/tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml
+++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
diff --git a/tests/auto/testlib/selftests/expected_verbose1.xunitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml
index cb3a7815af..cb3a7815af 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.xunitxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml
diff --git a/tests/auto/testlib/selftests/expected_verbose2.xunitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml
index 6764a5564f..6764a5564f 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.xunitxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml
diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
index 003a31a1cc..003a31a1cc 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
diff --git a/tests/auto/testlib/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml
index 5cca215f12..5cca215f12 100644
--- a/tests/auto/testlib/selftests/expected_warnings.xunitxml
+++ b/tests/auto/testlib/selftests/expected_warnings.junitxml
diff --git a/tests/auto/testlib/selftests/expected_watchdog.xunitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml
index 7e16ab2c34..7e16ab2c34 100644
--- a/tests/auto/testlib/selftests/expected_watchdog.xunitxml
+++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml
diff --git a/tests/auto/testlib/selftests/expected_xunit.xunitxml b/tests/auto/testlib/selftests/expected_xunit.junitxml
index 395b6efdd9..395b6efdd9 100644
--- a/tests/auto/testlib/selftests/expected_xunit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_xunit.junitxml
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index 48ecbf0289..1c0beff7fb 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -86,7 +86,7 @@ class Cleaner (object):
# Build details:
(r'(Config: Using QtTest library).*', r'\1'), # txt
(r'( *<QtBuild)>[^<]+</QtBuild>', r'\1/>'), # xml, lightxml
- (r'(<property value=")[^"]+(" name="QtBuild"/>)', r'\1\2'), # xunitxml
+ (r'(<property value=")[^"]+(" name="QtBuild"/>)', r'\1\2'), # junitxml
# Line numbers in source files:
(r'(ASSERT: ".*" in file .*, line) \d+', r'\1 0'), # lightxml
(r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt
@@ -295,7 +295,7 @@ def testEnv(testname,
return data
def generateTestData(testname, clean,
- formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity', 'tap'),
+ formats = ('xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap'),
# Make sure this matches tst_Selftests::runSubTest_data():
extraArgs = {
"commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2",
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 331ae48135..6e4a7896f6 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -280,13 +280,17 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const
QStringList() << "xml",
QStringList() << "-xml" << "-o" << logName("xml")
)
- << LoggerSet("old stdout xunitxml",
- QStringList() << "stdout xunitxml",
- QStringList() << "-xunitxml"
+ << LoggerSet("old stdout junitxml",
+ QStringList() << "stdout junitxml",
+ QStringList() << "-junitxml"
)
- << LoggerSet("old xunitxml",
- QStringList() << "xunitxml",
- QStringList() << "-xunitxml" << "-o" << logName("xunitxml")
+ << LoggerSet("old junitxml",
+ QStringList() << "junitxml",
+ QStringList() << "-junitxml" << "-o" << logName("junitxml")
+ )
+ << LoggerSet("old xunitxml compatibility",
+ QStringList() << "junitxml",
+ QStringList() << "-xunitxml" << "-o" << logName("junitxml")
)
<< LoggerSet("old stdout lightxml",
QStringList() << "stdout lightxml",
@@ -335,13 +339,17 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const
QStringList() << "xml",
QStringList() << "-o" << logName("xml")+",xml"
)
- << LoggerSet("new stdout xunitxml",
- QStringList() << "stdout xunitxml",
+ << LoggerSet("new stdout junitxml",
+ QStringList() << "stdout junitxml",
+ QStringList() << "-o" << "-,junitxml"
+ )
+ << LoggerSet("new stdout xunitxml compatibility",
+ QStringList() << "stdout junitxml",
QStringList() << "-o" << "-,xunitxml"
)
- << LoggerSet("new xunitxml",
- QStringList() << "xunitxml",
- QStringList() << "-o" << logName("xunitxml")+",xunitxml"
+ << LoggerSet("new junitxml",
+ QStringList() << "junitxml",
+ QStringList() << "-o" << logName("junitxml")+",junitxml"
)
<< LoggerSet("new stdout lightxml",
QStringList() << "stdout lightxml",
@@ -384,24 +392,24 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const
QStringList() << "-o" << logName("xml")+",xml"
<< "-o" << "-,txt"
)
- << LoggerSet("txt + xunitxml",
- QStringList() << "txt" << "xunitxml",
+ << LoggerSet("txt + junitxml",
+ QStringList() << "txt" << "junitxml",
QStringList() << "-o" << logName("txt")+",txt"
- << "-o" << logName("xunitxml")+",xunitxml"
+ << "-o" << logName("junitxml")+",junitxml"
)
- << LoggerSet("lightxml + stdout xunitxml",
- QStringList() << "lightxml" << "stdout xunitxml",
+ << LoggerSet("lightxml + stdout junitxml",
+ QStringList() << "lightxml" << "stdout junitxml",
QStringList() << "-o" << logName("lightxml")+",lightxml"
- << "-o" << "-,xunitxml"
+ << "-o" << "-,junitxml"
)
// All loggers at the same time (except csv)
<< LoggerSet("all loggers",
- QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml" << "tap",
+ QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "junitxml" << "tap",
QStringList() << "-o" << logName("txt")+",txt"
<< "-o" << logName("xml")+",xml"
<< "-o" << logName("lightxml")+",lightxml"
<< "-o" << "-,txt"
- << "-o" << logName("xunitxml")+",xunitxml"
+ << "-o" << logName("junitxml")+",junitxml"
<< "-o" << logName("teamcity")+",teamcity"
<< "-o" << logName("tap")+",tap"
)