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

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit e94afee289be668ca111ed136883951ec8289bb3
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Tue Oct 21 00:05:52 2014 +0200

    Disable tests for s390x
---
 debian/changelog |  8 ++++++--
 debian/rules     | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8340687..58b983c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-libhdf4 (4.2.10-2ppc64el2) UNRELEASED; urgency=medium
+libhdf4 (4.2.10-3) UNRELEASED; urgency=medium
 
+  [ Fernando Seiti Furusato ]
   * Fix endianness definition for ppc64el.
 
- -- Fernando Seiti Furusato <ferse...@br.ibm.com>  Fri, 10 Oct 2014 23:13:28 
+0000
+  [ Johan Van de Wauw ]
+  * Disable tests on s390x 
+
+ -- Johan Van de Wauw <johan.vandew...@gmail.com>  Mon, 20 Oct 2014 22:18:44 
+0200
 
 libhdf4 (4.2.10-2) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index edc495c..a64553c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,12 @@ ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    export DH_VERBOSE
 endif
 
+ifeq ($(shell arch), s390x)
+   DISABLE_TESTS=1
+else
+   DISABLE_TESTS=0
+endif
+
 unpack:                stamps/unpack-stamp
 patch:         stamps/patch-stamp
 build-arch:    debian/control stamps/build-arch-stamp
@@ -93,16 +99,20 @@ stamps/build-arch-stamp: patch configure
                        $(MAKE) -C HDF4 \
                                        F77="$(F77)"  CC="$(CC)" CXX="$(CXX)" 
CFLAGS="$(CFLAGS)" \
                                        LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"
+                       if [ "$(DISABLE_TESTS)" = 0 ]; then \
                        $(MAKE) -C HDF4 check\
-                                       F77="$(F77)"  CC="$(CC)" CXX="$(CXX)" 
CFLAGS="$(CFLAGS)" \
-                                       LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"
+                               F77="$(F77)"  CC="$(CC)" CXX="$(CXX)" 
CFLAGS="$(CFLAGS)" \
+                               LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"; \
+                       fi
        
TESTS_ENVIRONMENT="LD_LIBRARY_PATH=$(CURDIR)/HDF4_ALT/hdf/src:$(CURDIR)/HDF4_ALT/mfhdf/libsrc:/usr/lib"
 \
                        $(MAKE) -C HDF4_ALT  \
                                        CC="$(CC)" CXX="$(CXX)" 
CFLAGS="$(CFLAGS)" \
                                        LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"
+                       if [ "$(DISABLE_TESTS)" = 0 ]; then \
                        $(MAKE) -C HDF4_ALT check \
-                                       CC="$(CC)" CXX="$(CXX)" 
CFLAGS="$(CFLAGS)" \
-                                       LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"
+                               CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" \
+                               LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"; \
+                       fi;
        touch $@
 
 stamps/build-indep-stamp: patch

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to