From 06661e55d73d27b7f6e5cf531e2fa0b96f1d4bd3 Mon Sep 17 00:00:00 2001 From: Afif Elghraoui Date: Wed, 25 Jan 2017 22:15:40 -0800 Subject: [PATCH] Revert "Revert changes in d/rules and deactivate RPATH patch" This reverts commit b8a194c46277fb95b365484360652b765380ffdb. Conflicts: debian/changelog --- debian/patches/series | 2 +- debian/rules | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 446c7fc..da8b790 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -# rpath.patch +rpath.patch diff --git a/debian/rules b/debian/rules index 45f2fff..1534c65 100755 --- a/debian/rules +++ b/debian/rules @@ -14,12 +14,12 @@ HTSLIBDIR := /usr/lib/$(DEB_HOST_MULTIARCH) export HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) export HTSLIB_INCLUDE_DIR=/usr/include -export PYBUILD_TEST_NOSE=1 +#export PYBUILD_TEST_NOSE=1 # pybuild calls nosetests as `python{version} -m nose tests` # # The "tests" argument (passed by pybuild as shown above) fails, # so don't pass anything: -export PYBUILD_TEST_ARGS= +#export PYBUILD_TEST_ARGS= # This is how we pass parameters to nose without command-line flags export NOSE_WHERE=$(CURDIR)/tests export NOSE_VERBOSE=2 @@ -35,7 +35,9 @@ override_dh_install: clean-tests dh_install -Xtest.gtf.gz override_dh_auto_test: pysam_data.all cbcf_data.all - dh_auto_test + #dh_auto_test + dh_auto_test -- --test --system=custom \ + --test-args='set -x; echo "{build_dir}/pysam {interpreter}"; LD_LIBRARY_PATH={build_dir}/pysam {interpreter} -m nose' override_dh_auto_clean: dh_auto_clean -- 2.30.2