QDoc: Consolidate test configuration
QDoc's generated output test contains multiple configuration files that generate documentation from the same source files. This change moves the configuration and source files such that they reside in a shared directory, `testdata/outputfromqdocfiles`. The configuration files, as well as the test itself, is updated with the new location. Task-number: QTBUG-119500 Change-Id: If4f8cb36a6b37e6bc1c41d2bf5905d3cab0dc0eb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
+3
-3
@@ -21,10 +21,10 @@ locationinfo = false
|
||||
HTML.nosubdirs = true
|
||||
HTML.outputsubdir = .
|
||||
|
||||
sources = ../outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc \
|
||||
../outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc
|
||||
sources = qdoctests-outputfromqdocfiles.qdoc \
|
||||
qdoctests-outputfromqdocmanuallikefiles.qdoc
|
||||
|
||||
exampledirs = ../outputfromqdocfiles/snippets
|
||||
exampledirs = snippets
|
||||
|
||||
macro.beginqdoc = "\\c {/*!}"
|
||||
macro.endqdoc = "\\c */"
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
include(tocnavigation.qdocconf)
|
||||
|
||||
sources += ../toc/toc.qdoc
|
||||
sources += toc.qdoc
|
||||
|
||||
navigation.toctitles = TOC
|
||||
navigation.toctitles.inclusive = true
|
||||
@@ -196,7 +196,7 @@ void tst_generatedOutput::copyIndexFiles()
|
||||
|
||||
void tst_generatedOutput::htmlFromQDocFile()
|
||||
{
|
||||
testAndCompare("testdata/configs/test.qdocconf",
|
||||
testAndCompare("testdata/outputfromqdocfiles/test.qdocconf",
|
||||
"qdoctests-qdocfileoutput.html "
|
||||
"qdoctests-qdocfileoutput-linking.html "
|
||||
"qdoctests-qdocmanuallikefileoutput.html "
|
||||
@@ -248,7 +248,7 @@ void tst_generatedOutput::htmlFromQml()
|
||||
|
||||
void tst_generatedOutput::webXmlFromQDocFile()
|
||||
{
|
||||
testAndCompare("testdata/configs/webxml_test.qdocconf",
|
||||
testAndCompare("testdata/outputfromqdocfiles/webxml_test.qdocconf",
|
||||
"html/qdoctests-qdocfileoutput.webxml "
|
||||
"html/qdoctests-qdocmanuallikefileoutput.webxml "
|
||||
"html/qdoctests-qdocfileoutput-linking.webxml "
|
||||
@@ -283,7 +283,7 @@ void tst_generatedOutput::tableAfterValue()
|
||||
|
||||
void tst_generatedOutput::docBookFromQDocFile()
|
||||
{
|
||||
testAndCompare("testdata/configs/docbook_test.qdocconf",
|
||||
testAndCompare("testdata/outputfromqdocfiles/docbook_test.qdocconf",
|
||||
"docbook/qdoctests-qdocfileoutput.xml "
|
||||
"docbook/qdoctests-qdocmanuallikefileoutput.xml "
|
||||
"docbook/qdoctests-qdocfileoutput-linking.xml "
|
||||
@@ -322,7 +322,7 @@ void tst_generatedOutput::docBookFromQml()
|
||||
|
||||
void tst_generatedOutput::docBookWithExtensionsFromQDocFile()
|
||||
{
|
||||
testAndCompare("testdata/configs/docbookext_test.qdocconf",
|
||||
testAndCompare("testdata/outputfromqdocfiles/docbookext_test.qdocconf",
|
||||
"docbookext/qdoctests-qdocfileoutput.xml "
|
||||
"docbookext/qdoctests-qdocmanuallikefileoutput.xml "
|
||||
"docbookext/qdoctests-qdocfileoutput-linking.xml "
|
||||
@@ -360,7 +360,7 @@ void tst_generatedOutput::docBookWithExtensionsFromQml()
|
||||
void tst_generatedOutput::autoNavigation()
|
||||
{
|
||||
// Same expected files as htmlFromQdocFile, but with auto-generated navigation links
|
||||
testAndCompare("testdata/configs/tocnavigation.qdocconf",
|
||||
testAndCompare("testdata/outputfromqdocfiles/tocnavigation.qdocconf",
|
||||
"qdoctests-qdocfileoutput.html "
|
||||
"qdoctests-qdocfileoutput-linking.html "
|
||||
"qdoctests-qdocfileoutput-exhaustive.html "
|
||||
@@ -369,7 +369,7 @@ void tst_generatedOutput::autoNavigation()
|
||||
|
||||
void tst_generatedOutput::tocBreadcrumbs()
|
||||
{
|
||||
testAndCompare("testdata/configs/tocbreadcrumbs.qdocconf",
|
||||
testAndCompare("testdata/outputfromqdocfiles/tocbreadcrumbs.qdocconf",
|
||||
"tocbreadcrumbs/qdoctests-qdocfileoutput.html "
|
||||
"tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html "
|
||||
"tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html "
|
||||
|
||||
Reference in New Issue
Block a user