diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-08-03 18:05:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 18:05:29 (GMT) |
| commit | 159896658f6da351afee52dc614fe20786742cab (patch) | |
| tree | 1c3ff10f49a4cfcf930b2cfe8852dc588fb873dd /testing | |
| parent | 8d96d4594188e4bcdffe8051a097bab8e40596f8 (diff) | |
| parent | 5e293b201f46bd98695bcc92ce2ecaa1f2b15c54 (diff) | |
| download | Doxygen-159896658f6da351afee52dc614fe20786742cab.zip Doxygen-159896658f6da351afee52dc614fe20786742cab.tar.gz Doxygen-159896658f6da351afee52dc614fe20786742cab.tar.bz2 | |
Merge branch 'master' into feature/bug_xml_lang
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/055/md_055_markdown.xml | 6 | ||||
| -rw-r--r-- | testing/055_markdown.md | 4 | ||||
| -rw-r--r-- | testing/CMakeLists.txt | 27 |
3 files changed, 31 insertions, 6 deletions
diff --git a/testing/055/md_055_markdown.xml b/testing/055/md_055_markdown.xml index ef15ca4..423a28c 100644 --- a/testing/055/md_055_markdown.xml +++ b/testing/055/md_055_markdown.xml @@ -25,6 +25,12 @@ </para> <para>Dash - NDash <ndash/> MDash <mdash/> EDash - ENDash -- EMDash --- E3Dash --- </para> </sect2> + <sect2 id="md_055_markdown_1autotoc_md3"> + <title>Markdown in HTML</title> + <para> + <heading level="3"><bold>Header3</bold> blah <emphasis>blah</emphasis> <computeroutput>blah</computeroutput></heading> + </para> + </sect2> </sect1> </detaileddescription> </compounddef> diff --git a/testing/055_markdown.md b/testing/055_markdown.md index 375040e..695c340 100644 --- a/testing/055_markdown.md +++ b/testing/055_markdown.md @@ -22,3 +22,7 @@ More text [U]: http://example.com/last-line Dash - NDash -- MDash --- EDash \- ENDash \-- EMDash \--- E3Dash \-\-\- + +## Markdown in HTML + +<h3>**Header3** blah _blah_ `blah`</h3> diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 40cb40b..1851c9f 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,9 +1,24 @@ +# run all tests sequentially (keep for backward compatibilty) add_custom_target(tests - COMMENT "Running doxygen tests..." - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing - DEPENDS doxygen -) -add_test(NAME suite - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + COMMENT "Running doxygen tests..." + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + DEPENDS doxygen ) +# get the files in the testing directory starting with 3 digits and an underscore +if (${CMAKE_VERSION} VERSION_EQUAL "3.11.0" OR ${CMAKE_VERSION} VERSION_GREATER "3.11.0") + file(GLOB TEST_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/[0-9][0-9][0-9]_*.*") +else() + file(GLOB TEST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/[0-9][0-9][0-9]_*.*") +endif() + +foreach(TEST_FILE ${TEST_FILES}) + # extract the test name from the file name + string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*.*)\\.[^.]*$" "\\1" TEST_NAME "${TEST_FILE}") + # extract the test id from the file name + string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}") + # add a test target for each test + add_test(NAME ${TEST_NAME} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + ) +endforeach() |