summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-08-23 16:19:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-08-23 16:19:05 (GMT)
commit1b647b18fee735086616bf99e1879e47bab0c72e (patch)
treee793c2c68a83feffbf7791a8c99ffa631c0ba60c
parentb901326501d62a4ef8dc2b33568be95c0b493531 (diff)
parent678c3ae1535b9b3b9faa53bc48250f1635778dd7 (diff)
downloadhdf5-1b647b18fee735086616bf99e1879e47bab0c72e.zip
hdf5-1b647b18fee735086616bf99e1879e47bab0c72e.tar.gz
hdf5-1b647b18fee735086616bf99e1879e47bab0c72e.tar.bz2
Merge pull request #639 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '678c3ae1535b9b3b9faa53bc48250f1635778dd7': HDFFV-10188 force non-native type description HDFFV-10188 emu insists on printing non-native description
-rw-r--r--tools/test/h5ls/CMakeTests.cmake2
-rw-r--r--tools/test/h5ls/testh5ls.sh.in2
-rw-r--r--tools/testfiles/tgrpnullspace.ls2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake
index 62ee835..a04a4b6 100644
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@@ -420,7 +420,7 @@
ADD_H5_TEST (tempty 0 -w80 -d tempty.h5)
# test for displaying dataset and attribute of null space
- ADD_H5_TEST (tgrpnullspace 0 -w80 -v tgrpnullspace.h5)
+ ADD_H5_TEST (tgrpnullspace 0 -w80 -v -S tgrpnullspace.h5)
# test for all dataset types written to attributes
# enable -S for avoiding printing NATIVE types
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index 6259af8..8c6551b 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -395,7 +395,7 @@ TOOLTEST tarray1.ls 0 -w80 -r -d tarray1.h5
TOOLTEST tempty.ls 0 -w80 -d tempty.h5
# test for displaying dataset and attribute of null space
-TOOLTEST tgrpnullspace.ls 0 -w80 -v tgrpnullspace.h5
+TOOLTEST tgrpnullspace.ls 0 -w80 -v -S tgrpnullspace.h5
# test for all dataset types written to attributes
# enable -S for avoiding printing NATIVE types
diff --git a/tools/testfiles/tgrpnullspace.ls b/tools/testfiles/tgrpnullspace.ls
index b1a1223..439414c 100644
--- a/tools/testfiles/tgrpnullspace.ls
+++ b/tools/testfiles/tgrpnullspace.ls
@@ -1,7 +1,7 @@
Opened "tgrpnullspace.h5" with sec2 driver.
g1 Group
Attribute: attr null
- Type: native unsigned int
+ Type: 32-bit little-endian unsigned integer
Location: 1:800
Links: 1