diff options
author | Topi Reinio <topi.reinio@qt.io> | 2020-03-04 11:04:34 +0100 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2020-03-04 11:41:20 +0100 |
commit | e0c75e0bb8a2e71e2d6a583158ebd7a825bfd234 (patch) | |
tree | 9c99a84683d9dfe31900b908075f276b59b8ef91 /tests/auto/qdoc/generatedoutput | |
parent | 752216608d0153cd4181853ad78481887af60c2d (diff) | |
download | qttools-e0c75e0bb8a2e71e2d6a583158ebd7a825bfd234.tar.gz |
Add an autotest for QDoc's single-exec generation mode
This test adds no new expected files, as we build two existing
projects with a master qdocconf file in single-exec mode.
Fixes: QTBUG-82667
Change-Id: I89618a2670c3ab1ddfc71f1a76d9c9fce5947291
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput')
4 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf new file mode 100644 index 000000000..2ca75ea0a --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf @@ -0,0 +1,6 @@ +include(testcpp.qdocconf) + +# Config::getOutputDir() forces a subdir in single-exec mode (why?), +# disable it here explicitly +HTML.nosubdirs = true +HTML.outputsubdir = . diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf new file mode 100644 index 000000000..d49498ec0 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf @@ -0,0 +1,4 @@ +include(crossmodule.qdocconf) + +HTML.nosubdirs = true +HTML.outputsubdir = crossmodule diff --git a/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf new file mode 100644 index 000000000..eee0253d0 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf @@ -0,0 +1,2 @@ +./testdata/configs/testcpp_singleexec.qdocconf +./testdata/crossmodule/crossmodule_singleexec.qdocconf diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index 3c47627b3..b3509dfff 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -64,6 +64,7 @@ private slots: void inheritedQmlPropertyGroups(); void crossModuleLinking(); void includeFromExampleDirs(); + void singleExec(); private: QScopedPointer<QTemporaryDir> m_outputDir; @@ -343,6 +344,20 @@ void tst_generatedOutput::includeFromExampleDirs() "includefromexampledirs/qml-qdoc-test-abstractparent-members.html"); } +void tst_generatedOutput::singleExec() +{ + // Build both testcpp and crossmodule projects in single-exec mode + testAndCompare("testdata/singleexec/singleexec.qdocconf", + "testcpp-module.html " + "testqdoc-test.html " + "testqdoc-test-members.html " + "testqdoc.html " + "crossmodule/testtype.html " + "crossmodule/testtype-members.html", + "-single-exec"); +} + + QTEST_APPLESS_MAIN(tst_generatedOutput) #include "tst_generatedoutput.moc" |