[Pkg-crosswire-commits] [sword] 02/03: patch to run tests

[Daniel Glassey]

This is an automated email from the git hooks/post-receive script.

wdg pushed a commit to branch master
in repository sword.

commit ee9bd7de369dc0e6db125fad9dc661c608f7ebb2
Author: Daniel Glassey <wdg at debian.org>
Date:   Wed Sep 16 11:04:10 2015 +0100

    patch to run tests
---
 debian/changelog              |   1 +
 debian/patches/runtests.patch | 105 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |   1 +
 3 files changed, 107 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 533c88b..8c8cfec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sword (1.7.3+dfsg-6) UNRELEASED; urgency=medium
 
   * debian/control: add Vcs-Git and Vcs-Browser
+  * patch to fix tests to run
 
  -- Daniel Glassey <wdg at debian.org>  Wed, 16 Sep 2015 10:32:33 +0100
 
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 at 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/sword.git