[med-svn] [seqan2] 01/03: bye armhf; enforce & fix the tests

Michael Crusoe misterc-guest at moszumanska.debian.org
Fri Oct 13 12:05:06 UTC 2017


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

misterc-guest pushed a commit to tag debian/2.3.2+dfsg2-1
in repository seqan2.

commit e13c298f56daf684cc6559d7cf28cfc28f9a8893
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Thu Oct 12 03:11:10 2017 -0700

    bye armhf; enforce & fix the tests
    
    Fix tests to work with -DSEQAN_DISABLE_VERSION_CHECK=YES
---
 debian/changelog                                        |  6 ++++++
 debian/clean                                            |  1 +
 debian/control                                          | 10 ++++++----
 debian/copyright                                        |  7 ++++++-
 debian/patches/fix-version_check-test                   | 13 +++++++++++++
 debian/patches/series                                   |  1 +
 debian/rules                                            | 17 +++++++++--------
 .../lintian-overrides}                                  |  0
 8 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9641cd..e22bb06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+seqan2 (2.3.2+dfsg2-1) UNRELEASED; urgency=medium
+
+  * Still not enough memory for seqan-apps on amrhf, disabling
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Thu, 12 Oct 2017 03:08:47 -0700
+
 seqan2 (2.3.2+dfsg-2) unstable; urgency=medium
 
   * Re-enable armhf, h/t Ubuntu
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..b668703
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+fakehome/
diff --git a/debian/control b/debian/control
index e62344e..2d53b0a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,18 +15,20 @@ Build-Depends: debhelper (>= 10),
                help2man,
                python,
                python-jinja2,
-               python-sphinx,
                python-nose,
-               default-jdk,
                dh-linktree
-Standards-Version: 4.1.0
+#default-jdk,
+#python-sphinx,
+#python-sphinx-rtd-theme,
+Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/seqan2.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/seqan2.git
 Homepage: http://www.seqan.de/
 
 Package: seqan-apps
-Architecture: any-amd64 arm64 armhf any-i386 mips64el powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: any-amd64 arm64 any-i386 mips64el powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
 # Skipping armel as per Adrian Bunk <bunk at debian.org> https://bugs.debian.org/877349
+# Skipping arhmf due to lack of memory
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: C++ library for the analysis of biological sequences
diff --git a/debian/copyright b/debian/copyright
index ef27695..132d47e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,12 @@ Upstream-Name: SeqAn
 Upstream-Contact: Manuel Holtgrewe <manuel.holtgrewe at fu-berlin.de>
                   Hannes Röst <roest at imsb.biol.ethz.ch>
 Source: http://packages.seqan.de/
-Files-Excluded: util/py_lib
+Files-Excluded: util/py_lib/seqan/dox
+                util/py_lib/seqan/dddoc
+                util/py_lib/clang
+                util/py_lib/termcolor.py
+                util/py_lib/threadpool
+                util/py_lib/pyratemp.py
                 util/mingw
                 .*
                 */*.bak
diff --git a/debian/patches/fix-version_check-test b/debian/patches/fix-version_check-test
new file mode 100644
index 0000000..80821fe
--- /dev/null
+++ b/debian/patches/fix-version_check-test
@@ -0,0 +1,13 @@
+Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Description: Fixes test to work with -DSEQAN_DISABLE_VERSION_CHECK=YES
+--- seqan2.orig/tests/arg_parse/test_arg_parse_version_check.h
++++ seqan2/tests/arg_parse/test_arg_parse_version_check.h
+@@ -151,7 +151,7 @@
+     SEQAN_ASSERT_EQ(stream_result[1], "");
+ 
+     // make sure that all files now exist
+-    SEQAN_ASSERT(fileExists(TestVersionCheck_::APP_TIMESTAMP_FILENAME.c_str()));
++    // SEQAN_ASSERT(fileExists(TestVersionCheck_::APP_TIMESTAMP_FILENAME.c_str()));
+     if (app_call_succeeded)
+         SEQAN_ASSERT(fileExists(TestVersionCheck_::APP_VERSION_FILENAME.c_str()));
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 74f65e5..dcf0532 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 spelling
 short-description
 skip-seqan-revision
+fix-version_check-test
diff --git a/debian/rules b/debian/rules
index 6d1016b..cc3b7c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,8 @@ pkgdev=libseqan2-dev
 	dh $@ --parallel
 
 override_dh_auto_configure-arch:
-	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS -DSEQAN_STATIC_APPS=False  # skip the tests for now
+	#	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS -DSEQAN_STATIC_APPS=False  # skip the tests for now
+	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=DEVELOP -DSEQAN_STATIC_APPS=False -DSEQAN_NO_DOX=1 -DSEQAN_DISABLE_VERSION_CHECK=YES
 
 override_dh_auto_configure-indep: ;
 
@@ -109,10 +110,10 @@ override_dh_fixperms-indep:
 	done
 	find $(CURDIR)/debian/$(pkgdev)/usr/share/cmake -type f -exec chmod -x {} \;
 
-override_dh_auto_test:
-# Run test suite only on powerfull architectures (amd64) at build time
-ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64))
-	dh_auto_test || true
-else
-	echo "Do not run test suite when building on architecture $(DEB_HOST_ARCH)"
-endif
+#override_dh_auto_test:
+# # Run test suite only on powerfull architectures (amd64) at build time
+# ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64))
+# 	dh_auto_test
+# else
+# 	echo "Do not run test suite when building on architecture $(DEB_HOST_ARCH)"
+# endif
diff --git a/debian/source.lintian-overrides b/debian/source/lintian-overrides
similarity index 100%
rename from debian/source.lintian-overrides
rename to debian/source/lintian-overrides

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqan2.git



More information about the debian-med-commit mailing list