diff options
| author | Daniel Glassey <wdg@debian.org> | 2015-09-16 11:04:10 +0100 |
|---|---|---|
| committer | Daniel Glassey <wdg@debian.org> | 2015-09-16 11:04:10 +0100 |
| commit | ee9bd7de369dc0e6db125fad9dc661c608f7ebb2 (patch) | |
| tree | f099575d90df9398c97162386cbe242ba764b5cc /debian/patches | |
| parent | 7321db756201b18b56bfc53f9dd5a77c5866b46d (diff) | |
patch to run tests
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/runtests.patch | 105 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 106 insertions, 0 deletions
diff --git a/debian/patches/runtests.patch b/debian/patches/runtests.patch new file mode 100644 index 0000000..a485b94 --- /dev/null +++ b/debian/patches/runtests.patch @@ -0,0 +1,105 @@ +Description: run tests with make test, disable osis test +Author: Daniel Glassey <wdg@debian.org> + +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -14,7 +14,7 @@ + + MESSAGE(STATUS "\n-- CONFIGURING LIBRARY TESTS") + +-SET(test_PROGRAMS ++SET(tests_PROGRAMS + bibliotest + casttest + ciphertest +@@ -31,6 +31,7 @@ + localetest + mgrtest + modtest ++ osistest + parsekey + rawldidxtest + romantest +@@ -47,8 +48,8 @@ + ) + + IF(WITH_ICU) +- SET(test_PROGRAMS +- ${test_PROGRAMS} ++ SET(tests_PROGRAMS ++ ${tests_PROGRAMS} + icutest + # tlitmgrtest + translittest +@@ -56,20 +57,20 @@ + ENDIF(WITH_ICU) + + IF(WITH_ZLIB OR WITH_INTERNAL_ZLIB) +- SET(test_PROGRAMS +- ${test_PROGRAMS} ++ SET(tests_PROGRAMS ++ ${tests_PROGRAMS} + compzip + ) + ENDIF(WITH_ZLIB OR WITH_INTERNAL_ZLIB) + +-FOREACH(TEST ${test_PROGRAMS}) +- ADD_EXECUTABLE(${TEST} EXCLUDE_FROM_ALL ${TEST}.cpp) ++FOREACH(TESTS ${tests_PROGRAMS}) ++ ADD_EXECUTABLE(${TESTS} EXCLUDE_FROM_ALL ${TESTS}.cpp) + IF(BUILDING_SHARED) +- TARGET_LINK_LIBRARIES(${TEST} sword) ++ TARGET_LINK_LIBRARIES(${TESTS} sword) + ELSE(BUILDING_SHARED) +- TARGET_LINK_LIBRARIES(${TEST} sword_static) ++ TARGET_LINK_LIBRARIES(${TESTS} sword_static) + ENDIF(BUILDING_SHARED) +-ENDFOREACH(TEST ${test_PROGRAMS}) ++ENDFOREACH(TESTS ${tests_PROGRAMS}) + + ######################################################################################## + # The following tests require extra libraries to run +--- a/tests/testsuite/CMakeLists.txt ++++ b/tests/testsuite/CMakeLists.txt +@@ -3,23 +3,24 @@ + # + + ADD_CUSTOM_TARGET( +- tests_configure ++ test_configure + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_BINARY_DIR} + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.good ${CMAKE_CURRENT_BINARY_DIR} ++ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.xml ${CMAKE_CURRENT_BINARY_DIR} + COMMAND echo \"[Install]\\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../\" > ${CMAKE_CURRENT_BINARY_DIR}/sword.conf +- DEPENDS ${test_PROGRAMS} ++ DEPENDS ${tests_PROGRAMS} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + + ADD_CUSTOM_TARGET( +- tests ++ test + COMMAND ./runall.sh + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + + ADD_DEPENDENCIES( +- tests +- tests_configure ++ test ++ test_configure + ) + + MESSAGE(STATUS "Testing configured.") +--- a/tests/testsuite/runall.sh ++++ b/tests/testsuite/runall.sh +@@ -20,7 +20,8 @@ + # General Public License for more details. + # + +-TESTSUITE=`for i in *.good; do basename $i .good; done` ++#TESTSUITE=`for i in *.good; do basename $i .good; done` ++TESTSUITE="listtest versekeytest versemgrtest verseparsing verseparsing-utf8 xmltag" + + for i in $TESTSUITE; do + echo -n "$i: " diff --git a/debian/patches/series b/debian/patches/series index e98e95e..8aff1b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ no-included-zconf.h.diff abicompare.patch multiarch.patch selectively_disable_compiler_warnings.patch +runtests.patch |