[liblas] 14/15: Fix tests using LD_PRELOAD of liblas.so.

Bas Couwenberg sebastic at debian.org
Mon Aug 22 20:44:34 UTC 2016


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

sebastic pushed a commit to branch master
in repository liblas.

commit b07272d92bed21451a85b3d89aeefa570b47fa43
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 22 22:10:06 2016 +0200

    Fix tests using LD_PRELOAD of liblas.so.
---
 debian/changelog | 1 +
 debian/rules     | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d53cd3c..e3bcd55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ liblas (1.8.1~rc1-1) UNRELEASED; urgency=medium
   * Add patch to fix spelling errors.
   * Add patch to support GNU/kFreeBSD in las2col & las2pg.
   * Add patch to support GNU/Hurd in las2col & las2pg.
+  * Fix tests using LD_PRELOAD of liblas.so.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 22 Aug 2016 15:42:02 +0200
 
diff --git a/debian/rules b/debian/rules
index a9b14fc..a8f8f42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_clean:
 	dh_clean README.txt debian/man/*.1
 
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem cmake -- \
+	dh_auto_configure --builddirectory=debian/build -- \
 		-DCMAKE_VERBOSE_MAKEFILE=1 \
 		-DWITH_GDAL=TRUE \
 		-DWITH_GEOTIFF=TRUE \
@@ -36,13 +36,16 @@ override_dh_auto_build-arch:
 	  mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
 	done
 
-	dh_auto_build
+	dh_auto_build --builddirectory=debian/build
 
 override_dh_auto_build-indep:
 	dh_auto_build --sourcedirectory python --buildsystem pybuild
 
 override_dh_auto_test:
-	dh_auto_test || echo "Ignoring test failures"
+	LD_PRELOAD="$(CURDIR)/debian/build/bin/None/liblas.so.3" dh_auto_test --builddirectory=debian/build || echo "Ignoring test failures"
+
+override_dh_auto_install-arch:
+	dh_auto_install --builddirectory=debian/build
 
 override_dh_auto_install-indep:
 	chmod -x python/examples/* python/scripts/*

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



More information about the Pkg-grass-devel mailing list