From 6c90fd5b0b804ae3d346cb8ad3050c272b293803 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 26 Nov 2013 17:08:09 -0500
Subject: [PATCH] [svn-r24467] tfilters.h5 was created and checked in on 21 Feb
 05, rev 10060, and never regenerated. The code for scaleoffset continued to
 change and the number of params for scaleoffset changed from 7 to 20 on the
 checkin of 23 Mar 05, rev 10384. The h5dump tests only looked at headers and
 never the data. Data reads would fail with invalid number of params (7
 expected 20). Regenerated file and replacement ddls updated. New h5dump test
 will be added to read the data.

---
 bin/reconfigure                  |  42 ++++++++++++++++++-------------
 tools/testfiles/tcontiguos.ddl   |   2 +-
 tools/testfiles/tfilters.h5      | Bin 46272 -> 46496 bytes
 tools/testfiles/tscaleoffset.ddl |   4 +--
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/bin/reconfigure b/bin/reconfigure
index dba5a67435..c058a1ea5e 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -29,9 +29,9 @@
 
 # HDF5 currently uses the following versions of the autotools:
 AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.69"
-AUTOMAKE_VERSION="automake (GNU automake) 1.12.3"
+AUTOMAKE_VERSION="automake (GNU automake) 1.13.4"
 AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69"
-ACLOCAL_VERSION="aclocal (GNU automake) 1.12.3"
+ACLOCAL_VERSION="aclocal (GNU automake) 1.13.4"
 LIBTOOL_VERSION="(GNU libtool) 2.4.2"
 M4_VERSION="m4 (GNU M4) 1.4.16"
 
@@ -42,23 +42,26 @@ M4_VERSION="m4 (GNU M4) 1.4.16"
 
 # If paths to autotools are not specified by the user, assume tools are
 # running on jam in /mnt/hdf/packages and set paths accordingly.
+if test -z ${AUTORECONF}; then
+  AUTORECONF=/usr/bin/autoreconf
+fi
 if test -z ${AUTOCONF}; then
-  AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoconf
+  AUTOCONF=/usr/bin/autoconf
 fi
 if test -z ${AUTOMAKE}; then
-  AUTOMAKE=/mnt/hdf/packages/automake/automake-1.12.3/bin/automake-1.12
+  AUTOMAKE=/usr/bin/automake-1.13
 fi
 if test -z ${AUTOHEADER}; then
-  AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoheader
+  AUTOHEADER=/usr/bin/autoheader
 fi
 if test -z ${ACLOCAL}; then
-  ACLOCAL=/mnt/hdf/packages/automake/automake-1.12.3/bin/aclocal-1.12
+  ACLOCAL=/usr/bin/aclocal-1.13
 fi
 if test -z ${LIBTOOL}; then
-  LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool
+  LIBTOOL=/usr/bin/libtool
 fi
 if test -z ${M4}; then
-  M4=/mnt/hdf/packages/m4/m4-1.4.16/bin/m4
+  M4=/usr/bin/m4
 fi
 
 # Check version numbers of all autotools against the "correct" versions
@@ -100,17 +103,20 @@ M4_DIR=`dirname ${M4}`
 PATH=${AUTOCONF_DIR}:${M4_DIR}:$PATH
 
 # Run autoconf/automake commands in order
-  echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal
-  ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal || exit 1
+#  echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal
+#  ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal || exit 1
+#
+#  echo ${AUTOHEADER}
+#  ${AUTOHEADER} || exit 1
+#
+#  echo ${AUTOMAKE} --add-missing
+#  ${AUTOMAKE} --add-missing || exit 1
+#
+#  echo ${AUTOCONF}
+#  ${AUTOCONF} || exit 1
 
-  echo ${AUTOHEADER}
-  ${AUTOHEADER} || exit 1
-
-  echo ${AUTOMAKE} --add-missing
-  ${AUTOMAKE} --add-missing || exit 1
-
-  echo ${AUTOCONF}
-  ${AUTOCONF} || exit 1
+  echo ${AUTORECONF}
+  ${AUTORECONF} || exit 1
 
 # Clean up top-level Makefile.in
 # pmake wants an argument to be the first non-comment line it encounters
diff --git a/tools/testfiles/tcontiguos.ddl b/tools/testfiles/tcontiguos.ddl
index bda7ef7778..8e0158e451 100644
--- a/tools/testfiles/tcontiguos.ddl
+++ b/tools/testfiles/tcontiguos.ddl
@@ -6,7 +6,7 @@ COMMENT "This is a dataset with contiguous storage"
    STORAGE_LAYOUT {
       CONTIGUOUS
       SIZE 800
-      OFFSET 4096
+      OFFSET 2472
    }
    FILTERS {
       NONE
diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5
index c28b1b1fc7b7b75026bb9bb130a6ca1c14feb7f1..7c33e55aae13257bff664e1d36312dc5fcb08128 100644
GIT binary patch
delta 2626
zcmb_eYfM~46rP#8?9N?YcLD2aDBMEI(xlpzN7+JCmZaE?i3I^0G!`z}QcD+D#kRy3
zv_?u>On{S;6;oM^iEHT($i~Nyn(#|8!DM4%Y>YAJAFI}sKbrbT>%3SN=$~!fo7_2P
z&YU~n`OcX$JO2xb{6<Fe22j%Pw)#arl9Ma?$`VTnSdGJKj1nne#2<v*YTktmA+2B6
z(o|oM5JBwwa30_HK%+xCc$J^KT?(bKx#FMkm_>6ewPjqbn7s%O_7sq71gd);hNIYk
zxMpm}s8rZ7k<0VcYNr~Lb-1qO8)=9Nz(je(d^WEJrM3)P`S?&1EICaWcH}@#`hjt3
zknoGpfeXM(b$pIX&ZzpXF(nLxl#<p<!eS~*)Fmu&O0hXsSLl>{AQYxz-qb1al?u^n
zOC5iH0zZ)vQ${@xUBgiwF6*WYBd%9NS^FOF580uiCM(uzGql*h6Zu-qziA%t#>gR@
z<O{JOH5NA~P-yE=5be_(_{>?j!e$x#)Z7O1drY#B0oCpjeKb?@v;fmZg`_nL&bdp7
znH~GCWkOFmn;FSC;7WQeK?O;>H(StHWa`(l<(3Db&Rt0A4VWw{(ce>fIS6BH^0x7R
z09eeZB7tojfP)tkLIId|JPx7lK7FuUV(8!)^d+TPoCLkDLfR|=Wx9ev8Pa3Xo!>Z)
zP<0680`^|c*){W3#evsu;Qq<E;`%E;{Bh*0m}5D-x16r!^83sxGP-+1DD$U$1Xqeg
zepx9&$wZFr<cY*j#kM?jMu)qp?6vz}&#EHBfergdGzvFQWZ*PNJ6QuC7hA9t@abE8
z63U_=_xFV6s`cPSLF${;BEK!E6gvN=#@ZQAfk6?niA^-|UQ>6$<^~dPPQvPCX|H5y
zcZ0vh)Sqz)7nCc|^(Hi)`qK%GSK$R0LpiKNS5H>TN8!n2NPNR|6cW&}Dj~ZFB@gvI
z*AYD2+u7N7_$7ghH*y|Ynb4%XQgxUGQl6P;F+{U09_A)q-Oc+O_F~pd2bEvzS<%!Y
z?UXD$%0*{LS&Y|(Wtmy7?h}?qWtndh7QaOaZ4(xiJ2Y4$EThb_oG(O1C*HxNLj8#v
z>Aph{8tz)rIH6x8G*0NBUE(Y`d3-dDuY(V>x7q2TRq?12x03!gnC<PbZ~i)(%f$Ob
zo%Y@jZuyz`M(DWx(C7dB#l%~o6Sg1U%KtTH=9(INwGw#W@d$X|r4?R9S}G;RZ=|(#
zzxUYXWWKNValS<}9e2ASa?;ed9^;4+3X14Ql=h0~BsZ1zswn!tpeXv3OKB~lmS8P0
z2NEz~iFH-p&u;`p8~CJK!jWxYphxuceZ6952y~mUthtL4wW%&G2lC6>WWIzw3j|*7
zepcQY-gZCZGxeKs^-fYZds5l<pHDiSA($&Z4!o0PheQb9szQ|^OuZmNn7t6YG&1CZ
z5T;|paXiYL&fFuejd!IPxdX0Ucmn=D<$>ub520ar?6e1m@4hdr(z5;!1JRzJxx@B8
Y5`LT0Laa%6dc*^+84p>0N1UVo06K=o^Z)<=

delta 4636
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

diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/testfiles/tscaleoffset.ddl
index f1891dad0c..ba49c70e82 100644
--- a/tools/testfiles/tscaleoffset.ddl
+++ b/tools/testfiles/tscaleoffset.ddl
@@ -4,10 +4,10 @@ DATASET "scaleoffset" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 152 (5.263:1 COMPRESSION)
+      SIZE 188 (4.255:1 COMPRESSION)
    }
    FILTERS {
-      COMPRESSION SCALEOFFSET { MIN BITS 4 }
+      COMPRESSION SCALEOFFSET { MIN BITS 2 }
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET