[scalapack] 01/01: scalapack-mpi-test: install links to BLACS test executables

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository scalapack.

commit 548ad1c8d4deb518486e0026ab126c310cac5f77
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Aug 15 16:51:59 2017 +0800

    scalapack-mpi-test: install links to BLACS test executables
    
    BLACS test executables are built in to the top TESTING directory. They
    are only built in BLACS/TESTING when testing is actually run (ctest).
    
    So rather than installing them (xCbtest, xFbtest) twice, install from
    the top level TESTING and link from BLACS/TESTING.
    
    In particular this enables a successful package build when
    DEB_BUILD_OPTIONS=nocheck, i.e. when dh_auto_test is not run (such
    that ctest is not launched to build in BLACS/TESTING)
    
    nocheck is the standard configuration for m68k.
    i.e. this patch enables a successful package build on m68k
---
 debian/changelog                  |  6 ++++++
 debian/rules                      |  1 -
 debian/scalapack-mpi-test.install |  1 -
 debian/scalapack-mpi-test.links   | 28 +++++++++++++---------------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c11f1e..2f2fddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scalapack (2.0.2-1exp7) UNRELEASED; urgency=medium
+
+  * scalapack-mpi-test: install links to BLACS test executables
+
+ -- Drew Parsons <dparsons at debian.org>  Tue, 15 Aug 2017 16:47:00 +0800
+
 scalapack (2.0.2-1exp6) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 9a2a639..de85942 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,6 @@ override_dh_install-arch:
 	dh_missing --list-missing
 	# test executables contain RUNPATH. Remove it.
 	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/x*
-	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/BLACS/x*
 	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/PBLAS/*tst
 	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/PBLAS/TIMING/*tim
 
diff --git a/debian/scalapack-mpi-test.install b/debian/scalapack-mpi-test.install
index 22c3886..473f835 100755
--- a/debian/scalapack-mpi-test.install
+++ b/debian/scalapack-mpi-test.install
@@ -2,7 +2,6 @@
 for flavour in openmpi mpich; do
   echo build-${flavour}/TESTING/x* usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests
   echo build-${flavour}/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests
-  echo build-${flavour}/BLACS/TESTING/x* usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS
   echo build-${flavour}/BLACS/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS
   echo build-${flavour}/PBLAS/TESTING/*tst usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS
   echo build-${flavour}/PBLAS/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS
diff --git a/debian/scalapack-mpi-test.links b/debian/scalapack-mpi-test.links
index 35f798d..e4eea6c 100755
--- a/debian/scalapack-mpi-test.links
+++ b/debian/scalapack-mpi-test.links
@@ -1,25 +1,23 @@
 #! /bin/sh
-for d in TESTING/*.dat; do
-  datafile=`basename $d`
-  for flavour in openmpi mpich; do
+for flavour in openmpi mpich; do
+  for d in TESTING/*.dat; do
+    datafile=`basename $d`
     echo usr/share/scalapack/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/${datafile}
   done
-done
-for d in BLACS/TESTING/*.dat; do
-  datafile=`basename $d`
-  for flavour in openmpi mpich; do
+  for d in BLACS/TESTING/*.dat; do
+    datafile=`basename $d`
     echo usr/share/scalapack/BLACS/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS/${datafile}
   done
-done
-for d in PBLAS/TESTING/*.dat; do
-  datafile=`basename $d`
-  for flavour in openmpi mpich; do
+  # BLACS test executables get built in the top directory, so link to them
+  for blacsTest in xCbtest xFbtest; do
+    echo usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/${blacsTest} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS/${blacsTest}
+  done
+  for d in PBLAS/TESTING/*.dat; do
+    datafile=`basename $d`
     echo usr/share/scalapack/PBLAS/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/${datafile}
   done
-done
-for d in PBLAS/TIMING/*.dat; do
-  datafile=`basename $d`
-  for flavour in openmpi mpich; do
+  for d in PBLAS/TIMING/*.dat; do
+    datafile=`basename $d`
     echo usr/share/scalapack/PBLAS/TIMING/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/TIMING/${datafile}
   done
 done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scalapack.git