summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Hildebrandt <afh@surryhill.net>2014-11-29 09:06:14 +0100
committerAlexis Hildebrandt <afh@surryhill.net>2014-11-29 09:06:14 +0100
commit31ccb6d368c26481d815ba4b54b32752e564239e (patch)
treec5ed12cdf5cc4fc32455ee2a94feca6634d261c5
parenta6d8599688a5a5657827e09a7ab98b060c2b9541 (diff)
downloadfork-ledger-31ccb6d368c26481d815ba4b54b32752e564239e.tar.gz
fork-ledger-31ccb6d368c26481d815ba4b54b32752e564239e.tar.bz2
fork-ledger-31ccb6d368c26481d815ba4b54b32752e564239e.zip
Fix and re-enable DocTests
-rw-r--r--doc/ledger3.texi2
-rw-r--r--test/CMakeLists.txt23
2 files changed, 12 insertions, 13 deletions
diff --git a/doc/ledger3.texi b/doc/ledger3.texi
index e9b0f552..05420295 100644
--- a/doc/ledger3.texi
+++ b/doc/ledger3.texi
@@ -2388,7 +2388,7 @@ fixed CAD $0.90
2012-04-11 Second day Dinner in Canada
Assets:Wallet -25.75 CAD
Expenses:Food 25.75 CAD
-endfixed
+endfixed CAD
@end smallexample
is equivalent to this:
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 21d27c7d..44db81fb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,17 +36,16 @@ add_subdirectory(manual)
add_subdirectory(baseline)
add_subdirectory(regress)
-# jww (2014-04-17): This is temporary until we find a fix.
-#if (PYTHONINTERP_FOUND)
-# set(_class DocTests)
-# file(GLOB ${_class}_TESTS ${PROJECT_SOURCE_DIR}/doc/*.texi)
-# foreach(TestFile ${${_class}_TESTS})
-# get_filename_component(TestFile_Name ${TestFile} NAME_WE)
-# add_test(NAME ${_class}Test_${TestFile_Name}
-# COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/DocTests.py
-# --ledger $<TARGET_FILE:ledger> --file ${TestFile})
-# set_target_properties(check PROPERTIES DEPENDS ${_class}Test_${TestFile_Name})
-# endforeach()
-#endif()
+if (PYTHONINTERP_FOUND)
+ set(_class DocTests)
+ file(GLOB ${_class}_TESTS ${PROJECT_SOURCE_DIR}/doc/*.texi)
+ foreach(TestFile ${${_class}_TESTS})
+ get_filename_component(TestFile_Name ${TestFile} NAME_WE)
+ add_test(NAME ${_class}Test_${TestFile_Name}
+ COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/DocTests.py
+ --ledger $<TARGET_FILE:ledger> --file ${TestFile})
+ set_target_properties(check PROPERTIES DEPENDS ${_class}Test_${TestFile_Name})
+ endforeach()
+endif()
### CMakeLists.txt ends here