diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-29 22:14:42 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-29 22:14:42 (GMT) |
commit | 2a07e56c0522aa3ff86005ad923b9bd96c05689e (patch) | |
tree | 054ade86c41c7f763fee67c2ae9b7551e9dbad67 /tools/h5diff | |
parent | a7372ec352b6485a466157e70929cc5f0973fba8 (diff) | |
download | hdf5-2a07e56c0522aa3ff86005ad923b9bd96c05689e.zip hdf5-2a07e56c0522aa3ff86005ad923b9bd96c05689e.tar.gz hdf5-2a07e56c0522aa3ff86005ad923b9bd96c05689e.tar.bz2 |
[svn-r17263] Description:
Bring r17244:17262 from trunk to revise_chunks branch
Tested on:
Mac OS X/32 10.5.7 (amazon) w/debug & production
FreeBSD/32 6.3 (duty) w/debug
h5committest not needed on this branch
Diffstat (limited to 'tools/h5diff')
-rw-r--r-- | tools/h5diff/h5diffgentest.c | 17 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_17.txt | 4 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_171.txt | 2 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_172.txt | 2 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_basic1.h5 | bin | 9664 -> 11432 bytes | |||
-rwxr-xr-x | tools/h5diff/testh5diff.sh | 8 |
6 files changed, 33 insertions, 0 deletions
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index 95b28ee..cae79b6 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -331,7 +331,24 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3) write_dset(gid1,1,dims1,"fp17",H5T_NATIVE_DOUBLE,data17); write_dset(gid1,1,dims1,"fp18",H5T_NATIVE_DOUBLE,data18); + } + + /*------------------------------------------------------------------------ + * INFINITY values + *------------------------------------------------------------------------ + */ + { + float data19[6]; + double data20[6]; + + data19[0] = data19[1] = data19[2] = log(0); + data19[3] = data19[4] = data19[5] = -log(0); + + data20[0] = data20[1] = data20[2] = log(0); + data20[3] = data20[4] = data20[5] = -log(0); + write_dset(gid1,1,dims1,"fp19",H5T_NATIVE_FLOAT,data19); + write_dset(gid1,1,dims1,"fp20",H5T_NATIVE_DOUBLE,data20); } /*------------------------------------------------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt index ac04bd4..dce5ef5 100644 --- a/tools/h5diff/testfiles/h5diff_17.txt +++ b/tools/h5diff/testfiles/h5diff_17.txt @@ -7,6 +7,8 @@ file1 file2 x /g1/d2 x x /g1/dset1 x /g1/dset10 + x /g1/dset11 + x /g1/dset12 x /g1/dset2 x /g1/dset3 x /g1/dset4 @@ -20,7 +22,9 @@ file1 file2 x /g1/fp16 x /g1/fp17 x /g1/fp18 + x /g1/fp19 x /g1/fp2 + x /g1/fp20 x /g1/ld x /g2 x /g2/dset1 diff --git a/tools/h5diff/testfiles/h5diff_171.txt b/tools/h5diff/testfiles/h5diff_171.txt new file mode 100644 index 0000000..7ee0711 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_171.txt @@ -0,0 +1,2 @@ +dataset: </g1/fp19> and </g1/fp19> +0 differences found diff --git a/tools/h5diff/testfiles/h5diff_172.txt b/tools/h5diff/testfiles/h5diff_172.txt new file mode 100644 index 0000000..e2d1b7d --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_172.txt @@ -0,0 +1,2 @@ +dataset: </g1/fp20> and </g1/fp20> +0 differences found diff --git a/tools/h5diff/testfiles/h5diff_basic1.h5 b/tools/h5diff/testfiles/h5diff_basic1.h5 Binary files differindex 227c934..4ed83c8 100644 --- a/tools/h5diff/testfiles/h5diff_basic1.h5 +++ b/tools/h5diff/testfiles/h5diff_basic1.h5 diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index d641255..4167243 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -326,6 +326,14 @@ TOOLTEST h5diff_16_3.txt -v -p 0.02 $FILE1 $FILE1 g1/dset9 g1/dset10 TESTING $H5DIFF -v $SRCFILE1 $SRCFILE2 TOOLTEST h5diff_17.txt -v $FILE1 $FILE2 +# 1.8 test 32-bit INFINITY +TESTING $H5DIFF $SRCFILE1 $SRCFILE1 /g1/fp19 +TOOLTEST h5diff_171.txt -v $SRCFILE1 $SRCFILE1 /g1/fp19 + +# 1.8 test 64-bit INFINITY +TESTING $H5DIFF $SRCFILE1 $SRCFILE1 /g1/fp20 +TOOLTEST h5diff_172.txt -v $SRCFILE1 $SRCFILE1 /g1/fp20 + # 1.8 quiet mode TESTING $H5DIFF -q $SRCFILE1 $SRCFILE2 TOOLTEST h5diff_18.txt -q $FILE1 $FILE2 |