[netcdf] 06/15: enable parallel tests, disable double doxygen

[Alastair McKinstry]

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

mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.

commit 5dc9417be7aa64673ac95a6a0cef43726a2855f6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 6 05:22:17 2014 +0100

    enable parallel tests, disable double doxygen
---
 debian/rules | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1a62b01..d211937 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,19 +24,19 @@ override_dh_auto_configure:
 	-DHDF5_HL_INCLUDE_DIR="/usr/include/serial/hdf5" \
 	-DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_serial_hl.so \
 	-DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_serial.so \
-	-DLIBLIB_VERSION_SCRIPT="-Wl,--version-script,${TOP}/debian/netcdf-serial.ver"
+	-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-serial.ver
 	dh_auto_configure --builddirectory=build-mpi --  \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \
 	-DENABLE_PARALLEL_TESTS:BOOL=OFF \
-	-DENABLE_TESTS:BOOL=OFF \
-	-DENABLE_DOXYGEN:BOOL=ON \
+	-DENABLE_TESTS:BOOL=ON \
+	-DENABLE_DOXYGEN:BOOL=OFF \
 	-DUSE_PARALLEL=ON \
-        -DHDF5_C_INCLUDE_DIR="/usr/include/${MPI}/hdf5" \
-        -DHDF5_HL_INCLUDE_DIR="/usr/include/${MPI}/hdf5" \
+        -DHDF5_C_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
+        -DHDF5_HL_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
 	-DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}_hl.so \
 	-DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}.so \
-	-DLIBLIB_VERSION_SCRIPT="-Wl,--version-script,${TOP}/debian/netcdf-mpi.ver" \
+	-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-mpi.ver \
 	-DCMAKE_C_COMPILER=mpicc 
 
 override_dh_auto_build:
@@ -44,8 +44,8 @@ override_dh_auto_build:
 	$(MAKE) -C build-mpi
 
 override_dh_auto_test:
-	$(MAKE) -C build-serial test
-	$(MAKE) -C build-mpi test
+	LD_LIBRARY_PATH=$(TOP)/build-serial/lib-lib $(MAKE) -C build-serial test
+	LD_LIBRARY_PATH=$(TOP)/build-mpi/lib-lib    $(MAKE) -C build-mpi test
 
 override_dh_auto_clean:
 	rm -rf build-*

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