diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-05-13 09:55:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-13 09:55:36 (GMT) |
| commit | df0d9c3df44dbce633c38e99d33be4de06706f7b (patch) | |
| tree | ce3849c4d3f87d1b6049dd3461fa551f56c884a7 | |
| parent | c78c338fffbdbb9b2379b1896e647f7cc697da57 (diff) | |
| parent | 33f574a534239b9d9e713b8d4c9d1d1dedf4d177 (diff) | |
| download | Doxygen-df0d9c3df44dbce633c38e99d33be4de06706f7b.zip Doxygen-df0d9c3df44dbce633c38e99d33be4de06706f7b.tar.gz Doxygen-df0d9c3df44dbce633c38e99d33be4de06706f7b.tar.bz2 | |
Merge pull request #722 from tusharpm/test_flags
Problem with TEST_FLAGS when using CMake for Visual Studio
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | testing/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | testing/runtests.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c55efa..b57d360 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -119,7 +119,7 @@ FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp FLEX_TARGET(sqlcode sqlcode.l ${GENERATED_SRC}/sqlcode.cpp COMPILE_FLAGS "${LEX_FLAGS}") FLEX_TARGET(configimpl configimpl.l ${GENERATED_SRC}/configimpl.cpp COMPILE_FLAGS "${LEX_FLAGS}") -BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS ${YACC_FLAGS}) +BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "${YACC_FLAGS}") add_library(doxycfg STATIC ${GENERATED_SRC}/lang_cfg.h diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index ae5c24f..40cb40b 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,9 +1,9 @@ add_custom_target(tests COMMENT "Running doxygen tests..." - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py $(TEST_FLAGS) --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + 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 $(TEST_FLAGS) --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ) diff --git a/testing/runtests.py b/testing/runtests.py index a714cd8..9330d23 100644 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -293,7 +293,8 @@ def main(): action="store_true") parser.add_argument('--keep',help='keep result directories', action="store_true") - args = parser.parse_args() + test_flags = os.getenv('TEST_FLAGS', default='').split() + args = parser.parse_args(test_flags + sys.argv[1:]) # sanity check if (not args.xml) and (not args.pdf) and (not args.xhtml): |