diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-06-03 20:08:23 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-06-03 20:08:23 (GMT) |
commit | 0dc4eda500e803a65a10445719c97d7e523897da (patch) | |
tree | 4f302b35c9da4f6175cdea01ec732971fc9d3d2c /testing | |
parent | 0300df460afd3d467860947b1ea60fcb23fcd793 (diff) | |
download | Doxygen-0dc4eda500e803a65a10445719c97d7e523897da.zip Doxygen-0dc4eda500e803a65a10445719c97d7e523897da.tar.gz Doxygen-0dc4eda500e803a65a10445719c97d7e523897da.tar.bz2 |
Fixes for running tests and generating docs with cmake
Diffstat (limited to 'testing')
-rw-r--r-- | testing/CMakeLists.txt | 2 | ||||
-rw-r--r-- | testing/runtests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index af3ddf3..21df5ab 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -3,7 +3,7 @@ find_program(DIFF NAMES diff) add_custom_target(tests COMMENT "Running doxygen tests..." - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing DEPENDS doxygen ) diff --git a/testing/runtests.py b/testing/runtests.py index d0e18dc..64305cc 100644 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -26,7 +26,7 @@ class Tester: return (True,'%s absent' % expected_file) else: diff = os.popen('diff -u %s %s' % (got_file,expected_file)).read() - if diff: + if diff and not diff.isspace(): return (True,'Difference between generated output and reference:\n%s' % diff) return (False,'') |