diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-08-18 17:14:43 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-08-18 17:14:43 (GMT) |
commit | d27a31461c69001551b1168c3ca44b591f4cb82b (patch) | |
tree | bac2fc1ea06c6ab1052c0eab083c87769ac79c3f /test | |
parent | d9b9ed853d6b5d53935efad83d932f58ef0a5ac3 (diff) | |
download | hdf5-d27a31461c69001551b1168c3ca44b591f4cb82b.zip hdf5-d27a31461c69001551b1168c3ca44b591f4cb82b.tar.gz hdf5-d27a31461c69001551b1168c3ca44b591f4cb82b.tar.bz2 |
[svn-r601] Changes since 19980814
----------------------
./src/H5Fistore.c
Fixed a bug that caused the wrong number of chunk offsets to
be read or written from the file.
./src/H5Z.c
Fixed a memory bug.
./test/dtypes.c
Removed redundant tests.
./bin/snapshot
Removed Perl code from a shell script. Oops :-)
./src/H5D.c
Removed cvs merge conflicts.
./src/H5Omtime.c
Fixed a typo in the Irix5.3 code.
./src/H5S.c
Fixed a memory leak.
./src/H5Shyper.c
Fixed a bad call to malloc() that didn't allocate enough
memory. Reordered a comparison to eliminate an array bounds
read error.
Diffstat (limited to 'test')
-rw-r--r-- | test/.distdep | 160 | ||||
-rw-r--r-- | test/dsets.c | 26 | ||||
-rw-r--r-- | test/dtypes.c | 4 | ||||
-rw-r--r-- | test/links.c | 1 |
4 files changed, 106 insertions, 85 deletions
diff --git a/test/.distdep b/test/.distdep index 7881eb1..c16495f 100644 --- a/test/.distdep +++ b/test/.distdep @@ -178,13 +178,6 @@ th5s.o: \ ../src/H5Tpublic.h \ ../src/H5Zprivate.h \ ../src/H5Zpublic.h -hyperslab.o: \ - hyperslab.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5MMprivate.h \ - ../src/H5MMpublic.h istore.o: \ istore.c \ ../src/H5private.h \ @@ -213,8 +206,8 @@ istore.o: \ ../src/H5Sprivate.h \ ../src/H5Spublic.h \ ../src/H5Zprivate.h -dsets.o: \ - dsets.c \ +external.o: \ + external.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -235,8 +228,27 @@ dsets.o: \ ../src/H5Zpublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -extend.o: \ - extend.c \ +gheap.o: \ + gheap.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/H5Fprivate.h \ + ../src/H5Fpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Gprivate.h \ + ../src/H5Gpublic.h \ + ../src/H5Bprivate.h \ + ../src/H5Bpublic.h \ + ../src/H5HGprivate.h \ + ../src/H5HGpublic.h \ + ../src/H5Pprivate.h \ + ../src/H5Ppublic.h +shtype.o: \ + shtype.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -256,8 +268,24 @@ extend.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Spublic.h -external.o: \ - external.c \ +bittests.o: \ + bittests.c \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5HGpublic.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Fprivate.h \ + ../src/H5Fpublic.h \ + ../src/H5Ipublic.h \ + ../src/H5private.h \ + ../src/H5Dpublic.h \ + ../src/H5Tprivate.h \ + ../src/H5Tpublic.h \ + ../src/H5Gprivate.h \ + ../src/H5Gpublic.h +big.o: \ + big.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -277,28 +305,10 @@ external.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h -gheap.o: \ - gheap.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ - ../src/H5Ipublic.h \ - ../src/H5Fprivate.h \ - ../src/H5Fpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Gprivate.h \ - ../src/H5Gpublic.h \ - ../src/H5Bprivate.h \ - ../src/H5Bpublic.h \ - ../src/H5HGprivate.h \ - ../src/H5HGpublic.h \ - ../src/H5Pprivate.h \ - ../src/H5Ppublic.h -shtype.o: \ - shtype.c \ + ../src/H5Tpublic.h \ + ../src/H5private.h +chunk.o: \ + chunk.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -317,9 +327,10 @@ shtype.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h -links.o: \ - links.c \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +cmpd_dset.o: \ + cmpd_dset.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -338,26 +349,9 @@ links.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -bittests.o: \ - bittests.c \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5HGpublic.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Fprivate.h \ - ../src/H5Fpublic.h \ - ../src/H5Ipublic.h \ - ../src/H5private.h \ - ../src/H5Dpublic.h \ - ../src/H5Tprivate.h \ - ../src/H5Tpublic.h \ - ../src/H5Gprivate.h \ - ../src/H5Gpublic.h -mtime.o: \ - mtime.c \ + ../src/H5Spublic.h +iopipe.o: \ + iopipe.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -377,10 +371,16 @@ mtime.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h -big.o: \ - big.c \ + ../src/H5Tpublic.h +hyperslab.o: \ + hyperslab.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5MMprivate.h \ + ../src/H5MMpublic.h +extend.o: \ + extend.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -399,11 +399,9 @@ big.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h -dtypes.o: \ - dtypes.c \ + ../src/H5Spublic.h +mtime.o: \ + mtime.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -424,13 +422,9 @@ dtypes.o: \ ../src/H5Zpublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5Fprivate.h \ - ../src/H5private.h \ - ../src/H5Tprivate.h -chunk.o: \ - chunk.c \ + ../src/H5private.h +dsets.o: \ + dsets.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -451,8 +445,8 @@ chunk.o: \ ../src/H5Zpublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -cmpd_dset.o: \ - cmpd_dset.c \ +links.o: \ + links.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -471,9 +465,10 @@ cmpd_dset.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h -iopipe.o: \ - iopipe.c \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +dtypes.o: \ + dtypes.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -493,4 +488,9 @@ iopipe.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h + ../src/H5Tpublic.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5private.h \ + ../src/H5Tprivate.h diff --git a/test/dsets.c b/test/dsets.c index 1a66600..7171b18 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -372,6 +372,9 @@ bogus(unsigned int __unused__ flags, size_t __unused__ cd_nelmts, const unsigned int __unused__ cd_values[], size_t nbytes, size_t __unused__ *buf_size, void __unused__ **buf) { +#if 0 + abort(); +#endif return nbytes; } @@ -777,9 +780,11 @@ cleanup(void) int main(void) { - hid_t file, grp; - herr_t status; - int nerrors = 0; + hid_t file, grp, fapl; + herr_t status; + int nerrors=0, mdc_nelmts; + size_t rdcc_nbytes; + double rdcc_w0; status = H5open (); assert (status>=0); @@ -787,9 +792,22 @@ main(void) /* Automatic error reporting to standard output */ H5Eset_auto (display_error_cb, NULL); + /* Create the file */ + fapl = H5Pcreate(H5P_FILE_ACCESS); + assert(fapl>=0); + +#if 1 + /* Turn off raw data cache */ + status = H5Pget_cache(fapl, &mdc_nelmts, &rdcc_nbytes, &rdcc_w0); + assert(status>=0); + status = H5Pset_cache(fapl, mdc_nelmts, 0, rdcc_w0); + assert(status>=0); +#endif + file = H5Fcreate(TEST_FILE_NAME, H5F_ACC_TRUNC|H5F_ACC_DEBUG, - H5P_DEFAULT, H5P_DEFAULT); + H5P_DEFAULT, fapl); assert(file >= 0); + H5Pclose(fapl); /* Cause the library to emit initial messages */ grp = H5Gcreate (file, "emit diagnostics", 0); diff --git a/test/dtypes.c b/test/dtypes.c index 320d440..7c9ba00 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1666,11 +1666,13 @@ main(void) H5Tunregister(H5T_conv_float_double); H5Tunregister(H5T_conv_double_float); nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE); - nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE); nerrors += test_conv_flt_1("sw", H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT); +#ifdef USE_LDOUBLE + nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE); nerrors += test_conv_flt_1("sw", H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE); nerrors += test_conv_flt_1("sw", H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT); nerrors += test_conv_flt_1("sw", H5T_NATIVE_LDOUBLE, H5T_NATIVE_DOUBLE); +#endif if (nerrors) { printf("***** %lu FAILURE%s! *****\n", diff --git a/test/links.c b/test/links.c index 0a766c7..8fb55a3 100644 --- a/test/links.c +++ b/test/links.c @@ -9,6 +9,7 @@ */ #include <hdf5.h> #include <stdlib.h> +#include <string.h> #include <H5config.h> #ifndef HAVE_ATTRIBUTE |