This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository hdf5.
commit 277d9660a0afe1c0a5df2848d48b891c55a4dc39 Author: Gilles Filippini <[email protected]> Date: Mon Feb 20 22:37:37 2017 +0100 dh_auto_test for serial flavor --- debian/changelog | 1 + debian/patches/flavor-configure-option.patch | 65 ++++++++++++++++++++++++++++ debian/patches/relax-version-check.patch | 41 ++++++++++++++++-- debian/rules | 7 +++ 4 files changed, 111 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dae1364..fd764f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ hdf5 (1.10.0-patch1+docs-5) UNRELEASED; urgency=medium * Improve flavor-configure-option.patch to manage -dev packages' symlinks and clean-up debian/rules a bit + * Enable dh_auto_test for serial flavor -- Gilles Filippini <[email protected]> Fri, 10 Feb 2017 00:26:57 +0100 diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch index 10f1dcd..55e0e26 100644 --- a/debian/patches/flavor-configure-option.patch +++ b/debian/patches/flavor-configure-option.patch @@ -599,3 +599,68 @@ Index: hdf5-1.10.0-patch1+docs/tools/misc/Makefile.am else H5CC_NAME=h5cc endif +Index: hdf5/java/test/junit.sh.in +=================================================================== +--- hdf5.orig/java/test/junit.sh.in ++++ hdf5/java/test/junit.sh.in +@@ -59,7 +59,7 @@ $HDFLIB_HOME/hamcrest-core.jar + $HDFLIB_HOME/junit.jar + $HDFLIB_HOME/slf4j-api-1.7.5.jar + $HDFLIB_HOME/ext/slf4j-simple-1.7.5.jar +-$top_builddir/src/.libs/libhdf5.* ++$top_builddir/src/.libs/libhdf5@FLAVOR@.* + $top_builddir/java/src/jni/.libs/libhdf5_java.* + $top_builddir/java/src/$JARFILE + " +Index: hdf5/java/examples/datasets/runExample.sh.in +=================================================================== +--- hdf5.orig/java/examples/datasets/runExample.sh.in ++++ hdf5/java/examples/datasets/runExample.sh.in +@@ -56,7 +56,7 @@ test -d $BLDLIBDIR || mkdir -p $BLDLIBDI + LIST_LIBRARY_FILES=" + $HDFLIB_HOME/slf4j-api-1.7.5.jar + $HDFLIB_HOME/ext/slf4j-simple-1.7.5.jar +-$top_builddir/src/.libs/libhdf5.* ++$top_builddir/src/.libs/libhdf5@FLAVOR@.* + $top_builddir/java/src/jni/.libs/libhdf5_java.* + $top_builddir/java/src/$JARFILE + " +Index: hdf5/java/examples/datatypes/runExample.sh.in +=================================================================== +--- hdf5.orig/java/examples/datatypes/runExample.sh.in ++++ hdf5/java/examples/datatypes/runExample.sh.in +@@ -53,7 +53,7 @@ test -d $BLDLIBDIR || mkdir -p $BLDLIBDI + LIST_LIBRARY_FILES=" + $HDFLIB_HOME/slf4j-api-1.7.5.jar + $HDFLIB_HOME/ext/slf4j-simple-1.7.5.jar +-$top_builddir/src/.libs/libhdf5.* ++$top_builddir/src/.libs/libhdf5@FLAVOR@.* + $top_builddir/java/src/jni/.libs/libhdf5_java.* + $top_builddir/java/src/$JARFILE + " +Index: hdf5/java/examples/groups/runExample.sh.in +=================================================================== +--- hdf5.orig/java/examples/groups/runExample.sh.in ++++ hdf5/java/examples/groups/runExample.sh.in +@@ -55,7 +55,7 @@ test -d $BLDREFDIR || mkdir -p $BLDREFDI + LIST_LIBRARY_FILES=" + $HDFLIB_HOME/slf4j-api-1.7.5.jar + $HDFLIB_HOME/ext/slf4j-simple-1.7.5.jar +-$top_builddir/src/.libs/libhdf5.* ++$top_builddir/src/.libs/libhdf5@FLAVOR@.* + $top_builddir/java/src/jni/.libs/libhdf5_java.* + $top_builddir/java/src/$JARFILE + " +Index: hdf5/java/examples/intro/runExample.sh.in +=================================================================== +--- hdf5.orig/java/examples/intro/runExample.sh.in ++++ hdf5/java/examples/intro/runExample.sh.in +@@ -53,7 +53,7 @@ test -d $BLDLIBDIR || mkdir -p $BLDLIBDI + LIST_LIBRARY_FILES=" + $HDFLIB_HOME/slf4j-api-1.7.5.jar + $HDFLIB_HOME/ext/slf4j-simple-1.7.5.jar +-$top_builddir/src/.libs/libhdf5.* ++$top_builddir/src/.libs/libhdf5@FLAVOR@.* + $top_builddir/java/src/jni/.libs/libhdf5_java.* + $top_builddir/java/src/$JARFILE + " diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch index 2f90b0b..12c1cdd 100644 --- a/debian/patches/relax-version-check.patch +++ b/debian/patches/relax-version-check.patch @@ -6,10 +6,10 @@ Description: remove check on patch version access see e.g. H5F_ACC_RDONLY in src/H5Fpublic.h Author: Julian Taylor <[email protected]> Bug-Debian: http://bugs.debian.org/693610 -Index: hdf5/src/H5.c +Index: hdf5-1.10.0-patch1+docs/src/H5.c =================================================================== ---- hdf5.orig/src/H5.c -+++ hdf5/src/H5.c +--- hdf5-1.10.0-patch1+docs.orig/src/H5.c ++++ hdf5-1.10.0-patch1+docs/src/H5.c @@ -778,8 +778,7 @@ H5check_version(unsigned majnum, unsigne disable_version_check = (unsigned int)HDstrtol (s, NULL, 0); } @@ -20,3 +20,38 @@ Index: hdf5/src/H5.c switch (disable_version_check) { case 0: HDfprintf(stderr, "%s%s", version_mismatch_warning, +Index: hdf5-1.10.0-patch1+docs/test/testcheck_version.sh.in +=================================================================== +--- hdf5-1.10.0-patch1+docs.orig/test/testcheck_version.sh.in ++++ hdf5-1.10.0-patch1+docs/test/testcheck_version.sh.in +@@ -154,8 +154,12 @@ TESTING() { + esac + case "$h5DisableVersion" in + 1) +- # W2/OK: Different Warning, exit 0. +- WarnMesg2 > $expect ++ if [ "$wrongversionnumbers" != "r" ]; then ++ # W2/OK: Different Warning, exit 0. ++ WarnMesg2 > $expect ++ else ++ cp /dev/null $expect ++ fi + expect_code=0 + ;; + [2-9]|[1-9][0-9]*) +@@ -164,8 +168,13 @@ TESTING() { + expect_code=0 + ;; + *) # W/A: Warning, abort and exit non-0. +- WarnMesg > $expect +- expect_code=6 # Signal Abort exit code (128+6) ++ if [ "$wrongversionnumbers" != "r" ]; then ++ WarnMesg > $expect ++ expect_code=6 # Signal Abort exit code (128+6) ++ else ++ cp /dev/null $expect ++ expect_code=0 ++ fi + ;; + esac + fi diff --git a/debian/rules b/debian/rules index c2fa414..e18646f 100755 --- a/debian/rules +++ b/debian/rules @@ -298,3 +298,10 @@ override_dh_installchangelogs: override_dh_compress: dh_compress -Xpdf + +auto_test_%: flavor = $(patsubst auto_test_%,%,$@) +auto_test_%: builddir = debian/build-$(flavor) +auto_test_%: + dh_auto_test -B$(builddir) + +override_dh_auto_test: auto_test_serial -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
