[Debian-astro-commits] [iraf] 01/01: Add built time tests

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository iraf.

commit bbecd75c20e74a0232528662d80d71619d9f5466
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Dec 13 09:37:02 2017 +0100

    Add built time tests
---
 debian/copyright                                       |  6 +++---
 ...tecture-dependency-in-the-names-of-bin-subdir.patch | 18 ++++++++++--------
 debian/rules                                           |  3 +++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index cc8d67d..a61efdd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,7 +38,7 @@ Copyright: 1986-2011 University Corporation for Atmospheric Research (UCAR)
 License: expat
 
 Files: unix/boot/xyacc/*
-Copyright: Copyright: 1988 AT&T,  2008 Sun Microsystems, Inc.
+Copyright: 1988 AT&T,  2008 Sun Microsystems, Inc.
 License: CDDL
 
 Files: math/slalib/*
@@ -91,8 +91,8 @@ Comment: This covers only ast_julday_to_date.
 
 Files: math/lapack/*
 Copyright: 1992-2017 The University of Tennessee and The University of Tennessee Research Foundation
-           2000-2017 The University of California Berkeley
-           2006-2017 The University of Colorado Denverf
+ 2000-2017 The University of California Berkeley
+ 2006-2017 The University of Colorado Denverf
 License: BSD-3-clause
 
 Files: vendor/cfitsio/adler32.c vendor/cfitsio/crc32.c vendor/cfitsio/inffast.c
diff --git a/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
index 6373bb0..5e0129f 100644
--- a/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
+++ b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
@@ -7,11 +7,11 @@ Instead of bin.linux, bin.linux64 they will be names just "bin".
  noao/lib/zzsetenv.def       |  4 ++--
  pkg/cl/exec.c               |  2 +-
  pkg/ecl/exec.c              |  2 +-
- test/run_tests              | 10 ++++------
+ test/run_tests              | 11 ++++-------
  unix/boot/bootlib/envinit.c |  3 +--
  unix/hlib/zzsetenv.def      |  3 ++-
  unix/os/irafpath.c          | 26 +++++++-------------------
- 7 files changed, 18 insertions(+), 32 deletions(-)
+ 7 files changed, 18 insertions(+), 33 deletions(-)
 
 diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
 index c38a4be..f70c92f 100644
@@ -54,22 +54,24 @@ index 322a3ce..4e70bf6 100644
  	     *  on certain platforms look for alternate binaries that may
  	     *  work.  This supports backward compatability with older
 diff --git a/test/run_tests b/test/run_tests
-index 72c58cb..1731304 100755
+index 72c58cb..a275b27 100755
 --- a/test/run_tests
 +++ b/test/run_tests
-@@ -12,13 +12,11 @@
+@@ -10,15 +10,12 @@
+ #
+ 
  if [ -z "$iraf" ] ; then
-     export iraf=$(cd $(dirname $0)/..; pwd)/
- fi
+-    export iraf=$(cd $(dirname $0)/..; pwd)/
+-fi
 -if [ -z "$IRAFARCH" ] ; then
 -    export IRAFARCH=$(${iraf}unix/hlib/irafarch.sh)
--fi
++    export iraf=/usr/lib/iraf/
+ fi
  
 -export arch=.${IRAFARCH}
 -export IRAFBIN=${iraf}bin${arch}/
 -export PATH=$HOME/.iraf/bin:${PATH}
 +export LANG=C
-+export iraf=/usr/lib/iraf/
 +export src=$(cd $(dirname $0)/..; pwd)/
 +export IRAFBIN=${iraf}bin/
  
diff --git a/debian/rules b/debian/rules
index 7735ae6..4751bc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,9 @@ override_dh_auto_install:
 	  install -p -D -m 755 $$f debian/tmp/usr/lib/iraf/$$f ; \
 	done
 
+override_dh_auto_test:
+	PATH=$(BUILD_TMP)/.iraf/bin:$(PATH) tmp=/tmp/ ./test/run_tests
+
 override_dh_clean:
 	make src
 	dh_clean

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