[silo-llnl] 15/96: Add pkgconfig support
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit 3f4e6566a5fc38699bd39b768a7662e9c41165f6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Aug 25 17:15:59 2011 +0100
Add pkgconfig support
---
debian/changelog | 7 +
debian/patches/debian-changes-4.8-4 | 2109 -----------------------------------
debian/patches/series | 3 +-
debian/rules | 1 +
4 files changed, 9 insertions(+), 2111 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6c1bd46..46c3c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+silo-llnl (4.8-5) unstable; urgency=low
+
+ * Add Multi-arch support.
+ * Add pkgconfig file silo.pc
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 25 Aug 2011 17:14:37 +0100
+
silo-llnl (4.8-4) unstable; urgency=low
* Add dependency on python-all-dev for extensions. Closes: #628820.
diff --git a/debian/patches/debian-changes-4.8-4 b/debian/patches/debian-changes-4.8-4
deleted file mode 100644
index 7c4edc9..0000000
--- a/debian/patches/debian-changes-4.8-4
+++ /dev/null
@@ -1,2109 +0,0 @@
-Description: Upstream changes introduced in version 4.8-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- silo-llnl (4.8-4) unstable; urgency=low
- .
- * Add dependency on python-all-dev for extensions. Closes: #628820.
- * Check for errors in debian/rules with 'set -e'. Closes: #628818.
- * Disable python-write test that fails on python2.7. forwrd upstream.
- (note: it appears the code didn't work as planned on 2.6;
- hence allow as exists rather than disable python2.7).
- * Python2.7 enables HDF5 tests: disable SZIP test,
- as Debian does not have SZIP for licensing reasons.
- * Disable HDF5 largefile test (test fails on rounding error using floats)
- .
- The person named in the Author field signed this changelog entry.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Bug-Debian: http://bugs.debian.org/628818
-Bug-Debian: http://bugs.debian.org/628820
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- silo-llnl-4.8.orig/Makefile
-+++ silo-llnl-4.8/Makefile
-@@ -137,12 +137,12 @@ DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
--ACLOCAL = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run aclocal-1.10
--AMTAR = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run tar
-+ACLOCAL = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run aclocal-1.10
-+AMTAR = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run tar
- AR = ar
--AUTOCONF = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run automake-1.10
-+AUTOCONF = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run automake-1.10
- AWK = mawk
- BROWSER = browser
- BUNDLE_TARGET =
-@@ -150,9 +150,9 @@ CC = gcc
- CCDEPMODE = depmode=none
- CC_FULLPATH = /usr/bin/gcc
- CFLAGS = -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement
--CONFIG_CMD = ./configure '--build=i486-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--libexecdir=${prefix}/lib/silo-llnl' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-qt=/usr' '--enable-pythonmodule' '--enable-silex' '--with-qt-bin=/usr/bin' '--with-qt-lib=/usr/lib' '--with-qt-include=/usr/include/qt4' '--with-hdf5=/usr/include,/usr/lib' 'PYTH [...]
--CONFIG_DATE = Mon Apr 11 07:04:25 IST 2011
--CONFIG_USER = alastair at debian
-+CONFIG_CMD = ./configure '--build=i486-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--libexecdir=${prefix}/lib/silo-llnl' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-qt=/usr' '--enable-pythonmodule' '--enable-silex' '--with-qt-bin=/usr/bin' '--with-qt-lib=/usr/lib' '--with-qt-include=/usr/include/qt4' '--with-hdf5=/usr/include,/usr/lib' 'buil [...]
-+CONFIG_DATE = Sun Jul 3 20:23:46 IST 2011
-+CONFIG_USER = amckinstry at debian
- CPP = gcc -E
- CPPFLAGS = -I/usr/include
- CXX = g++
-@@ -172,7 +172,7 @@ EXEEXT =
- F77 = gfortran
- FC = gfortran
- FCFLAGS = -g -O2
--FCLIBS = -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm
-+FCLIBS = -L/usr/lib/i386-linux-gnu/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/i386-linux-gnu/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath
- FC_FULLPATH = /usr/bin/gfortran
- FFLAGS = -g -O2
- FORTRAN = fortran
-@@ -192,7 +192,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto
- LN_S = ln -s
- LTLIBOBJS =
- MAINT = #
--MAKEINFO = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run makeinfo
-+MAKEINFO = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run makeinfo
- MKDIR_P = /bin/mkdir -p
- NETCDF = netcdf
- OBJEXT = o
-@@ -206,7 +206,7 @@ PATH_SEPARATOR = :
- PDBP_DRV =
- PDB_DRV = pdb_drv
- PRTDIAG =
--PYTHON = python2.6
-+PYTHON = /usr/bin/python
- PYTHONMODULE = python
- PYTHON_CPPFLAGS = -I/usr/include/python2.6
- PYTHON_EXEC_PREFIX = ${exec_prefix}
-@@ -229,7 +229,7 @@ READLINE_LIBS = -lreadline
- SED = /bin/sed
- SET_MAKE =
- SHELL = /bin/bash
--SILEX = silex
-+SILEX =
- SILO_DTYPPTR = void
- SILO_DTYPPTR1 = void*
- SILO_DTYPPTR2 = void*
-@@ -242,10 +242,10 @@ STRIP = strip
- TAURUS = taurus
- VERSION = 4.8
- ZLIB =
--abs_builddir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
--abs_srcdir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
--abs_top_builddir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
--abs_top_srcdir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
-+abs_builddir = /home/amckinstry/silo/silo-llnl-4.8
-+abs_srcdir = /home/amckinstry/silo/silo-llnl-4.8
-+abs_top_builddir = /home/amckinstry/silo/silo-llnl-4.8
-+abs_top_srcdir = /home/amckinstry/silo/silo-llnl-4.8
- ac_ct_CC = gcc
- ac_ct_CXX = g++
- ac_ct_F77 = gfortran
-@@ -275,7 +275,7 @@ host_vendor = pc
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${prefix}/share/info
--install_sh = $(SHELL) /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/install-sh
-+install_sh = $(SHELL) /home/amckinstry/silo/silo-llnl-4.8/config/install-sh
- libdir = ${exec_prefix}/lib
- libexecdir = ${prefix}/lib/silo-llnl
- localedir = ${datarootdir}/locale
---- silo-llnl-4.8.orig/tools/Makefile
-+++ silo-llnl-4.8/tools/Makefile
-@@ -86,7 +86,7 @@ build_triplet = i486-pc-linux-gnu
- host_triplet = i486-pc-linux-gnu
- am__append_1 = browser silock
- am__append_2 = python
--am__append_3 = silex
-+#am__append_3 = silex
- subdir = tools
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -110,12 +110,12 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run aclocal-1.10
--AMTAR = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run tar
-+ACLOCAL = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run aclocal-1.10
-+AMTAR = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run tar
- AR = ar
--AUTOCONF = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run automake-1.10
-+AUTOCONF = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run automake-1.10
- AWK = mawk
- BROWSER = browser
- BUNDLE_TARGET =
-@@ -123,9 +123,9 @@ CC = gcc
- CCDEPMODE = depmode=none
- CC_FULLPATH = /usr/bin/gcc
- CFLAGS = -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement
--CONFIG_CMD = ./configure '--build=i486-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--libexecdir=${prefix}/lib/silo-llnl' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-qt=/usr' '--enable-pythonmodule' '--enable-silex' '--with-qt-bin=/usr/bin' '--with-qt-lib=/usr/lib' '--with-qt-include=/usr/include/qt4' '--with-hdf5=/usr/include,/usr/lib' 'PYTH [...]
--CONFIG_DATE = Mon Apr 11 07:04:25 IST 2011
--CONFIG_USER = alastair at debian
-+CONFIG_CMD = ./configure '--build=i486-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--libexecdir=${prefix}/lib/silo-llnl' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-qt=/usr' '--enable-pythonmodule' '--enable-silex' '--with-qt-bin=/usr/bin' '--with-qt-lib=/usr/lib' '--with-qt-include=/usr/include/qt4' '--with-hdf5=/usr/include,/usr/lib' 'buil [...]
-+CONFIG_DATE = Sun Jul 3 20:23:46 IST 2011
-+CONFIG_USER = amckinstry at debian
- CPP = gcc -E
- CPPFLAGS = -I/usr/include
- CXX = g++
-@@ -145,7 +145,7 @@ EXEEXT =
- F77 = gfortran
- FC = gfortran
- FCFLAGS = -g -O2
--FCLIBS = -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm
-+FCLIBS = -L/usr/lib/i386-linux-gnu/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/i386-linux-gnu/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath
- FC_FULLPATH = /usr/bin/gfortran
- FFLAGS = -g -O2
- FORTRAN = fortran
-@@ -165,7 +165,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto
- LN_S = ln -s
- LTLIBOBJS =
- MAINT = #
--MAKEINFO = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run makeinfo
-+MAKEINFO = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run makeinfo
- MKDIR_P = /bin/mkdir -p
- NETCDF = netcdf
- OBJEXT = o
-@@ -179,7 +179,7 @@ PATH_SEPARATOR = :
- PDBP_DRV =
- PDB_DRV = pdb_drv
- PRTDIAG =
--PYTHON = python2.6
-+PYTHON = /usr/bin/python
- PYTHONMODULE = python
- PYTHON_CPPFLAGS = -I/usr/include/python2.6
- PYTHON_EXEC_PREFIX = ${exec_prefix}
-@@ -202,7 +202,7 @@ READLINE_LIBS = -lreadline
- SED = /bin/sed
- SET_MAKE =
- SHELL = /bin/bash
--SILEX = silex
-+SILEX =
- SILO_DTYPPTR = void
- SILO_DTYPPTR1 = void*
- SILO_DTYPPTR2 = void*
-@@ -215,10 +215,10 @@ STRIP = strip
- TAURUS = taurus
- VERSION = 4.8
- ZLIB =
--abs_builddir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8/tools
--abs_srcdir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8/tools
--abs_top_builddir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
--abs_top_srcdir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
-+abs_builddir = /home/amckinstry/silo/silo-llnl-4.8/tools
-+abs_srcdir = /home/amckinstry/silo/silo-llnl-4.8/tools
-+abs_top_builddir = /home/amckinstry/silo/silo-llnl-4.8
-+abs_top_srcdir = /home/amckinstry/silo/silo-llnl-4.8
- ac_ct_CC = gcc
- ac_ct_CXX = g++
- ac_ct_F77 = gfortran
-@@ -248,7 +248,7 @@ host_vendor = pc
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${prefix}/share/info
--install_sh = $(SHELL) /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/install-sh
-+install_sh = $(SHELL) /home/amckinstry/silo/silo-llnl-4.8/config/install-sh
- libdir = ${exec_prefix}/lib
- libexecdir = ${prefix}/lib/silo-llnl
- localedir = ${datarootdir}/locale
---- silo-llnl-4.8.orig/src/Makefile
-+++ silo-llnl-4.8/src/Makefile
-@@ -171,12 +171,12 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run aclocal-1.10
--AMTAR = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run tar
-+ACLOCAL = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run aclocal-1.10
-+AMTAR = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run tar
- AR = ar
--AUTOCONF = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run automake-1.10
-+AUTOCONF = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run automake-1.10
- AWK = mawk
- BROWSER = browser
- BUNDLE_TARGET =
-@@ -184,9 +184,9 @@ CC = gcc
- CCDEPMODE = depmode=none
- CC_FULLPATH = /usr/bin/gcc
- CFLAGS = -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement
--CONFIG_CMD = ./configure '--build=i486-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--libexecdir=${prefix}/lib/silo-llnl' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-qt=/usr' '--enable-pythonmodule' '--enable-silex' '--with-qt-bin=/usr/bin' '--with-qt-lib=/usr/lib' '--with-qt-include=/usr/include/qt4' '--with-hdf5=/usr/include,/usr/lib' 'PYTH [...]
--CONFIG_DATE = Mon Apr 11 07:04:25 IST 2011
--CONFIG_USER = alastair at debian
-+CONFIG_CMD = ./configure '--build=i486-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--libexecdir=${prefix}/lib/silo-llnl' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-qt=/usr' '--enable-pythonmodule' '--enable-silex' '--with-qt-bin=/usr/bin' '--with-qt-lib=/usr/lib' '--with-qt-include=/usr/include/qt4' '--with-hdf5=/usr/include,/usr/lib' 'buil [...]
-+CONFIG_DATE = Sun Jul 3 20:23:46 IST 2011
-+CONFIG_USER = amckinstry at debian
- CPP = gcc -E
- CPPFLAGS = -I/usr/include
- CXX = g++
-@@ -206,7 +206,7 @@ EXEEXT =
- F77 = gfortran
- FC = gfortran
- FCFLAGS = -g -O2
--FCLIBS = -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm
-+FCLIBS = -L/usr/lib/i386-linux-gnu/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/i386-linux-gnu/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath
- FC_FULLPATH = /usr/bin/gfortran
- FFLAGS = -g -O2
- FORTRAN = fortran
-@@ -226,7 +226,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto
- LN_S = ln -s
- LTLIBOBJS =
- MAINT = #
--MAKEINFO = ${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run makeinfo
-+MAKEINFO = ${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run makeinfo
- MKDIR_P = /bin/mkdir -p
- NETCDF = netcdf
- OBJEXT = o
-@@ -240,7 +240,7 @@ PATH_SEPARATOR = :
- PDBP_DRV =
- PDB_DRV = pdb_drv
- PRTDIAG =
--PYTHON = python2.6
-+PYTHON = /usr/bin/python
- PYTHONMODULE = python
- PYTHON_CPPFLAGS = -I/usr/include/python2.6
- PYTHON_EXEC_PREFIX = ${exec_prefix}
-@@ -263,7 +263,7 @@ READLINE_LIBS = -lreadline
- SED = /bin/sed
- SET_MAKE =
- SHELL = /bin/bash
--SILEX = silex
-+SILEX =
- SILO_DTYPPTR = void
- SILO_DTYPPTR1 = void*
- SILO_DTYPPTR2 = void*
-@@ -276,10 +276,10 @@ STRIP = strip
- TAURUS = taurus
- VERSION = 4.8
- ZLIB =
--abs_builddir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8/src
--abs_srcdir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8/src
--abs_top_builddir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
--abs_top_srcdir = /home/alastair/silo-llnl/apr11/silo-llnl-4.8
-+abs_builddir = /home/amckinstry/silo/silo-llnl-4.8/src
-+abs_srcdir = /home/amckinstry/silo/silo-llnl-4.8/src
-+abs_top_builddir = /home/amckinstry/silo/silo-llnl-4.8
-+abs_top_srcdir = /home/amckinstry/silo/silo-llnl-4.8
- ac_ct_CC = gcc
- ac_ct_CXX = g++
- ac_ct_F77 = gfortran
-@@ -309,7 +309,7 @@ host_vendor = pc
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${prefix}/share/info
--install_sh = $(SHELL) /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/install-sh
-+install_sh = $(SHELL) /home/amckinstry/silo/silo-llnl-4.8/config/install-sh
- libdir = ${exec_prefix}/lib
- libexecdir = ${prefix}/lib/silo-llnl
- localedir = ${datarootdir}/locale
---- silo-llnl-4.8.orig/tests/test_write.py
-+++ silo-llnl-4.8/tests/test_write.py
-@@ -72,7 +72,7 @@ db.Close()
- db2=Silo.Open("foo.silo")
- print "toc=%s"%db2.GetToc()
- print "t2='%s'"%db2.GetVar("t2")
--print "t6=",db2.GetVar("t6")
-+#print "t6=",db2.GetVar("t6")
- print "a/t8='%s'"%db2.GetVar("a/t8")
- db2.SetDir("a")
- print "t9=%s"%db2.GetVar("t9")
---- silo-llnl-4.8.orig/tests/testsuite.at
-+++ silo-llnl-4.8/tests/testsuite.at
-@@ -209,21 +209,21 @@ AT_KEYWORDS(python)
- AT_CHECK(multi_test $STARGS hdf-friendly,,ignore) # generate data for python tests
- AT_CHECK(test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py,,ignore,ignore)
- AT_CLEANUP
--AT_SETUP(write)
--AT_KEYWORDS(python)
--AT_DATA(expout,[toc=nvar = 12
--var_names = (_fileinfo, _silolibinfo, t1, t10, t11, t2, t3, t4, t5, t6, t7, t8)
--ndir = 1
--dir_names = (a)
--
--t2='hello'
--t6= (1.2, 10.199999999999999)
--a/t8='x2'
--t9=x3
--/t5= (1.2, 10.0)
--])
--AT_CHECK(test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py,,expout,ignore)
--AT_CLEANUP
-+#AT_SETUP(write)
-+#AT_KEYWORDS(python)
-+#AT_DATA(expout,[toc=nvar = 12
-+#var_names = (_fileinfo, _silolibinfo, t1, t10, t11, t2, t3, t4, t5, t6, t7, t8)
-+#ndir = 1
-+#dir_names = (a)
-+#
-+#t2='hello'
-+#t6= (1.2, 10.199999999999999)
-+#a/t8='x2'
-+#t9=x3
-+#/t5= (1.2, 10.0)
-+#])
-+#AT_CHECK(test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py,,expout,ignore)
-+#AT_CLEANUP
- AT_SETUP(error handling)
- AT_KEYWORDS(python)
- AT_CHECK(multi_test $STARGS hdf-friendly,,ignore) # generate data for python tests
-@@ -246,8 +246,8 @@ AT_CHECK(test "$STARGS" != DB_HDF5 && ex
- AT_CLEANUP
- #AT_SETUP(compression szip)
- #AT_KEYWORDS(compression)
--#AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip,,ignore,ignore)
--#AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly,,ignore,ignore)
-+#AT_CHECK(test ! \( -e ../src/szip/read.o -o -e ../../../src/szip/read.o \) test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip,,ignore,ignore)
-+#AT_CHECK(test ! \( -e ../src/szip/read.o -o -e ../../../src/szip/read.o \) test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly,,ignore,ignore)
- #AT_CLEANUP
- AT_SETUP(compression fpzip)
- AT_KEYWORDS(compression)
---- silo-llnl-4.8.orig/tests/testsuite
-+++ silo-llnl-4.8/tests/testsuite
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# Generated from testsuite.at by GNU Autoconf 2.67.
-+# Generated from testsuite.at by GNU Autoconf 2.68.
- #
- # Copyright (C) 2009, 2010 Free Software Foundation, Inc.
- #
-@@ -90,6 +90,7 @@ fi
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-+as_myself=
- case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -215,11 +216,18 @@ IFS=$as_save_IFS
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
-+ # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+ case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+ esac
-+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
- fi
-
- if test x$as_have_required = xno; then :
-@@ -586,8 +594,6 @@ at_change_dir=false
- at_color=no
- # List of the tested programs.
- at_tested=''
--# List of the all the test groups.
--at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65'
- # As many question marks as there are digits in the last test group number.
- # Used to normalize the test group numbers so that `ls' lists them in
- # numerical order.
-@@ -633,32 +639,32 @@ at_help_all="1;testsuite.at:63;version;;
- 38;testsuite.at:198;arbpoly2d;;
- 39;testsuite.at:201;readstuff;;
- 40;testsuite.at:207;read;python;
--41;testsuite.at:212;write;python;
--42;testsuite.at:227;error handling;python;
--43;testsuite.at:234;testpdb;;
--44;testsuite.at:239;grab;;
--45;testsuite.at:242;compression gzip;compression;
--46;testsuite.at:247;compression szip;compression;
--47;testsuite.at:252;compression fpzip;compression;
--48;testsuite.at:257;compression lossy3;compression;
--49;testsuite.at:262;compression minratio1000;compression;
--50;testsuite.at:266;testhzip;compression;
--51;testsuite.at:270;checksums;;
--52;testsuite.at:273;xversion;;
--53;testsuite.at:276;largefile;large;
--54;testsuite.at:282;arrayf77;fortran;
--55;testsuite.at:286;curvef77;fortran;
--56;testsuite.at:290;matf77;fortran;
--57;testsuite.at:294;pointf77;fortran;
--58;testsuite.at:298;quadf77;fortran;
--59;testsuite.at:302;testallf77;fortran;
--60;testsuite.at:306;ucdf77;fortran;
--61;testsuite.at:312;silock;tools;
--62;testsuite.at:316;force single;conversions;
--63;testsuite.at:321;multi_file;large;
--64;testsuite.at:325;testall -medium;large;
--65;testsuite.at:329;testall -large;large;
-+41;testsuite.at:227;error handling;python;
-+42;testsuite.at:234;testpdb;;
-+43;testsuite.at:239;grab;;
-+44;testsuite.at:242;compression gzip;compression;
-+45;testsuite.at:252;compression fpzip;compression;
-+46;testsuite.at:257;compression lossy3;compression;
-+47;testsuite.at:262;compression minratio1000;compression;
-+48;testsuite.at:266;testhzip;compression;
-+49;testsuite.at:270;checksums;;
-+50;testsuite.at:273;xversion;;
-+51;testsuite.at:276;largefile;large;
-+52;testsuite.at:282;arrayf77;fortran;
-+53;testsuite.at:286;curvef77;fortran;
-+54;testsuite.at:290;matf77;fortran;
-+55;testsuite.at:294;pointf77;fortran;
-+56;testsuite.at:298;quadf77;fortran;
-+57;testsuite.at:302;testallf77;fortran;
-+58;testsuite.at:306;ucdf77;fortran;
-+59;testsuite.at:312;silock;tools;
-+60;testsuite.at:316;force single;conversions;
-+61;testsuite.at:321;multi_file;large;
-+62;testsuite.at:325;testall -medium;large;
-+63;testsuite.at:329;testall -large;large;
- "
-+# List of the all the test groups.
-+at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
-
- # at_fn_validate_ranges NAME...
- # -----------------------------
-@@ -669,7 +675,7 @@ at_fn_validate_ranges ()
- for at_grp
- do
- eval at_value=\$$at_grp
-- if test $at_value -lt 1 || test $at_value -gt 65; then
-+ if test $at_value -lt 1 || test $at_value -gt 63; then
- $as_echo "invalid test group: $at_value" >&2
- exit 1
- fi
-@@ -751,24 +757,24 @@ do
-
- [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
- at_fn_validate_ranges at_option
-- as_fn_append at_groups "$at_option "
-+ as_fn_append at_groups "$at_option$as_nl"
- ;;
-
- # Ranges
- [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
- at_range_start=`echo $at_option |tr -d X-`
- at_fn_validate_ranges at_range_start
-- at_range=`$as_echo " $at_groups_all " | \
-- sed -e 's/^.* \('$at_range_start' \)/\1/'`
-- as_fn_append at_groups "$at_range "
-+ at_range=`$as_echo "$at_groups_all" | \
-+ sed -ne '/^'$at_range_start'$/,$p'`
-+ as_fn_append at_groups "$at_range$as_nl"
- ;;
-
- -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
- at_range_end=`echo $at_option |tr -d X-`
- at_fn_validate_ranges at_range_end
-- at_range=`$as_echo " $at_groups_all " | \
-- sed -e 's/\( '$at_range_end'\) .*$/\1/'`
-- as_fn_append at_groups "$at_range "
-+ at_range=`$as_echo "$at_groups_all" | \
-+ sed -ne '1,/^'$at_range_end'$/p'`
-+ as_fn_append at_groups "$at_range$as_nl"
- ;;
-
- [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
-@@ -785,10 +791,9 @@ do
- at_range_start=$at_tmp
- fi
- at_fn_validate_ranges at_range_start at_range_end
-- at_range=`$as_echo " $at_groups_all " | \
-- sed -e 's/^.*\( '$at_range_start' \)/\1/' \
-- -e 's/\( '$at_range_end'\) .*$/\1/'`
-- as_fn_append at_groups "$at_range "
-+ at_range=`$as_echo "$at_groups_all" | \
-+ sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
-+ as_fn_append at_groups "$at_range$as_nl"
- ;;
-
- # Directory selection.
-@@ -843,11 +848,9 @@ do
- at_groups_selected=`$as_echo "$at_groups_selected" |
- grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
- done
-- # Smash the newlines.
-- at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
-- tr "$as_nl" ' '
-- `
-- as_fn_append at_groups "$at_groups_selected "
-+ # Smash the keywords.
-+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
-+ as_fn_append at_groups "$at_groups_selected$as_nl"
- ;;
- --recheck)
- at_recheck=:
-@@ -894,11 +897,11 @@ else
- s/^[ ]*\([1-9][0-9]*\):.*/\1/p
- }
- /^## Detailed failed tests/q
-- ' "$at_suite_log" | tr "$as_nl" ' '`
-- as_fn_append at_groups "$at_oldfails"
-+ ' "$at_suite_log"`
-+ as_fn_append at_groups "$at_oldfails$as_nl"
- fi
- # Sort the tests, removing duplicates.
-- at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
-+ at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
- fi
-
- if test x"$at_color" = xalways \
-@@ -976,21 +979,13 @@ silo 4.8 test suite: VALGRIND="$VALGRIND
- KEYWORDS
-
- _ATEOF
-- # Passing at_groups is tricky. We cannot use it to form a literal string
-- # or regexp because of the limitation of AIX awk. And Solaris' awk
-- # doesn't grok more than 99 fields in a record, so we have to use `split'.
-- # at_groups needs to be space-separated for this script to work.
-- case $at_groups in
-- *"$as_nl"* )
-- at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
-- esac
-- $as_echo "$at_groups$as_nl$at_help_all" |
-- awk 'BEGIN { FS = ";" }
-- NR == 1 {
-- for (n = split ($ 0, a, " "); n; n--)
-- selected[a[n]] = 1
-+ # Pass an empty line as separator between selected groups and help.
-+ $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
-+ awk 'NF == 1 && FS != ";" {
-+ selected[$ 1] = 1
- next
- }
-+ /^$/ { FS = ";" }
- NF > 0 {
- if (selected[$ 1]) {
- printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
-@@ -1035,14 +1030,13 @@ _ATEOF
- exit $at_write_fail
- fi
-
--# Should we print banners? at_groups is space-separated for entire test,
--# newline-separated if only a subset of the testsuite is run.
--case $at_groups in
-- *' '*' '* | *"$as_nl"*"$as_nl"* )
-- at_print_banners=: ;;
-+# Should we print banners? Yes if more than one test is run.
-+case $at_groups in #(
-+ *$as_nl* )
-+ at_print_banners=: ;; #(
- * ) at_print_banners=false ;;
- esac
--# Text for banner N, set to empty once printed.
-+# Text for banner N, set to a single space once printed.
- # Banner 1. testsuite.at:62
- # Category starts at test group 1.
- at_banner_text_1="Non-driver-specific"
-@@ -1050,16 +1044,16 @@ at_banner_text_1="Non-driver-specific"
- # Category starts at test group 40.
- at_banner_text_2="pythonmodule"
- # Banner 3. testsuite.at:233
--# Category starts at test group 43.
-+# Category starts at test group 42.
- at_banner_text_3="PDB Specific"
- # Banner 4. testsuite.at:238
--# Category starts at test group 44.
-+# Category starts at test group 43.
- at_banner_text_4="HDF5 Specific"
- # Banner 5. testsuite.at:281
--# Category starts at test group 54.
-+# Category starts at test group 52.
- at_banner_text_5="Fortran"
- # Banner 6. testsuite.at:311
--# Category starts at test group 61.
-+# Category starts at test group 59.
- at_banner_text_6="Special"
-
- # Take any -C into account.
-@@ -1077,7 +1071,7 @@ do
- done
-
- # Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
--: ${at_top_build_prefix=$at_top_builddir}
-+: "${at_top_build_prefix=$at_top_builddir}"
-
- # Perform any assignments requested during argument parsing.
- eval "$at_debug_args"
-@@ -1304,9 +1298,13 @@ at_fn_banner ()
- {
- $at_print_banners || return 0
- eval at_banner_text=\$at_banner_text_$1
-- test "x$at_banner_text" = x && return 0
-- eval at_banner_text_$1=
-- $as_echo "$as_nl$at_banner_text$as_nl"
-+ test "x$at_banner_text" = "x " && return 0
-+ eval "at_banner_text_$1=\" \""
-+ if test -z "$at_banner_text"; then
-+ $at_first || echo
-+ else
-+ $as_echo "$as_nl$at_banner_text$as_nl"
-+ fi
- } # at_fn_banner
-
- # at_fn_check_prepare_notrace REASON LINE
-@@ -1707,9 +1705,13 @@ _ATEOF
- $as_echo "$at_log_msg" >> "$at_group_log"
- $as_echo "$at_log_msg" >&5
-
-- # Cleanup the group directory, unless the user wants the files.
-- if $at_debug_p; then
-+ # Cleanup the group directory, unless the user wants the files
-+ # or the success was unexpected.
-+ if $at_debug_p || test $at_res = xpass; then
- at_fn_create_debugging_script
-+ if test $at_res = xpass && $at_errexit; then
-+ echo stop > "$at_stop_file"
-+ fi
- else
- if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
-@@ -1795,8 +1797,7 @@ then
-
- echo
- # Turn jobs into a list of numbers, starting from 1.
-- at_joblist=`$as_echo " $at_groups_all " | \
-- sed 's/\( '$at_jobs'\) .*/\1/'`
-+ at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
-
- set X $at_joblist
- shift
-@@ -3217,51 +3218,11 @@ $at_traceon; }
- read at_status <"$at_status_file"
- #AT_STOP_40
- #AT_START_41
--at_fn_group_banner 41 'testsuite.at:212' \
-- "write" " " 2
--at_xfail=no
--(
-- $as_echo "41. $at_setup_line: testing $at_desc ..."
-- $at_traceon
--
--
--cat >expout <<'_ATEOF'
--toc=nvar = 12
--var_names = (_fileinfo, _silolibinfo, t1, t10, t11, t2, t3, t4, t5, t6, t7, t8)
--ndir = 1
--dir_names = (a)
--
--t2='hello'
--t6= (1.2, 10.199999999999999)
--a/t8='x2'
--t9=x3
--/t5= (1.2, 10.0)
--_ATEOF
--
--{ set +x
--$as_echo "$at_srcdir/testsuite.at:225: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_write.py"
--at_fn_check_prepare_dynamic "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py" "testsuite.at:225"
--( $at_check_trace; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py
--) >>"$at_stdout" 2>>"$at_stderr"
--at_status=$? at_failed=false
--$at_check_filter
--echo stderr:; cat "$at_stderr"
--$at_diff expout "$at_stdout" || at_failed=:
--at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:225"
--$at_failed && at_fn_log_failure
--$at_traceon; }
--
-- set +x
-- $at_times_p && times >"$at_times_file"
--) 5>&1 2>&1 7>&- | eval $at_tee_pipe
--read at_status <"$at_status_file"
--#AT_STOP_41
--#AT_START_42
--at_fn_group_banner 42 'testsuite.at:227' \
-+at_fn_group_banner 41 'testsuite.at:227' \
- "error handling" " " 2
- at_xfail=no
- (
-- $as_echo "42. $at_setup_line: testing $at_desc ..."
-+ $as_echo "41. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3295,13 +3256,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_42
--#AT_START_43
--at_fn_group_banner 43 'testsuite.at:234' \
-+#AT_STOP_41
-+#AT_START_42
-+at_fn_group_banner 42 'testsuite.at:234' \
- "testpdb" " " 3
- at_xfail=no
- (
-- $as_echo "43. $at_setup_line: testing $at_desc ..."
-+ $as_echo "42. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
- { set +x
-@@ -3321,13 +3282,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_43
--#AT_START_44
--at_fn_group_banner 44 'testsuite.at:239' \
-+#AT_STOP_42
-+#AT_START_43
-+at_fn_group_banner 43 'testsuite.at:239' \
- "grab" " " 4
- at_xfail=no
- (
-- $as_echo "44. $at_setup_line: testing $at_desc ..."
-+ $as_echo "43. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
- { set +x
-@@ -3347,13 +3308,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_44
--#AT_START_45
--at_fn_group_banner 45 'testsuite.at:242' \
-+#AT_STOP_43
-+#AT_START_44
-+at_fn_group_banner 44 'testsuite.at:242' \
- "compression gzip" " " 4
- at_xfail=no
- (
-- $as_echo "45. $at_setup_line: testing $at_desc ..."
-+ $as_echo "44. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3387,53 +3348,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_45
--#AT_START_46
--at_fn_group_banner 46 'testsuite.at:247' \
-- "compression szip" " " 4
--at_xfail=no
--(
-- $as_echo "46. $at_setup_line: testing $at_desc ..."
-- $at_traceon
--
--
--{ set +x
--$as_echo "$at_srcdir/testsuite.at:249: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression szip"
--at_fn_check_prepare_dynamic "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression szip" "testsuite.at:249"
--( $at_check_trace; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip
--) >>"$at_stdout" 2>>"$at_stderr"
--at_status=$? at_failed=false
--$at_check_filter
--echo stderr:; cat "$at_stderr"
--echo stdout:; cat "$at_stdout"
--at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:249"
--$at_failed && at_fn_log_failure
--$at_traceon; }
--
--{ set +x
--$as_echo "$at_srcdir/testsuite.at:250: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
--at_fn_check_prepare_dynamic "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly" "testsuite.at:250"
--( $at_check_trace; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly
--) >>"$at_stdout" 2>>"$at_stderr"
--at_status=$? at_failed=false
--$at_check_filter
--echo stderr:; cat "$at_stderr"
--echo stdout:; cat "$at_stdout"
--at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:250"
--$at_failed && at_fn_log_failure
--$at_traceon; }
--
-- set +x
-- $at_times_p && times >"$at_times_file"
--) 5>&1 2>&1 7>&- | eval $at_tee_pipe
--read at_status <"$at_status_file"
--#AT_STOP_46
--#AT_START_47
--at_fn_group_banner 47 'testsuite.at:252' \
-+#AT_STOP_44
-+#AT_START_45
-+at_fn_group_banner 45 'testsuite.at:252' \
- "compression fpzip" " " 4
- at_xfail=no
- (
-- $as_echo "47. $at_setup_line: testing $at_desc ..."
-+ $as_echo "45. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3467,13 +3388,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_47
--#AT_START_48
--at_fn_group_banner 48 'testsuite.at:257' \
-+#AT_STOP_45
-+#AT_START_46
-+at_fn_group_banner 46 'testsuite.at:257' \
- "compression lossy3" " " 4
- at_xfail=no
- (
-- $as_echo "48. $at_setup_line: testing $at_desc ..."
-+ $as_echo "46. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3507,13 +3428,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_48
--#AT_START_49
--at_fn_group_banner 49 'testsuite.at:262' \
-+#AT_STOP_46
-+#AT_START_47
-+at_fn_group_banner 47 'testsuite.at:262' \
- "compression minratio1000" " " 4
- at_xfail=no
- (
-- $as_echo "49. $at_setup_line: testing $at_desc ..."
-+ $as_echo "47. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3534,13 +3455,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_49
--#AT_START_50
--at_fn_group_banner 50 'testsuite.at:266' \
-+#AT_STOP_47
-+#AT_START_48
-+at_fn_group_banner 48 'testsuite.at:266' \
- "testhzip" " " 4
- at_xfail=no
- (
-- $as_echo "50. $at_setup_line: testing $at_desc ..."
-+ $as_echo "48. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3561,13 +3482,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_50
--#AT_START_51
--at_fn_group_banner 51 'testsuite.at:270' \
-+#AT_STOP_48
-+#AT_START_49
-+at_fn_group_banner 49 'testsuite.at:270' \
- "checksums" " " 4
- at_xfail=no
- (
-- $as_echo "51. $at_setup_line: testing $at_desc ..."
-+ $as_echo "49. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
- { set +x
-@@ -3587,13 +3508,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_51
--#AT_START_52
--at_fn_group_banner 52 'testsuite.at:273' \
-+#AT_STOP_49
-+#AT_START_50
-+at_fn_group_banner 50 'testsuite.at:273' \
- "xversion" " " 4
- at_xfail=no
- (
-- $as_echo "52. $at_setup_line: testing $at_desc ..."
-+ $as_echo "50. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
- { set +x
-@@ -3613,13 +3534,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_52
--#AT_START_53
--at_fn_group_banner 53 'testsuite.at:276' \
-+#AT_STOP_50
-+#AT_START_51
-+at_fn_group_banner 51 'testsuite.at:276' \
- "largefile" " " 4
- at_xfail=no
- (
-- $as_echo "53. $at_setup_line: testing $at_desc ..."
-+ $as_echo "51. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3640,13 +3561,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_53
--#AT_START_54
--at_fn_group_banner 54 'testsuite.at:282' \
-+#AT_STOP_51
-+#AT_START_52
-+at_fn_group_banner 52 'testsuite.at:282' \
- "arrayf77" " " 5
- at_xfail=no
- (
-- $as_echo "54. $at_setup_line: testing $at_desc ..."
-+ $as_echo "52. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3667,13 +3588,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_54
--#AT_START_55
--at_fn_group_banner 55 'testsuite.at:286' \
-+#AT_STOP_52
-+#AT_START_53
-+at_fn_group_banner 53 'testsuite.at:286' \
- "curvef77" " " 5
- at_xfail=no
- (
-- $as_echo "55. $at_setup_line: testing $at_desc ..."
-+ $as_echo "53. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3694,13 +3615,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_55
--#AT_START_56
--at_fn_group_banner 56 'testsuite.at:290' \
-+#AT_STOP_53
-+#AT_START_54
-+at_fn_group_banner 54 'testsuite.at:290' \
- "matf77" " " 5
- at_xfail=no
- (
-- $as_echo "56. $at_setup_line: testing $at_desc ..."
-+ $as_echo "54. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3721,13 +3642,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_56
--#AT_START_57
--at_fn_group_banner 57 'testsuite.at:294' \
-+#AT_STOP_54
-+#AT_START_55
-+at_fn_group_banner 55 'testsuite.at:294' \
- "pointf77" " " 5
- at_xfail=no
- (
-- $as_echo "57. $at_setup_line: testing $at_desc ..."
-+ $as_echo "55. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3748,13 +3669,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_57
--#AT_START_58
--at_fn_group_banner 58 'testsuite.at:298' \
-+#AT_STOP_55
-+#AT_START_56
-+at_fn_group_banner 56 'testsuite.at:298' \
- "quadf77" " " 5
- at_xfail=no
- (
-- $as_echo "58. $at_setup_line: testing $at_desc ..."
-+ $as_echo "56. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3775,13 +3696,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_58
--#AT_START_59
--at_fn_group_banner 59 'testsuite.at:302' \
-+#AT_STOP_56
-+#AT_START_57
-+at_fn_group_banner 57 'testsuite.at:302' \
- "testallf77" " " 5
- at_xfail=no
- (
-- $as_echo "59. $at_setup_line: testing $at_desc ..."
-+ $as_echo "57. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3802,13 +3723,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_59
--#AT_START_60
--at_fn_group_banner 60 'testsuite.at:306' \
-+#AT_STOP_57
-+#AT_START_58
-+at_fn_group_banner 58 'testsuite.at:306' \
- "ucdf77" " " 5
- at_xfail=no
- (
-- $as_echo "60. $at_setup_line: testing $at_desc ..."
-+ $as_echo "58. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3829,13 +3750,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_60
--#AT_START_61
--at_fn_group_banner 61 'testsuite.at:312' \
-+#AT_STOP_58
-+#AT_START_59
-+at_fn_group_banner 59 'testsuite.at:312' \
- "silock" " " 6
- at_xfail=no
- (
-- $as_echo "61. $at_setup_line: testing $at_desc ..."
-+ $as_echo "59. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3856,13 +3777,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_61
--#AT_START_62
--at_fn_group_banner 62 'testsuite.at:316' \
-+#AT_STOP_59
-+#AT_START_60
-+at_fn_group_banner 60 'testsuite.at:316' \
- "force single" " " 6
- at_xfail=no
- (
-- $as_echo "62. $at_setup_line: testing $at_desc ..."
-+ $as_echo "60. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3896,13 +3817,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_62
--#AT_START_63
--at_fn_group_banner 63 'testsuite.at:321' \
-+#AT_STOP_60
-+#AT_START_61
-+at_fn_group_banner 61 'testsuite.at:321' \
- "multi_file" " " 6
- at_xfail=no
- (
-- $as_echo "63. $at_setup_line: testing $at_desc ..."
-+ $as_echo "61. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3923,13 +3844,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_63
--#AT_START_64
--at_fn_group_banner 64 'testsuite.at:325' \
-+#AT_STOP_61
-+#AT_START_62
-+at_fn_group_banner 62 'testsuite.at:325' \
- "testall -medium" " " 6
- at_xfail=no
- (
-- $as_echo "64. $at_setup_line: testing $at_desc ..."
-+ $as_echo "62. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3950,13 +3871,13 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_64
--#AT_START_65
--at_fn_group_banner 65 'testsuite.at:329' \
-+#AT_STOP_62
-+#AT_START_63
-+at_fn_group_banner 63 'testsuite.at:329' \
- "testall -large" " " 6
- at_xfail=no
- (
-- $as_echo "65. $at_setup_line: testing $at_desc ..."
-+ $as_echo "63. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-@@ -3977,4 +3898,4 @@ $at_traceon; }
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
--#AT_STOP_65
-+#AT_STOP_63
---- silo-llnl-4.8.orig/tests/testsuite.log.hdf5
-+++ silo-llnl-4.8/tests/testsuite.log.hdf5
-@@ -3,7 +3,7 @@
- ## -------------------------------------------------- ##
-
- testsuite: command line was:
-- $ ./testsuite PYTHON=python2.6 BROWSER=browser STARGS=DB_HDF5
-+ $ ./testsuite PYTHON=python2.7 BROWSER=browser STARGS=DB_HDF5
-
- ## --------- ##
- ## Platform. ##
-@@ -11,9 +11,9 @@ testsuite: command line was:
-
- hostname = debian
- uname -m = i686
--uname -r = 2.6.38-2-686
-+uname -r = 2.6.39-1-486
- uname -s = Linux
--uname -v = #1 SMP Thu Apr 7 05:24:21 UTC 2011
-+uname -v = #1 Fri May 20 19:57:02 UTC 2011
-
- /usr/bin/uname -p = unknown
- /bin/uname -X = unknown
-@@ -26,7 +26,7 @@ uname -v = #1 SMP Thu Apr 7 05:24:21 UTC
- /usr/bin/oslevel = unknown
- /bin/universe = unknown
-
--PATH: /home/alastair/silo-llnl/apr11/silo-llnl-4.8/tests
-+PATH: /home/amckinstry/silo/silo-llnl-4.8/tests
- PATH: /usr/sbin
- PATH: /usr/bin
- PATH: /sbin
-@@ -40,13 +40,13 @@ testsuite: atconfig:
- |
- | # The test suite will define top_srcdir=/../.. etc.
- | at_testdir='tests'
--| abs_builddir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8/tests'
-+| abs_builddir='/home/amckinstry/silo/silo-llnl-4.8/tests'
- | at_srcdir='.'
--| abs_srcdir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8/tests'
-+| abs_srcdir='/home/amckinstry/silo/silo-llnl-4.8/tests'
- | at_top_srcdir='..'
--| abs_top_srcdir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8'
-+| abs_top_srcdir='/home/amckinstry/silo/silo-llnl-4.8'
- | at_top_build_prefix='../'
--| abs_top_builddir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8'
-+| abs_top_builddir='/home/amckinstry/silo/silo-llnl-4.8'
- |
- | # Backward compatibility with Autotest <= 2.59b:
- | at_top_builddir=$at_top_build_prefix
-@@ -62,79 +62,78 @@ testsuite: atconfig:
- ## ------------------ ##
- ## Running the tests. ##
- ## ------------------ ##
--testsuite: starting at: Mon Apr 11 07:09:06 IST 2011
--1. version (testsuite.at:63): ok (0m0.040s 0m0.060s)
--2. namescheme (testsuite.at:86): ok (0m0.012s 0m0.056s)
--3. point (testsuite.at:89): ok (0m0.060s 0m0.092s)
--4. extface (testsuite.at:92): ok (0m0.032s 0m0.064s)
--5. testall -small (testsuite.at:95): ok (0m0.220s 0m0.136s)
--6. TestReadMask (testsuite.at:98): ok (0m0.328s 0m0.352s)
--7. array (testsuite.at:104): ok (0m0.032s 0m0.076s)
--8. multi_test (testsuite.at:107): ok (0m0.544s 0m0.564s)
--9. multi_test earlyclose (testsuite.at:110): ok (0m0.188s 0m0.164s)
--10. partial_io (testsuite.at:113): ok (0m0.032s 0m0.076s)
--11. simple (testsuite.at:116): ok (0m0.052s 0m0.116s)
--12. ucd (testsuite.at:119): ok (0m0.036s 0m0.128s)
--13. ucdsamp3 (testsuite.at:122): ok (0m0.040s 0m0.120s)
--14. testall -small -fortran (testsuite.at:125): ok (0m0.360s 0m0.232s)
--15. obj (testsuite.at:128): ok (0m0.048s 0m0.048s)
--16. onehex (testsuite.at:131): ok (0m0.044s 0m0.100s)
--17. oneprism (testsuite.at:134): ok (0m0.064s 0m0.108s)
--18. onepyramid (testsuite.at:137): ok (0m0.060s 0m0.088s)
--19. onetet (testsuite.at:140): ok (0m0.036s 0m0.120s)
--20. subhex (testsuite.at:143): ok (0m0.024s 0m0.092s)
--21. twohex (testsuite.at:146): ok (0m0.044s 0m0.084s)
--22. multispec (testsuite.at:149): ok (0m0.040s 0m0.084s)
--23. sami (testsuite.at:152): ok (0m0.068s 0m0.108s)
--24. specmix (testsuite.at:155): ok (0m0.044s 0m0.104s)
--25. spec (testsuite.at:158): ok (0m0.024s 0m0.080s)
--26. group_test (testsuite.at:161): ok (0m0.576s 0m0.516s)
--27. listtypes (testsuite.at:164): ok (0m0.132s 0m0.188s)
--28. alltypes (testsuite.at:168): ok (0m0.056s 0m0.092s)
--29. wave (testsuite.at:171): ok (0m0.116s 0m0.276s)
--30. polyzl (testsuite.at:174): ok (0m0.048s 0m0.084s)
--31. csg (testsuite.at:177): ok (0m0.048s 0m0.128s)
--32. rocket (testsuite.at:180): ok (0m0.080s 0m0.100s)
--33. mmadjacency (testsuite.at:183): ok (0m0.048s 0m0.084s)
--34. mat3d_3across (testsuite.at:186): ok (0m0.032s 0m0.112s)
--35. ucd1d (testsuite.at:189): ok (0m0.028s 0m0.116s)
--36. dir (testsuite.at:192): ok (0m0.084s 0m0.116s)
--37. quad (testsuite.at:195): ok (0m0.072s 0m0.100s)
--38. arbpoly2d (testsuite.at:198): ok (0m0.060s 0m0.108s)
--39. readstuff (testsuite.at:201): ok (0m0.700s 0m0.688s)
--40. read (testsuite.at:207): ok (0m0.712s 0m0.704s)
--41. write (testsuite.at:212): ok (0m0.064s 0m0.064s)
--42. error handling (testsuite.at:227): ok (0m0.688s 0m0.596s)
--43. testpdb (testsuite.at:234): skipped (testsuite.at:235)
--44. grab (testsuite.at:239): ok (0m0.188s 0m0.180s)
--45. compression gzip (testsuite.at:242): ok (0m3.668s 0m0.888s)
--47. compression fpzip (testsuite.at:252): skipped (testsuite.at:254)
--48. compression lossy3 (testsuite.at:257): skipped (testsuite.at:259)
--49. compression minratio1000 (testsuite.at:262): skipped (testsuite.at:264)
--50. testhzip (testsuite.at:266): skipped (testsuite.at:268)
--51. checksums (testsuite.at:270): ok (0m4.464s 0m3.076s)
--52. xversion (testsuite.at:273): ok (0m3.736s 0m5.144s)
--54. arrayf77 (testsuite.at:282): ok (0m0.056s 0m0.248s)
--55. curvef77 (testsuite.at:286): ok (0m0.016s 0m0.128s)
--56. matf77 (testsuite.at:290): ok (0m0.040s 0m0.100s)
--57. pointf77 (testsuite.at:294): ok (0m0.032s 0m0.096s)
--58. quadf77 (testsuite.at:298): ok (0m0.032s 0m0.096s)
--59. testallf77 (testsuite.at:302): ok (0m0.036s 0m0.136s)
--60. ucdf77 (testsuite.at:306): ok (0m0.052s 0m0.140s)
--61. silock (testsuite.at:312): ok (0m0.308s 0m0.648s)
--62. force single (testsuite.at:316): ok (0m3.248s 0m5.196s)
--63. multi_file (testsuite.at:321): ok (0m5.344s 0m4.768s)
--64. testall -medium (testsuite.at:325): ok (0m1.512s 0m0.952s)
--65. testall -large (testsuite.at:329): ok (0m9.057s 0m4.748s)
--testsuite: ending at: Mon Apr 11 07:15:43 IST 2011
--testsuite: test suite duration: 0h 6m 37s
-+testsuite: starting at: Thu Jun 9 10:42:21 IST 2011
-+1. version (testsuite.at:63): ok (0m0.064s 0m0.152s)
-+2. namescheme (testsuite.at:86): ok (0m0.020s 0m0.128s)
-+3. point (testsuite.at:89): ok (0m0.048s 0m0.156s)
-+4. extface (testsuite.at:92): ok (0m0.044s 0m0.156s)
-+5. testall -small (testsuite.at:95): ok (0m0.236s 0m0.188s)
-+6. TestReadMask (testsuite.at:98): ok (0m0.348s 0m0.716s)
-+7. array (testsuite.at:104): ok (0m0.032s 0m0.152s)
-+8. multi_test (testsuite.at:107): ok (0m0.640s 0m0.364s)
-+9. multi_test earlyclose (testsuite.at:110): ok (0m0.120s 0m0.240s)
-+10. partial_io (testsuite.at:113): ok (0m0.040s 0m0.140s)
-+11. simple (testsuite.at:116): ok (0m0.044s 0m0.148s)
-+12. ucd (testsuite.at:119): ok (0m0.036s 0m0.168s)
-+13. ucdsamp3 (testsuite.at:122): ok (0m0.012s 0m0.160s)
-+14. testall -small -fortran (testsuite.at:125): ok (0m0.252s 0m0.184s)
-+15. obj (testsuite.at:128): ok (0m0.028s 0m0.164s)
-+16. onehex (testsuite.at:131): ok (0m0.036s 0m0.140s)
-+17. oneprism (testsuite.at:134): ok (0m0.020s 0m0.172s)
-+18. onepyramid (testsuite.at:137): ok (0m0.044s 0m0.144s)
-+19. onetet (testsuite.at:140): ok (0m0.036s 0m0.156s)
-+20. subhex (testsuite.at:143): ok (0m0.020s 0m0.164s)
-+21. twohex (testsuite.at:146): ok (0m0.052s 0m0.136s)
-+22. multispec (testsuite.at:149): ok (0m0.048s 0m0.168s)
-+23. sami (testsuite.at:152): ok (0m0.040s 0m0.168s)
-+24. specmix (testsuite.at:155): ok (0m0.080s 0m0.156s)
-+25. spec (testsuite.at:158): ok (0m0.056s 0m0.116s)
-+26. group_test (testsuite.at:161): ok (0m0.388s 0m0.556s)
-+27. listtypes (testsuite.at:164): ok (0m0.092s 0m0.332s)
-+28. alltypes (testsuite.at:168): ok (0m0.012s 0m0.172s)
-+29. wave (testsuite.at:171): ok (0m0.140s 0m0.248s)
-+30. polyzl (testsuite.at:174): ok (0m0.016s 0m0.164s)
-+31. csg (testsuite.at:177): ok (0m0.028s 0m0.144s)
-+32. rocket (testsuite.at:180): ok (0m0.060s 0m0.164s)
-+33. mmadjacency (testsuite.at:183): ok (0m0.028s 0m0.152s)
-+34. mat3d_3across (testsuite.at:186): ok (0m0.040s 0m0.148s)
-+35. ucd1d (testsuite.at:189): ok (0m0.036s 0m0.144s)
-+36. dir (testsuite.at:192): ok (0m0.052s 0m0.200s)
-+37. quad (testsuite.at:195): ok (0m0.024s 0m0.156s)
-+38. arbpoly2d (testsuite.at:198): ok (0m0.048s 0m0.132s)
-+39. readstuff (testsuite.at:201): ok (0m0.584s 0m0.600s)
-+40. read (testsuite.at:207): ok (0m0.644s 0m0.596s)
-+41. error handling (testsuite.at:227): ok (0m0.608s 0m0.556s)
-+42. testpdb (testsuite.at:234): skipped (testsuite.at:235)
-+43. grab (testsuite.at:239): ok (0m0.140s 0m0.220s)
-+44. compression gzip (testsuite.at:242): ok (0m2.916s 0m2.104s)
-+45. compression fpzip (testsuite.at:252): skipped (testsuite.at:254)
-+46. compression lossy3 (testsuite.at:257): skipped (testsuite.at:259)
-+47. compression minratio1000 (testsuite.at:262): skipped (testsuite.at:264)
-+48. testhzip (testsuite.at:266): skipped (testsuite.at:268)
-+49. checksums (testsuite.at:270): ok (0m2.940s 0m3.328s)
-+50. xversion (testsuite.at:273): ok (0m3.260s 0m6.968s)
-+52. arrayf77 (testsuite.at:282): ok (0m0.036s 0m0.140s)
-+53. curvef77 (testsuite.at:286): ok (0m0.040s 0m0.156s)
-+54. matf77 (testsuite.at:290): ok (0m0.028s 0m0.136s)
-+55. pointf77 (testsuite.at:294): ok (0m0.016s 0m0.156s)
-+56. quadf77 (testsuite.at:298): ok (0m0.044s 0m0.132s)
-+57. testallf77 (testsuite.at:302): ok (0m0.028s 0m0.140s)
-+58. ucdf77 (testsuite.at:306): ok (0m0.028s 0m0.128s)
-+59. silock (testsuite.at:312): ok (0m0.220s 0m1.220s)
-+60. force single (testsuite.at:316): ok (0m2.616s 0m8.773s)
-+61. multi_file (testsuite.at:321): ok (0m3.672s 0m4.360s)
-+62. testall -medium (testsuite.at:325): ok (0m1.020s 0m0.580s)
-+63. testall -large (testsuite.at:329): ok (0m6.724s 0m4.484s)
-+testsuite: ending at: Thu Jun 9 10:47:40 IST 2011
-+testsuite: test suite duration: 0h 5m 19s
-
- ## ------------- ##
- ## Test results. ##
- ## ------------- ##
-
--ERROR: 60 tests were run,
--2 failed unexpectedly.
-+ERROR: 58 tests were run,
-+1 failed unexpectedly.
- 5 tests were skipped.
-
- ## ------------------------ ##
-@@ -146,9 +145,7 @@ silo 4.8 test suite: VALGRIND="" STARGS=
- NUM: FILE-NAME:LINE TEST-GROUP-NAME
- KEYWORDS
-
-- 46: testsuite.at:247 compression szip
-- compression
-- 53: testsuite.at:276 largefile
-+ 51: testsuite.at:276 largefile
- large
-
- Skipped tests:
-@@ -157,14 +154,14 @@ silo 4.8 test suite: VALGRIND="" STARGS=
- NUM: FILE-NAME:LINE TEST-GROUP-NAME
- KEYWORDS
-
-- 43: testsuite.at:234 testpdb
-- 47: testsuite.at:252 compression fpzip
-+ 42: testsuite.at:234 testpdb
-+ 45: testsuite.at:252 compression fpzip
- compression
-- 48: testsuite.at:257 compression lossy3
-+ 46: testsuite.at:257 compression lossy3
- compression
-- 49: testsuite.at:262 compression minratio1000
-+ 47: testsuite.at:262 compression minratio1000
- compression
-- 50: testsuite.at:266 testhzip
-+ 48: testsuite.at:266 testhzip
- compression
-
- ## ---------------------- ##
-@@ -172,19 +169,7 @@ silo 4.8 test suite: VALGRIND="" STARGS=
- ## ---------------------- ##
-
- # -*- compilation -*-
--46. testsuite.at:247: testing compression szip ...
--./testsuite.at:249: test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip
--stderr:
--DBCreate: Compression failure.: METHOD=SZIP
--DBWrite: File was closed or never opened/created.: METHOD=SZIP
--DBClose: File was closed or never opened/created.: METHOD=SZIP
--stdout:
--Write took 0.011678 seconds and 0 bytes/second
--./testsuite.at:249: exit code was 1, expected 0
--46. testsuite.at:247: 46. compression szip (testsuite.at:247): FAILED (testsuite.at:249)
--
--# -*- compilation -*-
--53. testsuite.at:276: testing largefile ...
-+51. testsuite.at:276: testing largefile ...
- ./testsuite.at:278: test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile
- stderr:
- stdout:
-@@ -226,7 +211,7 @@ Read error in "simple_0197" at position
- Read error in "simple_0351" at position 0001. Expected 92012545.000000, got 92012544.000000
- Further errors will be suppressed
- ./testsuite.at:278: exit code was 1, expected 0
--53. testsuite.at:276: 53. largefile (testsuite.at:276): FAILED (testsuite.at:278)
-+51. testsuite.at:276: 51. largefile (testsuite.at:276): FAILED (testsuite.at:278)
-
-
- ## ------------- ##
-@@ -238,7 +223,7 @@ Further errors will be suppressed
- | It was created by silo configure 4.8, which was
- | generated by GNU Autoconf 2.61. Invocation command line was
- |
--| $ ./configure --build=i486-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=${prefix}/lib/silo-llnl --disable-maintainer-mode --disable-dependency-tracking --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib PYTHON=python2.6
-+| $ ./configure --build=i486-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=${prefix}/lib/silo-llnl --disable-maintainer-mode --disable-dependency-tracking --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib PYTHON=python2.7
- |
- | ## --------- ##
- | ## Platform. ##
-@@ -246,9 +231,9 @@ Further errors will be suppressed
- |
- | hostname = debian
- | uname -m = i686
--| uname -r = 2.6.38-2-686
-+| uname -r = 2.6.39-1-486
- | uname -s = Linux
--| uname -v = #1 SMP Thu Apr 7 05:24:21 UTC 2011
-+| uname -v = #1 Fri May 20 19:57:02 UTC 2011
- |
- | /usr/bin/uname -p = unknown
- | /bin/uname -X = unknown
-@@ -324,8 +309,8 @@ Further errors will be suppressed
- | configure:2939: result: g++
- | configure:2970: checking for C++ compiler version
- | configure:2977: g++ --version >&5
--| g++ (Debian 4.5.2-8) 4.5.2
--| Copyright (C) 2010 Free Software Foundation, Inc.
-+| g++ (Debian 4.6.0-11) 4.6.1 20110604 (prerelease)
-+| Copyright (C) 2011 Free Software Foundation, Inc.
- | This is free software; see the source for copying conditions. There is NO
- | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- |
-@@ -333,14 +318,16 @@ Further errors will be suppressed
- | configure:2987: g++ -v >&5
- | Using built-in specs.
- | COLLECT_GCC=g++
--| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.5.2/lto-wrapper
-+| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.6.1/lto-wrapper
- | Target: i486-linux-gnu
--| Configured with: ../src/configure -v --with-pkgversion='Debian 4.5.2-8' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enabl [...]
-+| Configured with: ../src/configure -v --with-pkgversion='Debian 4.6.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --enable [...]
- | Thread model: posix
--| gcc version 4.5.2 (Debian 4.5.2-8)
-+| gcc version 4.6.1 20110604 (prerelease) (Debian 4.6.0-11)
- | configure:2990: $? = 0
- | configure:2997: g++ -V >&5
--| g++: '-V' option must have argument
-+| g++: error: unrecognized option '-V'
-+| g++: fatal error: no input files
-+| compilation terminated.
- | configure:3000: $? = 1
- | configure:3023: checking for C++ compiler default output file name
- | configure:3050: g++ -g -O2 conftest.cpp >&5
-@@ -377,8 +364,8 @@ Further errors will be suppressed
- | configure:3706: result: gcc
- | configure:3944: checking for C compiler version
- | configure:3951: gcc --version >&5
--| gcc (Debian 4.5.2-8) 4.5.2
--| Copyright (C) 2010 Free Software Foundation, Inc.
-+| gcc (Debian 4.6.0-11) 4.6.1 20110604 (prerelease)
-+| Copyright (C) 2011 Free Software Foundation, Inc.
- | This is free software; see the source for copying conditions. There is NO
- | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- |
-@@ -386,14 +373,16 @@ Further errors will be suppressed
- | configure:3961: gcc -v >&5
- | Using built-in specs.
- | COLLECT_GCC=gcc
--| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.5.2/lto-wrapper
-+| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.6.1/lto-wrapper
- | Target: i486-linux-gnu
--| Configured with: ../src/configure -v --with-pkgversion='Debian 4.5.2-8' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enabl [...]
-+| Configured with: ../src/configure -v --with-pkgversion='Debian 4.6.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --enable [...]
- | Thread model: posix
--| gcc version 4.5.2 (Debian 4.5.2-8)
-+| gcc version 4.6.1 20110604 (prerelease) (Debian 4.6.0-11)
- | configure:3964: $? = 0
- | configure:3971: gcc -V >&5
--| gcc: '-V' option must have argument
-+| gcc: error: unrecognized option '-V'
-+| gcc: fatal error: no input files
-+| compilation terminated.
- | configure:3974: $? = 1
- | configure:3977: checking whether we are using the GNU C compiler
- | configure:4006: gcc -c -g -O2 conftest.c >&5
-@@ -450,8 +439,8 @@ Further errors will be suppressed
- | configure:4726: result: gfortran
- | configure:4756: checking for Fortran compiler version
- | configure:4763: gfortran --version >&5
--| GNU Fortran (Debian 4.5.2-8) 4.5.2
--| Copyright (C) 2010 Free Software Foundation, Inc.
-+| GNU Fortran (Debian 4.6.0-11) 4.6.1 20110604 (prerelease)
-+| Copyright (C) 2011 Free Software Foundation, Inc.
- |
- | GNU Fortran comes with NO WARRANTY, to the extent permitted by law.
- | You may redistribute copies of GNU Fortran
-@@ -462,14 +451,16 @@ Further errors will be suppressed
- | configure:4773: gfortran -v >&5
- | Using built-in specs.
- | COLLECT_GCC=gfortran
--| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.5.2/lto-wrapper
-+| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.6.1/lto-wrapper
- | Target: i486-linux-gnu
--| Configured with: ../src/configure -v --with-pkgversion='Debian 4.5.2-8' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enabl [...]
-+| Configured with: ../src/configure -v --with-pkgversion='Debian 4.6.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --enable [...]
- | Thread model: posix
--| gcc version 4.5.2 (Debian 4.5.2-8)
-+| gcc version 4.6.1 20110604 (prerelease) (Debian 4.6.0-11)
- | configure:4776: $? = 0
- | configure:4783: gfortran -V >&5
--| gfortran: '-V' option must have argument
-+| gfortran: error: unrecognized option '-V'
-+| gfortran: fatal error: no input files
-+| compilation terminated.
- | configure:4786: $? = 1
- | configure:4794: checking whether we are using the GNU Fortran compiler
- | configure:4813: gfortran -c conftest.F >&5
-@@ -485,62 +476,66 @@ Further errors will be suppressed
- | configure:4954: gfortran -o conftest -g -O2 -v conftest.f
- | Using built-in specs.
- | COLLECT_GCC=gfortran
--| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.5.2/lto-wrapper
-+| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.6.1/lto-wrapper
- | Target: i486-linux-gnu
--| Configured with: ../src/configure -v --with-pkgversion='Debian 4.5.2-8' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enabl [...]
-+| Configured with: ../src/configure -v --with-pkgversion='Debian 4.6.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --enable [...]
- | Thread model: posix
--| gcc version 4.5.2 (Debian 4.5.2-8)
-+| gcc version 4.6.1 20110604 (prerelease) (Debian 4.6.0-11)
-+| COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
-+| /usr/lib/gcc/i486-linux-gnu/4.6.1/f951 conftest.f -ffixed-form -quiet -dumpbase conftest.f -mtune=generic -march=i586 -auxbase conftest -g -O2 -version -fintrinsic-modules-path /usr/lib/gcc/i486-linux-gnu/4.6.1/finclude -o /tmp/ccztNScI.s
-+| GNU Fortran (Debian 4.6.0-11) version 4.6.1 20110604 (prerelease) (i486-linux-gnu)
-+| compiled by GNU C version 4.6.1 20110604 (prerelease), GMP version 5.0.1, MPFR version 3.0.1-p3, MPC version 0.9
-+| GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
-+| GNU Fortran (Debian 4.6.0-11) version 4.6.1 20110604 (prerelease) (i486-linux-gnu)
-+| compiled by GNU C version 4.6.1 20110604 (prerelease), GMP version 5.0.1, MPFR version 3.0.1-p3, MPC version 0.9
-+| GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
- | COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
--| /usr/lib/gcc/i486-linux-gnu/4.5.2/f951 conftest.f -ffixed-form -quiet -dumpbase conftest.f -mtune=generic -march=i586 -auxbase conftest -g -O2 -version -fintrinsic-modules-path /usr/lib/gcc/i486-linux-gnu/4.5.2/finclude -o /tmp/ccy14BOk.s
--| GNU Fortran (Debian 4.5.2-8) version 4.5.2 (i486-linux-gnu)
--| compiled by GNU C version 4.5.2, GMP version 5.0.1, MPFR version 3.0.0-p8, MPC version 0.9
--| GGC heuristics: --param ggc-min-expand=99 --param ggc-min-heapsize=129296
--| GNU Fortran (Debian 4.5.2-8) version 4.5.2 (i486-linux-gnu)
--| compiled by GNU C version 4.5.2, GMP version 5.0.1, MPFR version 3.0.0-p8, MPC version 0.9
--| GGC heuristics: --param ggc-min-expand=99 --param ggc-min-heapsize=129296
-+| as --32 -o /tmp/ccePcCeX.o /tmp/ccztNScI.s
-+| Reading specs from /usr/lib/gcc/i486-linux-gnu/4.6.1/libgfortran.spec
-+| rename spec lib to liborig
- | COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
--| as -V -Qy --32 -o /tmp/ccuDYS5s.o /tmp/ccy14BOk.s
--| GNU assembler version 2.21.0 (i486-linux-gnu) using BFD version (GNU Binutils for Debian) 2.21.0.20110327
--| COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/
--| LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../:/lib/:/usr/lib/
-+| COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/
-+| LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../:/lib/:/usr/lib/:/usr/lib/i386-linux-gnu/
- | COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
--| /usr/lib/gcc/i486-linux-gnu/4.5.2/collect2 --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -dynamic-linker /lib/ld-linux.so.2 -o conftest /usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib/crt1.o /usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib/crti.o /usr/lib/gcc/i486-linux-gnu/4.5.2/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. /t [...]
-+| /usr/lib/gcc/i486-linux-gnu/4.6.1/collect2 --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -dynamic-linker /lib/ld-linux.so.2 -o conftest /usr/lib/i386-linux-gnu/crt1.o /usr/lib/i386-linux-gnu/crti.o /usr/lib/gcc/i486-linux-gnu/4.6.1/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu /tmp/ccePcCeX.o -lgfortran - [...]
- | configure:5020: result: -v
- | configure:5022: checking for Fortran libraries of gfortran
- | configure:5045: gfortran -o conftest -g -O2 -v conftest.f
- | Using built-in specs.
- | COLLECT_GCC=gfortran
--| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.5.2/lto-wrapper
-+| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.6.1/lto-wrapper
- | Target: i486-linux-gnu
--| Configured with: ../src/configure -v --with-pkgversion='Debian 4.5.2-8' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enabl [...]
-+| Configured with: ../src/configure -v --with-pkgversion='Debian 4.6.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --enable [...]
- | Thread model: posix
--| gcc version 4.5.2 (Debian 4.5.2-8)
-+| gcc version 4.6.1 20110604 (prerelease) (Debian 4.6.0-11)
- | COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
--| /usr/lib/gcc/i486-linux-gnu/4.5.2/f951 conftest.f -ffixed-form -quiet -dumpbase conftest.f -mtune=generic -march=i586 -auxbase conftest -g -O2 -version -fintrinsic-modules-path /usr/lib/gcc/i486-linux-gnu/4.5.2/finclude -o /tmp/cc7ynuqW.s
--| GNU Fortran (Debian 4.5.2-8) version 4.5.2 (i486-linux-gnu)
--| compiled by GNU C version 4.5.2, GMP version 5.0.1, MPFR version 3.0.0-p8, MPC version 0.9
--| GGC heuristics: --param ggc-min-expand=99 --param ggc-min-heapsize=129296
--| GNU Fortran (Debian 4.5.2-8) version 4.5.2 (i486-linux-gnu)
--| compiled by GNU C version 4.5.2, GMP version 5.0.1, MPFR version 3.0.0-p8, MPC version 0.9
--| GGC heuristics: --param ggc-min-expand=99 --param ggc-min-heapsize=129296
-+| /usr/lib/gcc/i486-linux-gnu/4.6.1/f951 conftest.f -ffixed-form -quiet -dumpbase conftest.f -mtune=generic -march=i586 -auxbase conftest -g -O2 -version -fintrinsic-modules-path /usr/lib/gcc/i486-linux-gnu/4.6.1/finclude -o /tmp/ccgwAc68.s
-+| GNU Fortran (Debian 4.6.0-11) version 4.6.1 20110604 (prerelease) (i486-linux-gnu)
-+| compiled by GNU C version 4.6.1 20110604 (prerelease), GMP version 5.0.1, MPFR version 3.0.1-p3, MPC version 0.9
-+| GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
-+| GNU Fortran (Debian 4.6.0-11) version 4.6.1 20110604 (prerelease) (i486-linux-gnu)
-+| compiled by GNU C version 4.6.1 20110604 (prerelease), GMP version 5.0.1, MPFR version 3.0.1-p3, MPC version 0.9
-+| GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
- | COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
--| as -V -Qy --32 -o /tmp/ccBLlTG5.o /tmp/cc7ynuqW.s
--| GNU assembler version 2.21.0 (i486-linux-gnu) using BFD version (GNU Binutils for Debian) 2.21.0.20110327
--| COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/
--| LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.5.2/:/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../:/lib/:/usr/lib/
-+| as --32 -o /tmp/ccn9pydp.o /tmp/ccgwAc68.s
-+| Reading specs from /usr/lib/gcc/i486-linux-gnu/4.6.1/libgfortran.spec
-+| rename spec lib to liborig
- | COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
--| /usr/lib/gcc/i486-linux-gnu/4.5.2/collect2 --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -dynamic-linker /lib/ld-linux.so.2 -o conftest /usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib/crt1.o /usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib/crti.o /usr/lib/gcc/i486-linux-gnu/4.5.2/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. /t [...]
--| configure:5219: result: -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm
-+| COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/
-+| LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.6.1/:/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../:/lib/:/usr/lib/:/usr/lib/i386-linux-gnu/
-+| COLLECT_GCC_OPTIONS='-o' 'conftest' '-g' '-O2' '-v' '-shared-libgcc' '-mtune=generic' '-march=i586'
-+| /usr/lib/gcc/i486-linux-gnu/4.6.1/collect2 --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -dynamic-linker /lib/ld-linux.so.2 -o conftest /usr/lib/i386-linux-gnu/crt1.o /usr/lib/i386-linux-gnu/crti.o /usr/lib/gcc/i486-linux-gnu/4.6.1/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu /tmp/ccn9pydp.o -lgfortran - [...]
-+| configure:5219: result: -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath
- | configure:5236: checking for dummy main to link with Fortran libraries
--| configure:5280: gcc -o conftest -g -O2 conftest.c -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm >&5
-+| configure:5280: gcc -o conftest -g -O2 conftest.c -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath >&5
- | configure:5286: $? = 0
- | configure:5367: result: none
- | configure:5404: checking for Fortran name-mangling scheme
- | configure:5423: gfortran -c -g -O2 conftest.f >&5
- | configure:5429: $? = 0
--| configure:5484: gcc -o conftest -g -O2 conftest.c cfortran_test.o -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm >&5
--| /tmp/cccuiXij.o: In function `main':
--| /home/alastair/silo-llnl/apr11/silo-llnl-4.8/conftest.c:29: undefined reference to `foobar'
-+| configure:5484: gcc -o conftest -g -O2 conftest.c cfortran_test.o -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath >&5
-+| /tmp/cchVqbWD.o: In function `main':
-+| /home/amckinstry/silo/silo-llnl-4.8/conftest.c:29: undefined reference to `foobar'
- | collect2: ld returned 1 exit status
- | configure:5490: $? = 1
- | configure: failed program was:
-@@ -576,9 +571,9 @@ Further errors will be suppressed
- | | ;
- | | return 0;
- | | }
--| configure:5484: gcc -o conftest -g -O2 conftest.c cfortran_test.o -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm >&5
-+| configure:5484: gcc -o conftest -g -O2 conftest.c cfortran_test.o -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath >&5
- | configure:5490: $? = 0
--| configure:5569: gcc -o conftest -g -O2 conftest.c cfortran_test.o -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm >&5
-+| configure:5569: gcc -o conftest -g -O2 conftest.c cfortran_test.o -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath >&5
- | configure:5575: $? = 0
- | configure:5632: result: lower case, underscore, no extra underscore
- | configure:5733: checking whether make sets $(MAKE)
-@@ -750,8 +745,8 @@ Further errors will be suppressed
- | configure:7368: result: gfortran
- | configure:7398: checking for Fortran 77 compiler version
- | configure:7405: gfortran --version >&5
--| GNU Fortran (Debian 4.5.2-8) 4.5.2
--| Copyright (C) 2010 Free Software Foundation, Inc.
-+| GNU Fortran (Debian 4.6.0-11) 4.6.1 20110604 (prerelease)
-+| Copyright (C) 2011 Free Software Foundation, Inc.
- |
- | GNU Fortran comes with NO WARRANTY, to the extent permitted by law.
- | You may redistribute copies of GNU Fortran
-@@ -762,14 +757,16 @@ Further errors will be suppressed
- | configure:7415: gfortran -v >&5
- | Using built-in specs.
- | COLLECT_GCC=gfortran
--| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.5.2/lto-wrapper
-+| COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.6.1/lto-wrapper
- | Target: i486-linux-gnu
--| Configured with: ../src/configure -v --with-pkgversion='Debian 4.5.2-8' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enabl [...]
-+| Configured with: ../src/configure -v --with-pkgversion='Debian 4.6.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --enable [...]
- | Thread model: posix
--| gcc version 4.5.2 (Debian 4.5.2-8)
-+| gcc version 4.6.1 20110604 (prerelease) (Debian 4.6.0-11)
- | configure:7418: $? = 0
- | configure:7425: gfortran -V >&5
--| gfortran: '-V' option must have argument
-+| gfortran: error: unrecognized option '-V'
-+| gfortran: fatal error: no input files
-+| compilation terminated.
- | configure:7428: $? = 1
- | configure:7436: checking whether we are using the GNU Fortran 77 compiler
- | configure:7455: gfortran -c -g -O2 conftest.F >&5
-@@ -802,7 +799,7 @@ Further errors will be suppressed
- | configure:8215: result: strip
- | configure:8501: checking if gcc supports -fno-rtti -fno-exceptions
- | configure:8519: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5
--| cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
-+| cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default]
- | configure:8523: $? = 0
- | configure:8536: result: no
- | configure:8551: checking for gcc option to produce PIC
-@@ -1137,7 +1134,7 @@ Further errors will be suppressed
- | configure:24829: result: yes
- | configure:24842: checking for memmove
- | configure:24906: gcc -o conftest -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement conftest.c >&5
--| conftest.c:68:6: warning: conflicting types for built-in function 'memmove'
-+| conftest.c:68:6: warning: conflicting types for built-in function 'memmove' [enabled by default]
- | configure:24912: $? = 0
- | configure:24930: result: yes
- | configure:24842: checking for fnmatch
-@@ -1146,13 +1143,13 @@ Further errors will be suppressed
- | configure:24930: result: yes
- | configure:24842: checking for isnan
- | configure:24906: gcc -o conftest -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement conftest.c >&5
--| conftest.c:70:6: warning: conflicting types for built-in function 'isnan'
-+| conftest.c:70:6: warning: conflicting types for built-in function 'isnan' [enabled by default]
- | configure:24912: $? = 0
- | configure:24930: result: yes
- | configure:24842: checking for fpclass
- | configure:24906: gcc -o conftest -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement conftest.c >&5
--| /tmp/ccdNUDoD.o: In function `main':
--| /home/alastair/silo-llnl/apr11/silo-llnl-4.8/conftest.c:90: undefined reference to `fpclass'
-+| /tmp/ccPgkmF6.o: In function `main':
-+| /home/amckinstry/silo/silo-llnl-4.8/conftest.c:90: undefined reference to `fpclass'
- | collect2: ld returned 1 exit status
- | configure:24912: $? = 1
- | configure: failed program was:
-@@ -1258,7 +1255,7 @@ Further errors will be suppressed
- | configure:24957: result: yes
- | configure:25189: checking for cos in -lm
- | configure:25232: gcc -o conftest -g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement conftest.c -lm >&5
--| conftest.c:56:6: warning: conflicting types for built-in function 'cos'
-+| conftest.c:56:6: warning: conflicting types for built-in function 'cos' [enabled by default]
- | configure:25238: $? = 0
- | configure:25256: result: yes
- | configure:25303: checking for szlib
-@@ -1622,21 +1619,21 @@ Further errors will be suppressed
- | configure:26910: checking for readline/history.h
- | configure:26918: result: yes
- | configure:26996: checking for supported Qt version
--| configure:27030: result: Qt 4.7.2 in /usr/include/qt4
--| configure:27085: checking whether python2.6 version >= 2.1
--| configure:27094: python2.6 -c import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. minver = map(int, string.split('2.1', '.')) + [0, 0, 0] minverhex = 0 for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] sys.exit(sys.hexversion < minverhex)
-+| configure:27026: WARNING: Sorry, but you need Qt version 4.4.0 or higher to compile Silo's silex tool. silex is being disabled
-+| configure:27085: checking whether python2.7 version >= 2.1
-+| configure:27094: python2.7 -c import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. minver = map(int, string.split('2.1', '.')) + [0, 0, 0] minverhex = 0 for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] sys.exit(sys.hexversion < minverhex)
- | configure:27097: $? = 0
- | configure:27099: result: yes
--| configure:27192: checking for python2.6 version
--| configure:27199: result: 2.6
--| configure:27211: checking for python2.6 platform
-+| configure:27192: checking for python2.7 version
-+| configure:27199: result: 2.7
-+| configure:27211: checking for python2.7 platform
- | configure:27218: result: linux2
--| configure:27225: checking for python2.6 script directory
--| configure:27233: result: ${prefix}/lib/python2.6/site-packages
--| configure:27242: checking for python2.6 extension module directory
--| configure:27250: result: ${exec_prefix}/lib/python2.6/site-packages
-+| configure:27225: checking for python2.7 script directory
-+| configure:27233: result: ${prefix}/lib/python2.7/site-packages
-+| configure:27242: checking for python2.7 extension module directory
-+| configure:27250: result: ${exec_prefix}/lib/python2.7/site-packages
- | configure:27265: checking for Python include path
--| configure:27275: result: -I/usr/include/python2.6
-+| configure:27275: result: -I/usr/include/python2.7
- | configure:27721: creating ./config.status
- |
- | ## ---------------------- ##
-@@ -1729,7 +1726,7 @@ Further errors will be suppressed
- | ac_cv_f77_compiler_gnu=yes
- | ac_cv_fc_compiler_gnu=yes
- | ac_cv_fc_dummy_main=none
--| ac_cv_fc_libs=' -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm'
-+| ac_cv_fc_libs=' -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath'
- | ac_cv_fc_mangling='lower case, underscore, no extra underscore'
- | ac_cv_fortran_dummy_main=none
- | ac_cv_func_H5open=yes
-@@ -1790,9 +1787,9 @@ Further errors will be suppressed
- | am_cv_CC_dependencies_compiler_type=none
- | am_cv_CXX_dependencies_compiler_type=none
- | am_cv_python_platform=linux2
--| am_cv_python_pyexecdir='${exec_prefix}/lib/python2.6/site-packages'
--| am_cv_python_pythondir='${prefix}/lib/python2.6/site-packages'
--| am_cv_python_version=2.6
-+| am_cv_python_pyexecdir='${exec_prefix}/lib/python2.7/site-packages'
-+| am_cv_python_pythondir='${prefix}/lib/python2.7/site-packages'
-+| am_cv_python_version=2.7
- | ax_cv_c_flags___D_FILE_OFFSET_BITS_64_=yes
- | ax_cv_c_flags___D_LARGEFILE64_SOURCE_=yes
- | ax_cv_c_flags___D_LARGEFILE_SOURCE_=yes
-@@ -1838,15 +1835,15 @@ Further errors will be suppressed
- | ## Output variables. ##
- | ## ----------------- ##
- |
--| ACLOCAL='${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run aclocal-1.10'
-+| ACLOCAL='${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run aclocal-1.10'
- | AMDEPBACKSLASH=''
- | AMDEP_FALSE=''
- | AMDEP_TRUE='#'
--| AMTAR='${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run tar'
-+| AMTAR='${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run tar'
- | AR='ar'
--| AUTOCONF='${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoconf'
--| AUTOHEADER='${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run autoheader'
--| AUTOMAKE='${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run automake-1.10'
-+| AUTOCONF='${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoconf'
-+| AUTOHEADER='${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run autoheader'
-+| AUTOMAKE='${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run automake-1.10'
- | AWK='mawk'
- | BROWSER='browser'
- | BROWSER_NEEDED_FALSE='#'
-@@ -1856,9 +1853,9 @@ Further errors will be suppressed
- | CCDEPMODE='depmode=none'
- | CC_FULLPATH='/usr/bin/gcc'
- | CFLAGS='-g -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement'
--| CONFIG_CMD='./configure '\''--build=i486-linux-gnu'\'' '\''--prefix=/usr'\'' '\''--includedir=${prefix}/include'\'' '\''--mandir=${prefix}/share/man'\'' '\''--infodir=${prefix}/share/info'\'' '\''--sysconfdir=/etc'\'' '\''--localstatedir=/var'\'' '\''--libexecdir=${prefix}/lib/silo-llnl'\'' '\''--disable-maintainer-mode'\'' '\''--disable-dependency-tracking'\'' '\''--with-qt=/usr'\'' '\''--enable-pythonmodule'\'' '\''--enable-silex'\'' '\''--with-qt-bin=/usr/bin'\'' '\''--with-qt-lib= [...]
--| CONFIG_DATE='Mon Apr 11 07:04:25 IST 2011'
--| CONFIG_USER='alastair at debian'
-+| CONFIG_CMD='./configure '\''--build=i486-linux-gnu'\'' '\''--prefix=/usr'\'' '\''--includedir=${prefix}/include'\'' '\''--mandir=${prefix}/share/man'\'' '\''--infodir=${prefix}/share/info'\'' '\''--sysconfdir=/etc'\'' '\''--localstatedir=/var'\'' '\''--libexecdir=${prefix}/lib/silo-llnl'\'' '\''--disable-maintainer-mode'\'' '\''--disable-dependency-tracking'\'' '\''--with-qt=/usr'\'' '\''--enable-pythonmodule'\'' '\''--enable-silex'\'' '\''--with-qt-bin=/usr/bin'\'' '\''--with-qt-lib= [...]
-+| CONFIG_DATE='Thu Jun 9 10:36:31 IST 2011'
-+| CONFIG_USER='amckinstry at debian'
- | CPP='gcc -E'
- | CPPFLAGS='-I/usr/include '
- | CXX='g++'
-@@ -1880,7 +1877,7 @@ Further errors will be suppressed
- | F77='gfortran'
- | FC='gfortran'
- | FCFLAGS='-g -O2'
--| FCLIBS=' -L/usr/lib/gcc/i486-linux-gnu/4.5.2 -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.5.2/../../.. -lgfortran -lm'
-+| FCLIBS=' -L/usr/lib/gcc/i486-linux-gnu/4.6.1 -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.6.1/../../.. -L/usr/lib/i386-linux-gnu -lgfortran -lm -lquadmath'
- | FC_FULLPATH='/usr/bin/gfortran'
- | FFLAGS='-g -O2'
- | FORTRAN='fortran'
-@@ -1909,7 +1906,7 @@ Further errors will be suppressed
- | MAINT='#'
- | MAINTAINER_MODE_FALSE=''
- | MAINTAINER_MODE_TRUE='#'
--| MAKEINFO='${SHELL} /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/missing --run makeinfo'
-+| MAKEINFO='${SHELL} /home/amckinstry/silo/silo-llnl-4.8/config/missing --run makeinfo'
- | NETCDF='netcdf'
- | NETCDF_NEEDED_FALSE='#'
- | NETCDF_NEEDED_TRUE=''
-@@ -1928,15 +1925,15 @@ Further errors will be suppressed
- | PDB_DRV_NEEDED_FALSE='#'
- | PDB_DRV_NEEDED_TRUE=''
- | PRTDIAG=''
--| PYTHON='python2.6'
-+| PYTHON='python2.7'
- | PYTHONMODULE='python'
--| PYTHON_CPPFLAGS='-I/usr/include/python2.6'
-+| PYTHON_CPPFLAGS='-I/usr/include/python2.7'
- | PYTHON_EXEC_PREFIX='${exec_prefix}'
- | PYTHON_NEEDED_FALSE='#'
- | PYTHON_NEEDED_TRUE=''
- | PYTHON_PLATFORM='linux2'
- | PYTHON_PREFIX='${prefix}'
--| PYTHON_VERSION='2.6'
-+| PYTHON_VERSION='2.7'
- | QT_BIN='/usr/bin'
- | QT_CORE='libQtCore.so'
- | QT_CORE_LIB='-lQtCore'
-@@ -1953,9 +1950,9 @@ Further errors will be suppressed
- | SED='/bin/sed'
- | SET_MAKE=''
- | SHELL='/bin/bash'
--| SILEX='silex'
--| SILEX_NEEDED_FALSE='#'
--| SILEX_NEEDED_TRUE=''
-+| SILEX=''
-+| SILEX_NEEDED_FALSE=''
-+| SILEX_NEEDED_TRUE='#'
- | SILO_DTYPPTR1='void*'
- | SILO_DTYPPTR2='void*'
- | SILO_DTYPPTR='void'
-@@ -2005,7 +2002,7 @@ Further errors will be suppressed
- | htmldir='${docdir}'
- | includedir='${prefix}/include'
- | infodir='${prefix}/share/info'
--| install_sh='$(SHELL) /home/alastair/silo-llnl/apr11/silo-llnl-4.8/config/install-sh'
-+| install_sh='$(SHELL) /home/amckinstry/silo/silo-llnl-4.8/config/install-sh'
- | libdir='${exec_prefix}/lib'
- | libexecdir='${prefix}/lib/silo-llnl'
- | localedir='${datarootdir}/locale'
-@@ -2019,8 +2016,8 @@ Further errors will be suppressed
- | prefix='/usr'
- | program_transform_name='s,x,x,'
- | psdir='${docdir}'
--| pyexecdir='${exec_prefix}/lib/python2.6/site-packages'
--| pythondir='${prefix}/lib/python2.6/site-packages'
-+| pyexecdir='${exec_prefix}/lib/python2.7/site-packages'
-+| pythondir='${prefix}/lib/python2.7/site-packages'
- | sbindir='${exec_prefix}/sbin'
- | sharedstatedir='${prefix}/com'
- | sysconfdir='/etc'
---- silo-llnl-4.8.orig/tests/testsuite.log.pdb
-+++ silo-llnl-4.8/tests/testsuite.log.pdb
-@@ -3,7 +3,7 @@
- ## ------------------------------------------- ##
-
- testsuite: command line was:
-- $ ./testsuite PYTHON=python2.6 BROWSER=browser STARGS=
-+ $ ./testsuite PYTHON=python2.7 BROWSER=browser STARGS=
-
- ## --------- ##
- ## Platform. ##
-@@ -11,9 +11,9 @@ testsuite: command line was:
-
- hostname = debian
- uname -m = i686
--uname -r = 2.6.38-2-686
-+uname -r = 2.6.39-1-486
- uname -s = Linux
--uname -v = #1 SMP Thu Apr 7 05:24:21 UTC 2011
-+uname -v = #1 Fri May 20 19:57:02 UTC 2011
-
- /usr/bin/uname -p = unknown
- /bin/uname -X = unknown
-@@ -26,7 +26,7 @@ uname -v = #1 SMP Thu Apr 7 05:24:21 UTC
- /usr/bin/oslevel = unknown
- /bin/universe = unknown
-
--PATH: /home/alastair/silo-llnl/apr11/silo-llnl-4.8/tests
-+PATH: /home/amckinstry/silo/silo-llnl-4.8/tests
- PATH: /usr/sbin
- PATH: /usr/bin
- PATH: /sbin
-@@ -40,13 +40,13 @@ testsuite: atconfig:
- |
- | # The test suite will define top_srcdir=/../.. etc.
- | at_testdir='tests'
--| abs_builddir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8/tests'
-+| abs_builddir='/home/amckinstry/silo/silo-llnl-4.8/tests'
- | at_srcdir='.'
--| abs_srcdir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8/tests'
-+| abs_srcdir='/home/amckinstry/silo/silo-llnl-4.8/tests'
- | at_top_srcdir='..'
--| abs_top_srcdir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8'
-+| abs_top_srcdir='/home/amckinstry/silo/silo-llnl-4.8'
- | at_top_build_prefix='../'
--| abs_top_builddir='/home/alastair/silo-llnl/apr11/silo-llnl-4.8'
-+| abs_top_builddir='/home/amckinstry/silo/silo-llnl-4.8'
- |
- | # Backward compatibility with Autotest <= 2.59b:
- | at_top_builddir=$at_top_build_prefix
-@@ -62,78 +62,76 @@ testsuite: atconfig:
- ## ------------------ ##
- ## Running the tests. ##
- ## ------------------ ##
--testsuite: starting at: Mon Apr 11 07:07:23 IST 2011
--1. version (testsuite.at:63): ok (0m0.136s 0m0.144s)
--2. namescheme (testsuite.at:86): ok (0m0.136s 0m0.144s)
--3. point (testsuite.at:89): ok (0m0.112s 0m0.108s)
--4. extface (testsuite.at:92): ok (0m0.108s 0m0.116s)
--5. testall -small (testsuite.at:95): ok (0m0.312s 0m0.136s)
--6. TestReadMask (testsuite.at:98): ok (0m0.420s 0m0.308s)
--7. array (testsuite.at:104): ok (0m0.124s 0m0.104s)
--8. multi_test (testsuite.at:107): ok (0m0.492s 0m0.308s)
--9. multi_test earlyclose (testsuite.at:110): ok (0m0.148s 0m0.088s)
--10. partial_io (testsuite.at:113): ok (0m0.120s 0m0.100s)
--11. simple (testsuite.at:116): ok (0m0.128s 0m0.088s)
--12. ucd (testsuite.at:119): ok (0m0.124s 0m0.108s)
--13. ucdsamp3 (testsuite.at:122): ok (0m0.120s 0m0.100s)
--14. testall -small -fortran (testsuite.at:125): ok (0m0.232s 0m0.088s)
--15. obj (testsuite.at:128): ok (0m0.124s 0m0.096s)
--16. onehex (testsuite.at:131): ok (0m0.144s 0m0.088s)
--17. oneprism (testsuite.at:134): ok (0m0.128s 0m0.100s)
--18. onepyramid (testsuite.at:137): ok (0m0.108s 0m0.076s)
--19. onetet (testsuite.at:140): ok (0m0.076s 0m0.120s)
--20. subhex (testsuite.at:143): ok (0m0.112s 0m0.112s)
--21. twohex (testsuite.at:146): ok (0m0.108s 0m0.124s)
--22. multispec (testsuite.at:149): ok (0m0.144s 0m0.084s)
--23. sami (testsuite.at:152): ok (0m0.124s 0m0.100s)
--24. specmix (testsuite.at:155): ok (0m0.160s 0m0.104s)
--25. spec (testsuite.at:158): ok (0m0.128s 0m0.108s)
--26. group_test (testsuite.at:161): ok (0m0.460s 0m0.252s)
--27. listtypes (testsuite.at:164): ok (0m0.164s 0m0.148s)
--28. alltypes (testsuite.at:168): ok (0m0.148s 0m0.084s)
--29. wave (testsuite.at:171): ok (0m0.192s 0m0.156s)
--30. polyzl (testsuite.at:174): ok (0m0.100s 0m0.120s)
--31. csg (testsuite.at:177): ok (0m0.108s 0m0.104s)
--32. rocket (testsuite.at:180): ok (0m0.120s 0m0.108s)
--33. mmadjacency (testsuite.at:183): ok (0m0.100s 0m0.124s)
--34. mat3d_3across (testsuite.at:186): ok (0m0.116s 0m0.084s)
--35. ucd1d (testsuite.at:189): ok (0m0.120s 0m0.100s)
--36. dir (testsuite.at:192): ok (0m0.136s 0m0.096s)
--37. quad (testsuite.at:195): ok (0m0.116s 0m0.124s)
--38. arbpoly2d (testsuite.at:198): ok (0m0.132s 0m0.104s)
--39. readstuff (testsuite.at:201): ok (0m0.544s 0m0.312s)
--40. read (testsuite.at:207): ok (0m0.448s 0m0.236s)
--41. write (testsuite.at:212): ok (0m0.036s 0m0.032s)
--42. error handling (testsuite.at:227): ok (0m0.496s 0m0.192s)
--43. testpdb (testsuite.at:234): ok (0m0.120s 0m0.080s)
--44. grab (testsuite.at:239): skipped (testsuite.at:240)
--45. compression gzip (testsuite.at:242): skipped (testsuite.at:244)
--46. compression szip (testsuite.at:247): skipped (testsuite.at:249)
--47. compression fpzip (testsuite.at:252): skipped (testsuite.at:254)
--48. compression lossy3 (testsuite.at:257): skipped (testsuite.at:259)
--49. compression minratio1000 (testsuite.at:262): skipped (testsuite.at:264)
--50. testhzip (testsuite.at:266): skipped (testsuite.at:268)
--51. checksums (testsuite.at:270): skipped (testsuite.at:271)
--52. xversion (testsuite.at:273): skipped (testsuite.at:274)
--53. largefile (testsuite.at:276): skipped (testsuite.at:278)
--54. arrayf77 (testsuite.at:282): ok (0m0.164s 0m0.120s)
--55. curvef77 (testsuite.at:286): ok (0m0.140s 0m0.116s)
--56. matf77 (testsuite.at:290): ok (0m0.140s 0m0.124s)
--57. pointf77 (testsuite.at:294): ok (0m0.168s 0m0.088s)
--58. quadf77 (testsuite.at:298): ok (0m0.144s 0m0.092s)
--59. testallf77 (testsuite.at:302): ok (0m0.152s 0m0.108s)
--60. ucdf77 (testsuite.at:306): ok (0m0.160s 0m0.104s)
--61. silock (testsuite.at:312): ok (0m0.392s 0m0.516s)
--62. force single (testsuite.at:316): ok (0m2.320s 0m3.756s)
--63. multi_file (testsuite.at:321): ok (0m5.092s 0m2.680s)
--64. testall -medium (testsuite.at:325): ok (0m1.012s 0m0.200s)
--65. testall -large (testsuite.at:329): ok (0m7.112s 0m1.728s)
--testsuite: ending at: Mon Apr 11 07:09:05 IST 2011
--testsuite: test suite duration: 0h 1m 42s
-+testsuite: starting at: Thu Jun 9 10:40:20 IST 2011
-+1. version (testsuite.at:63): ok (0m0.144s 0m0.312s)
-+2. namescheme (testsuite.at:86): ok (0m0.136s 0m0.288s)
-+3. point (testsuite.at:89): ok (0m0.152s 0m0.320s)
-+4. extface (testsuite.at:92): ok (0m0.128s 0m0.292s)
-+5. testall -small (testsuite.at:95): ok (0m0.500s 0m0.356s)
-+6. TestReadMask (testsuite.at:98): ok (0m0.476s 0m0.800s)
-+7. array (testsuite.at:104): ok (0m0.124s 0m0.236s)
-+8. multi_test (testsuite.at:107): ok (0m0.780s 0m0.884s)
-+9. multi_test earlyclose (testsuite.at:110): ok (0m0.184s 0m0.196s)
-+10. partial_io (testsuite.at:113): ok (0m0.164s 0m0.256s)
-+11. simple (testsuite.at:116): ok (0m0.144s 0m0.344s)
-+12. ucd (testsuite.at:119): ok (0m0.184s 0m0.216s)
-+13. ucdsamp3 (testsuite.at:122): ok (0m0.184s 0m0.348s)
-+14. testall -small -fortran (testsuite.at:125): ok (0m0.252s 0m0.252s)
-+15. obj (testsuite.at:128): ok (0m0.116s 0m0.240s)
-+16. onehex (testsuite.at:131): ok (0m0.108s 0m0.236s)
-+17. oneprism (testsuite.at:134): ok (0m0.152s 0m0.216s)
-+18. onepyramid (testsuite.at:137): ok (0m0.128s 0m0.232s)
-+19. onetet (testsuite.at:140): ok (0m0.148s 0m0.232s)
-+20. subhex (testsuite.at:143): ok (0m0.116s 0m0.248s)
-+21. twohex (testsuite.at:146): ok (0m0.144s 0m0.228s)
-+22. multispec (testsuite.at:149): ok (0m0.128s 0m0.276s)
-+23. sami (testsuite.at:152): ok (0m0.172s 0m0.316s)
-+24. specmix (testsuite.at:155): ok (0m0.160s 0m0.320s)
-+25. spec (testsuite.at:158): ok (0m0.120s 0m0.240s)
-+26. group_test (testsuite.at:161): ok (0m0.640s 0m0.792s)
-+27. listtypes (testsuite.at:164): ok (0m0.144s 0m0.428s)
-+28. alltypes (testsuite.at:168): ok (0m0.120s 0m0.252s)
-+29. wave (testsuite.at:171): ok (0m0.196s 0m0.384s)
-+30. polyzl (testsuite.at:174): ok (0m0.140s 0m0.208s)
-+31. csg (testsuite.at:177): ok (0m0.088s 0m0.252s)
-+32. rocket (testsuite.at:180): ok (0m0.144s 0m0.240s)
-+33. mmadjacency (testsuite.at:183): ok (0m0.104s 0m0.256s)
-+34. mat3d_3across (testsuite.at:186): ok (0m0.124s 0m0.224s)
-+35. ucd1d (testsuite.at:189): ok (0m0.128s 0m0.232s)
-+36. dir (testsuite.at:192): ok (0m0.132s 0m0.272s)
-+37. quad (testsuite.at:195): ok (0m0.096s 0m0.256s)
-+38. arbpoly2d (testsuite.at:198): ok (0m0.088s 0m0.288s)
-+39. readstuff (testsuite.at:201): ok (0m0.656s 0m1.048s)
-+40. read (testsuite.at:207): ok (0m0.636s 0m0.892s)
-+41. error handling (testsuite.at:227): ok (0m0.640s 0m0.904s)
-+42. testpdb (testsuite.at:234): ok (0m0.148s 0m0.244s)
-+43. grab (testsuite.at:239): skipped (testsuite.at:240)
-+44. compression gzip (testsuite.at:242): skipped (testsuite.at:244)
-+45. compression fpzip (testsuite.at:252): skipped (testsuite.at:254)
-+46. compression lossy3 (testsuite.at:257): skipped (testsuite.at:259)
-+47. compression minratio1000 (testsuite.at:262): skipped (testsuite.at:264)
-+48. testhzip (testsuite.at:266): skipped (testsuite.at:268)
-+49. checksums (testsuite.at:270): skipped (testsuite.at:271)
-+50. xversion (testsuite.at:273): skipped (testsuite.at:274)
-+51. largefile (testsuite.at:276): skipped (testsuite.at:278)
-+52. arrayf77 (testsuite.at:282): ok (0m0.168s 0m0.264s)
-+53. curvef77 (testsuite.at:286): ok (0m0.156s 0m0.248s)
-+54. matf77 (testsuite.at:290): ok (0m0.176s 0m0.236s)
-+55. pointf77 (testsuite.at:294): ok (0m0.168s 0m0.216s)
-+56. quadf77 (testsuite.at:298): ok (0m0.164s 0m0.264s)
-+57. testallf77 (testsuite.at:302): ok (0m0.156s 0m0.292s)
-+58. ucdf77 (testsuite.at:306): ok (0m0.136s 0m0.252s)
-+59. silock (testsuite.at:312): ok (0m0.336s 0m1.312s)
-+60. force single (testsuite.at:316): ok (0m2.200s 0m8.905s)
-+61. multi_file (testsuite.at:321): ok (0m4.848s 0m5.068s)
-+62. testall -medium (testsuite.at:325): ok (0m0.904s 0m0.676s)
-+63. testall -large (testsuite.at:329): ok (0m6.564s 0m4.536s)
-+testsuite: ending at: Thu Jun 9 10:42:20 IST 2011
-+testsuite: test suite duration: 0h 2m 0s
-
- ## ------------- ##
- ## Test results. ##
- ## ------------- ##
-
--55 tests were successful.
--10 tests were skipped.
-+54 tests were successful.
-+9 tests were skipped.
diff --git a/debian/patches/series b/debian/patches/series
index fd858c8..926048c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,9 @@
add-lib-version.patch
dist-undo.patch
qt-version.patch
-# debian-changes-4.8-2
testsuite-fix.patch
sh4-build.patch
testsuite-python-write.patch
-#debian-changes-4.8-4
testsuite-skip-szip.patch
test-disable-largefile.patch
+pkgconfig.patch
diff --git a/debian/rules b/debian/rules
index a6e9720..a3fc796 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ override_dh_auto_install:
dh_link -l libsilo0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0.0.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0
dh_link -l libsilo-dev /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0.0.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so
mkdir -p debian/libsilo-dev/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+ cp silo.pc debian/libsilo-dev/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
override_dh_auto_clean:
dh_clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list