diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5copy/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5dump/Makefile.in | 1 | ||||
-rwxr-xr-x | tools/h5import/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5jam/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5ls/Makefile.am | 2 | ||||
-rw-r--r-- | tools/h5ls/Makefile.in | 9 | ||||
-rw-r--r--[-rwxr-xr-x] | tools/h5ls/testh5ls.sh.in (renamed from tools/h5ls/testh5ls.sh) | 16 | ||||
-rw-r--r-- | tools/h5repack/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5stat/Makefile.in | 1 | ||||
-rw-r--r-- | tools/lib/Makefile.in | 1 | ||||
-rw-r--r-- | tools/misc/Makefile.in | 1 | ||||
-rw-r--r-- | tools/testfiles/tdataregbe.ls | 14 | ||||
-rw-r--r-- | tools/testfiles/tdataregle.ls (renamed from tools/testfiles/tdatareg.ls) | 0 | ||||
-rw-r--r-- | tools/testfiles/tvldtypes2be.ls | 22 | ||||
-rw-r--r-- | tools/testfiles/tvldtypes2le.ls | 22 |
17 files changed, 89 insertions, 6 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index b2cdc7c..52ece40 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -223,6 +223,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 3cefdc5..5928706 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -240,6 +240,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index fe8bf84..dc0b25c 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -247,6 +247,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 5aa15ea..1ecb430 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -245,6 +245,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index b8b5176..3cf4217 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -240,6 +240,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index fb28865..81425ec 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -251,6 +251,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index c2222a1..439ef07 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/config/commence.am INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts -TEST_SCRIPT=$(srcdir)/testh5ls.sh +TEST_SCRIPT=testh5ls.sh check_SCRIPTS=$(TEST_SCRIPT) SCRIPT_DEPEND=h5ls$(EXEEXT) diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index f4fc5e8..771bd20 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -50,7 +50,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/commence.am \ + $(srcdir)/testh5ls.sh.in $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude.am bin_PROGRAMS = h5ls$(EXEEXT) TESTS = $(check_SCRIPTS) @@ -61,7 +61,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/H5config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = testh5ls.sh am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) @@ -234,6 +234,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -338,7 +339,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts -TEST_SCRIPT = $(srcdir)/testh5ls.sh +TEST_SCRIPT = testh5ls.sh check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5ls$(EXEEXT) @@ -393,6 +394,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +testh5ls.sh: $(top_builddir)/config.status $(srcdir)/testh5ls.sh.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" diff --git a/tools/h5ls/testh5ls.sh b/tools/h5ls/testh5ls.sh.in index 8194bfb..ddb09b5 100755..100644 --- a/tools/h5ls/testh5ls.sh +++ b/tools/h5ls/testh5ls.sh.in @@ -22,6 +22,8 @@ CMP='cmp -s' DIFF='diff -c' NLINES=20 # Max. lines of output to display if test fails +WORDS_BIGENDIAN="@WORDS_BIGENDIAN@" + nerrors=0 verbose=yes @@ -174,10 +176,20 @@ TOOLTEST tattr2.ls 0 -w80 -v -S tattr2.h5 TOOLTEST nosuchfile.ls 0 nosuchfile.h5 # test for variable length data types in verbose mode -TOOLTEST tvldtypes2.ls 0 -v tvldtypes1.h5 +if test $WORDS_BIGENDIAN != "yes"; then + TOOLTEST tvldtypes2le.ls 0 -v tvldtypes1.h5 +else + TOOLTEST tvldtypes2be.ls 0 -v tvldtypes1.h5 +fi + # test for dataset region references data types in verbose mode -TOOLTEST tdatareg.ls 0 -v tdatareg.h5 +if test $WORDS_BIGENDIAN != "yes"; then + TOOLTEST tdataregle.ls 0 -v tdatareg.h5 +else + TOOLTEST tdataregbe.ls 0 -v tdatareg.h5 +fi + if test $nerrors -eq 0 ; then echo "All h5ls tests passed." diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 9f7c184..59b3668 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -254,6 +254,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 52c886b..67b1280 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -243,6 +243,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 721a393..b08c0a3 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -239,6 +239,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index b52ef09..e70a93f 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -258,6 +258,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/testfiles/tdataregbe.ls b/tools/testfiles/tdataregbe.ls new file mode 100644 index 0000000..47b6994 --- /dev/null +++ b/tools/testfiles/tdataregbe.ls @@ -0,0 +1,14 @@ +############################# + output for 'h5ls -v tdatareg.h5' +############################# +Opened "tdatareg.h5" with sec2 driver. +Dataset1 Dataset {4/4} + Location: 1:1284 + Links: 1 + Storage: information not available + Type: dataset region reference +Dataset2 Dataset {10/10, 10/10} + Location: 1:744 + Links: 1 + Storage: 100 logical bytes, 100 allocated bytes, 100.00% utilization + Type: native unsigned char diff --git a/tools/testfiles/tdatareg.ls b/tools/testfiles/tdataregle.ls index b07b274..b07b274 100644 --- a/tools/testfiles/tdatareg.ls +++ b/tools/testfiles/tdataregle.ls diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/testfiles/tvldtypes2be.ls new file mode 100644 index 0000000..ee84185 --- /dev/null +++ b/tools/testfiles/tvldtypes2be.ls @@ -0,0 +1,22 @@ +############################# + output for 'h5ls -v tvldtypes1.h5' +############################# +Opened "tvldtypes1.h5" with sec2 driver. +Dataset1.0 Dataset {4/4} + Location: 1:976 + Links: 1 + Storage: information not available + Type: variable length of + 32-bit little-endian integer +Dataset2.0 Dataset {4/4} + Location: 1:1576 + Links: 1 + Storage: information not available + Type: variable length of + IEEE 32-bit little-endian float +Dataset3.0 Dataset {SCALAR} + Location: 1:6272 + Links: 1 + Storage: information not available + Type: variable length of + 32-bit little-endian integer diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/testfiles/tvldtypes2le.ls new file mode 100644 index 0000000..62dfa61 --- /dev/null +++ b/tools/testfiles/tvldtypes2le.ls @@ -0,0 +1,22 @@ +############################# + output for 'h5ls -v tvldtypes1.h5' +############################# +Opened "tvldtypes1.h5" with sec2 driver. +Dataset1.0 Dataset {4/4} + Location: 1:976 + Links: 1 + Storage: information not available + Type: variable length of + native int +Dataset2.0 Dataset {4/4} + Location: 1:1576 + Links: 1 + Storage: information not available + Type: variable length of + native float +Dataset3.0 Dataset {SCALAR} + Location: 1:6272 + Links: 1 + Storage: information not available + Type: variable length of + native int |