Merge lp:~pkgcrosswire/sword/shell-testsuite into lp:sword/debian

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

This enables shell-testsuite at runtime.

It adds the "old" cppunit test as well, but keeps it commented, because it currently is broken.

[Jonathan Marsden (jmarsden)]

Let's do it.

Let's also not forget to offer the code diffs to upstream.

=== modified file 'debian/changelog'
--- debian/changelog	2009-05-25 01:12:22 +0000
+++ debian/changelog	2009-05-25 01:35:48 +0000
@@ -37,8 +37,13 @@
   * debian/libsword8.lintian-overrides: added override for module
     installation directory.
   * debian/copyright: Updated with information about everyfile.
+  * debian/rules:
+    - enabled shell script based testsuite
+    - added commented out cppunit testsuite
+  * debian/patches/40_missing_includes.diff: added missing stdio.h to
+    prevent FTBS of the testsuite.
 
- -- Dmitrijs Ledkovs <[e-mail]>  Sat, 23 May 2009 02:18:34 +0000
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 25 May 2009 01:34:57 +0000
 
 sword (1.5.11-1) experimental; urgency=low
 

=== added file 'debian/patches/40_missing_includes.diff'
--- debian/patches/40_missing_includes.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/40_missing_includes.diff	2009-05-25 01:35:48 +0000
@@ -0,0 +1,49 @@
+Adding missing <stdio.h> includes in the testsuite.
+Index: sword-1.6.0/tests/localetest.cpp
+===================================================================
+--- sword-1.6.0.orig/tests/localetest.cpp	2009-05-25 01:56:37.000000000 +0100
++++ sword-1.6.0/tests/localetest.cpp	2009-05-25 02:15:05.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include <localemgr.h>
+ #include <versekey.h>
+ #include <iostream>
++#include <stdio.h>
+ #ifndef NO_SWORD_NAMESPACE
+ using namespace sword;
+ #endif
+Index: sword-1.6.0/tests/parsekey.cpp
+===================================================================
+--- sword-1.6.0.orig/tests/parsekey.cpp	2009-05-25 01:56:37.000000000 +0100
++++ sword-1.6.0/tests/parsekey.cpp	2009-05-25 02:15:05.000000000 +0100
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <iostream>
++#include <stdio.h>
+ 
+ #include <versekey.h>
+ #include <localemgr.h>
+Index: sword-1.6.0/tests/rawldidxtest.cpp
+===================================================================
+--- sword-1.6.0.orig/tests/rawldidxtest.cpp	2009-05-25 01:56:37.000000000 +0100
++++ sword-1.6.0/tests/rawldidxtest.cpp	2009-05-25 02:15:05.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include <rawstr.h>
+ #include <swmgr.h>
+ #include <filemgr.h>
++#include <stdio.h>
+ 
+ #ifndef __GNUC__
+ #include <io.h>
+Index: sword-1.6.0/tests/filtertest.cpp
+===================================================================
+--- sword-1.6.0.orig/tests/filtertest.cpp	2009-05-25 02:15:14.000000000 +0100
++++ sword-1.6.0/tests/filtertest.cpp	2009-05-25 02:15:27.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <filemgr.h>
+ #include <papyriplain.h>
+ #include <utf8utf16.h>
++#include <stdio.h>
+ //#include <swmgr.h>
+ #ifndef NO_SWORD_NAMESPACE
+ using namespace sword;

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-04-13 03:22:23 +0000
+++ debian/patches/series	2009-05-25 01:35:48 +0000
@@ -1,2 +1,3 @@
 02_libver.diff
+40_missing_includes.diff
 

=== modified file 'debian/rules'
--- debian/rules	2009-05-25 01:12:22 +0000
+++ debian/rules	2009-05-25 01:33:54 +0000
@@ -5,17 +5,21 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu #--enable-debug
+DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu --enable-tests #--enable-debug
 DEB_DH_MAKESHLIBS_ARGS_libsword8 := -V"libsword8 (>= 1.6)"
 DEB_SHLIBDEPS_INCLUDE_libsword8 := debian/tmp/usr/lib
 DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword8/usr/lib
 #DEB_DBG_PACKAGE_libsword8 := libsword-dbg
+#CppUnitTestSuite - currently broken
+#DEB_MAKE_CHECK_TARGET := check
 #DEB_OPT_FLAG=-g -O0 -Werror
 
 # The next two rules use chrpath to remove unwanted rpath info 
 # from the compiled binaries when they are built on amd64.
 
 build/libsword8::
+	#Running Shell based Testsuite
+	$(shell cd tests/testsuite && ./runall.sh 1>&2)
 	chrpath -d $(CURDIR)/lib/.libs/libsword.so*
 	chrpath -d $(CURDIR)/utilities/.libs/*