summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-06-17 13:25:35 +0200
committerTopi Reinio <topi.reinio@qt.io>2020-06-17 14:21:26 +0200
commit607dc394515c3afa3412c9322a4ee310c9118167 (patch)
treec256316cdcdd4ff92b8b6b0d03e63ebc0c2bbf10
parentdbc3ea8150aebe8b4964c533c2f6faecfc01f816 (diff)
qdoc: Enforce zero warning policy to generatedOutput autotest
After fixing QTBUG-82874, we can now set the acceptable number of QDoc warnings to zero for all test projects. Implement this in a shared .qdocconf that is included in all test projects. Change-Id: Iae06bb7033fc6d7b3bff701f7d57e826b735f036 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/config.qdocconf8
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf5
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf5
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf6
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf1
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf1
21 files changed, 27 insertions, 14 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf
index 23a4b27f6..97599d0be 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf
@@ -1,3 +1,4 @@
+include(../configs/config.qdocconf)
project = TestModule
moduleheader = TestModule.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/config.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/config.qdocconf
new file mode 100644
index 000000000..f5de49253
--- /dev/null
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/config.qdocconf
@@ -0,0 +1,8 @@
+# Shared configuration for all tests
+
+# zero warning policy
+warninglimit = 0
+warninglimit.enable = true
+
+# don't write host system-specific paths to index files
+locationinfo = false
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf
index e8095e405..cf9880078 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf
@@ -1,2 +1,3 @@
+include(config.qdocconf)
include(test.qdocconf)
include(docbook.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
index 0abdf8169..f2b714e00 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
@@ -1,2 +1,3 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
include(docbook.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf
index 0a0a18b07..028690834 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf
@@ -1,2 +1,3 @@
+include(config.qdocconf)
include(testqml.qdocconf)
include(docbook.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf
index 11695289e..4b9f86938 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf
@@ -1,4 +1,5 @@
# QML test includes a documented example
+include(config.qdocconf)
include(testqml.qdocconf)
version = 0.0.1
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf
index b270556d1..9e6716f3a 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
project = HeaderFile
moduleheader = testheader.h
@@ -11,7 +12,3 @@ HTML.nosubdirs = true
HTML.outputsubdir = headerfile
DocBook.nosubdirs = true
DocBook.outputsubdir = headerfile-docbook
-
-# zero warning tolerance
-warninglimit = 0
-warninglimit.enabled = true
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf
index 0aa0dbc45..019b15b3a 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
defines += test_ignoresince
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf
index 64475be7e..056b30452 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
defines += test_nestedmacro
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf
index fc720c57e..16824db0e 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(testqml.qdocconf)
defines += test_noautolist
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf
index bd71bc720..0c1501213 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
defines += test_scopedenum
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf
index bcc5c0926..80e7c2fee 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
project = OutputFromQDocFiles
description = "A test project for QDoc build artifacts"
buildversion = "$project - $description"
@@ -10,7 +11,3 @@ macro.endqdoc = "\\c */"
macro.PROD = QDoc
defines = test_navigation
-
-# zero warning tolerance
-warninglimit = 0
-warninglimit.enabled = true
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf
index 7bb7810f1..094545756 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
project = TestCPP
includepaths += -I../testcpp
@@ -7,8 +8,3 @@ sources = ../testcpp/testcpp.cpp
macro.CMDFN = \\\\fn
macro.nothing = \\dontdocument ()
macro.testnoautolist = \\if defined(test_noautolist)\n\\noautolist\n\\endif
-locationinfo = false
-
-# zero warning tolerance
-warninglimit = 0
-warninglimit.enabled = true
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf
index 8eec4ea4d..cdd4829c2 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
moduleheader = TestCPP
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf
index c53e43177..575a30d8d 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
defines += test_template
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf
index 69e0dfac2..ba950532b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf
@@ -1,3 +1,4 @@
+include(config.qdocconf)
include(test.qdocconf)
defines =
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf
index 903c7fcfe..d6e6290b8 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf
@@ -1,4 +1,3 @@
-locationinfo = false
outputformats = WebXML
WebXML.quotinginformation = true
WebXML.nosubdirs = true
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf
index bac4f3b4e..468bc42b5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf
@@ -1,2 +1,3 @@
+include(config.qdocconf)
include(test.qdocconf)
include(webxml.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
index e242cef27..dee1f4dcc 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
@@ -1,2 +1,3 @@
+include(config.qdocconf)
include(testcpp.qdocconf)
include(webxml.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf
index 537685700..8dbbfd860 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf
@@ -1,2 +1,3 @@
+include(config.qdocconf)
include(testqml.qdocconf)
include(webxml.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
index fb4a6be77..359063f34 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
@@ -1,3 +1,4 @@
+include(../configs/config.qdocconf)
project = CrossModule
includepaths += -I.