diff options
| author | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:57:36 +0100 |
|---|---|---|
| committer | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:57:36 +0100 |
| commit | 3830630cea5e901ba0928f8b1d32fd5f3022f21e (patch) | |
| tree | d1f7cb8e53cdb34c93152177b9f0b5339e676c8d /debian | |
| parent | c877190cf867c9b0ad20b47026b77ae8695e29d9 (diff) | |
remove already applied patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/runtests.patch | 105 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 106 deletions
diff --git a/debian/patches/runtests.patch b/debian/patches/runtests.patch deleted file mode 100644 index a485b94..0000000 --- a/debian/patches/runtests.patch +++ /dev/null @@ -1,105 +0,0 @@ -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 6dcf689..9643f59 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 13_curl.diff abicompare.patch -runtests.patch sword-ppc64.patch template-depth.patch |