[med-svn] [khmer] 01/01: update tests

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository khmer.

commit fa2484db168d4efc22983a50bf95dc60ab160381
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue Sep 8 12:23:16 2015 -0700

    update tests
---
 debian/control                |  4 +---
 debian/docs                   |  1 +
 debian/liboxli-dev.install    |  1 +
 debian/rules                  |  2 +-
 debian/tests/control          |  2 +-
 debian/tests/run-unit-test    |  4 +---
 debian/tests/test-liboxli-dev | 19 ++++++++++++++-----
 7 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 8e09b6e..42f0b7d 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Architecture: any
 Multi-Arch: same
 Depends: file,
          ${misc:Depends},
-         ${shlibs:Depends},
          ${sphinxdoc:Depends}
 Description: common files for the khmer project tools
  khmer is a library and suite of command line tools for working with DNA
@@ -48,8 +47,8 @@ Depends: khmer-common,
          python3 (>= 3.3),
          python3-screed,
          python3-screed (<< 1.0),
-         ${misc:Depends},
          ${shlibs:Depends},
+         ${misc:Depends},
          ${python3:Depends}
 Description: in-memory DNA sequence kmer counting, filtering & graph traversal
  khmer is a library and suite of command line tools for working with DNA
@@ -78,7 +77,6 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: khmer-common,
-         ${shlibs:Depends},
          ${misc:Depends}
 Description: in-memory DNA sequence analysis dev library
  khmer is a library and suite of command line tools for working with DNA
diff --git a/debian/docs b/debian/docs
index 46a4240..1733488 100644
--- a/debian/docs
+++ b/debian/docs
@@ -5,3 +5,4 @@ CONTRIBUTING.md
 TODO
 debian/README.test
 debian/tests/run-unit-test
+lib/test-compile.cc
diff --git a/debian/liboxli-dev.install b/debian/liboxli-dev.install
index 78e99a1..7ef9843 100755
--- a/debian/liboxli-dev.install
+++ b/debian/liboxli-dev.install
@@ -1,5 +1,6 @@
 #!/usr/bin/dh-exec
 lib/liboxli.a       usr/lib/${DEB_HOST_MULTIARCH}
 lib/oxli.pc         usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+lib/liboxli.so      usr/lib/${DEB_HOST_MULTIARCH}
 # NB: we install the headers to the oxli subdir.
 lib/*.hh            usr/include/oxli
diff --git a/debian/rules b/debian/rules
index 98b2edf..6673083 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_build:
 	dh_auto_build
 	ln -sf "`pwd`"/.pybuild/pythonX.Y_*/build/khmer/*.so khmer && \
 		./setup.py develop --user && ./setup.py build_sphinx
-	ronn -r --manual=khmer --organization='Michigan State University' \
+	ronn -r --manual=khmer --organization='khmer project' \
 		debian/khmer.1.ronn
 	cd lib && $(MAKE) clean all
 
diff --git a/debian/tests/control b/debian/tests/control
index 2e701c7..144dc45 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: run-unit-test
        test-liboxli-dev
-Depends: @, @builddeps@
+Depends: khmer,python3-nose
 Restrictions: allow-stderr
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index db4492c..62f5745 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -5,6 +5,4 @@ if [ "$ADTTMP" = "" ] ; then
   ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
 fi
 cd $ADTTMP
-cp -rs /usr/lib/python2.7/dist-packages/khmer .
-ln -s /usr/lib/khmer/bin khmer/scripts
-PYTHONPATH=$PWD python2.7 -m nose --attr '!known_failing,!jenkins'
+PATH=/usr/lib/khmer/bin/:$PATH python3 -m nose --attr '!known_failing,!huge' khmer
diff --git a/debian/tests/test-liboxli-dev b/debian/tests/test-liboxli-dev
index 7560e03..adf0e35 100644
--- a/debian/tests/test-liboxli-dev
+++ b/debian/tests/test-liboxli-dev
@@ -1,12 +1,21 @@
-#!/bin/bash
+#!/bin/sh -ex
 
-c++ -o test-prog-static \
-    lib/test-compile.cc \
-    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/liboxli.a
+pkg=khmer
+if [ "$ADTTMP" = "" ] ; then
+  ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+fi
+cd $ADTTMP
+
+c++ -o test-prog-static -std=c++11\
+    /usr/share/doc/khmer-common/test-compile.cc \
+    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/liboxli.a \
+    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libz.a \
+    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libbz2.a
 
 ./test-prog-static
 
-c++ -o test-prog-dynamic  lib/test-compile.cc -loxli
+c++ -o test-prog-dynamic -std=c++11 \
+	/usr/share/doc/khmer-common/test-compile.cc -loxli
 
 ./test-prog-dynamic
 

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