diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-04-30 15:54:52 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-04-30 15:54:52 (GMT) |
commit | cc2184b6efd25633b8a27cb23d57380e2f28a5b4 (patch) | |
tree | 6b276ffc0f426d101a06c84d271e64e882fa66a9 /test | |
parent | 2be6b9f63c53e20add431b497a13929d2df049a8 (diff) | |
download | hdf5-cc2184b6efd25633b8a27cb23d57380e2f28a5b4.zip hdf5-cc2184b6efd25633b8a27cb23d57380e2f28a5b4.tar.gz hdf5-cc2184b6efd25633b8a27cb23d57380e2f28a5b4.tar.bz2 |
[svn-r1240] Changes since 19990427
----------------------
./tools/h5ls.c
Added a `--address' (`-a') switch which causes h5ls to display
file addresses for raw data. For contiguous datasets it's just
a nice simple number, but for chunked datasets it's a list of
logical dataset coordinates, file addresses, filter masks, and
storage sizes.
Changed `--dump' switch to `--data'.
./src/H5D.c
./src/H5F.c
./src/H5Fprivate.h
Enhanced the indexed-storage B-tree iterator so it can dump
raw data addresses (and other info) to the standard error
stream.
Added H5Ddebug() so h5ls has a way to dump addresses for
datasets. I'm not sure what else this API function should do,
so I think we should discuss it before we document it. So far,
h5ls is the only thing that uses it, and we can easily change
that.
./src/H5Tconv.c
./test/dtypes.c
Finally had a chance to verify Paul's H5T_conv_s_s (general
string to string conversions) bug fixes and incorporate them
into H5T_conv_f_f (general floating-point to floating-point
conversions) and H5T_conv_i_i (general integer to integer
conversons). Thanks Paul.
./src/H5D.c
./src/H5S.c
./src/H5Sprivate.h
Added performance timers around data space read and write
callbacks. They were already there for the gather/scatter
callbacks.
The timings for read/write callbacks are displayed along with
gather/scatter when data space debugging is turned on.
./bin/iostats
Updated to print totals. Added a `--fast' option that doesn't
do any output except the totals and is much faster.
./bin/trace
Changed __unused__ to UNUSED to match source code.
./config/gnu-flags
Updated error message for pgcc. I've sent bug reports to the
pgcc people but the new version still has the same bug.
./configure.in
./config/conclude.in
./config/depend.in
Fixed dependencies for non-GNU makes when run in a directory
other than the hdf5 source tree.
Updated GNU `make dep' rules to copy the distributed
dependencies for non-GNU makes into the source tree when run
in some other directory.
Diffstat (limited to 'test')
-rw-r--r-- | test/.distdep | 66 | ||||
-rw-r--r-- | test/dtypes.c | 54 |
2 files changed, 87 insertions, 33 deletions
diff --git a/test/.distdep b/test/.distdep index 8e28539..b3c51d3 100644 --- a/test/.distdep +++ b/test/.distdep @@ -1,4 +1,4 @@ -h5test.o: \ +h5test.lo: \ h5test.c \ h5test.h \ ../src/hdf5.h \ @@ -30,7 +30,7 @@ h5test.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -big.o: \ +big.lo: \ big.c \ h5test.h \ ../src/hdf5.h \ @@ -62,7 +62,7 @@ big.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -bittests.o: \ +bittests.lo: \ bittests.c \ h5test.h \ ../src/hdf5.h \ @@ -94,7 +94,7 @@ bittests.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -chunk.o: \ +chunk.lo: \ chunk.c \ ../src/hdf5.h \ ../src/H5public.h \ @@ -119,7 +119,7 @@ chunk.o: \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -cmpd_dset.o: \ +cmpd_dset.lo: \ cmpd_dset.c \ h5test.h \ ../src/hdf5.h \ @@ -151,7 +151,7 @@ cmpd_dset.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -dsets.o: \ +dsets.lo: \ dsets.c \ h5test.h \ ../src/hdf5.h \ @@ -183,7 +183,7 @@ dsets.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -dtypes.o: \ +dtypes.lo: \ dtypes.c \ h5test.h \ ../src/hdf5.h \ @@ -215,7 +215,7 @@ dtypes.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -extend.o: \ +extend.lo: \ extend.c \ h5test.h \ ../src/hdf5.h \ @@ -247,7 +247,7 @@ extend.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -external.o: \ +external.lo: \ external.c \ h5test.h \ ../src/hdf5.h \ @@ -279,7 +279,7 @@ external.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -fillval.o: \ +fillval.lo: \ fillval.c \ h5test.h \ ../src/hdf5.h \ @@ -311,7 +311,7 @@ fillval.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -flush1.o: \ +flush1.lo: \ flush1.c \ h5test.h \ ../src/hdf5.h \ @@ -343,7 +343,7 @@ flush1.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -flush2.o: \ +flush2.lo: \ flush2.c \ h5test.h \ ../src/hdf5.h \ @@ -375,7 +375,7 @@ flush2.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -gheap.o: \ +gheap.lo: \ gheap.c \ h5test.h \ ../src/hdf5.h \ @@ -410,7 +410,7 @@ gheap.o: \ ../src/H5Gprivate.h \ ../src/H5Bprivate.h \ ../src/H5Eprivate.h -hyperslab.o: \ +hyperslab.lo: \ hyperslab.c \ ../src/H5private.h \ ../src/H5public.h \ @@ -418,7 +418,7 @@ hyperslab.o: \ ../src/H5api_adpt.h \ ../src/H5MMprivate.h \ ../src/H5MMpublic.h -iopipe.o: \ +iopipe.lo: \ iopipe.c \ ../src/hdf5.h \ ../src/H5public.h \ @@ -443,7 +443,7 @@ iopipe.o: \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -istore.o: \ +istore.lo: \ istore.c \ h5test.h \ ../src/hdf5.h \ @@ -484,7 +484,7 @@ istore.o: \ ../src/H5Iprivate.h \ ../src/H5Pprivate.h \ ../src/H5MMprivate.h -lheap.o: \ +lheap.lo: \ lheap.c \ h5test.h \ ../src/hdf5.h \ @@ -519,7 +519,7 @@ lheap.o: \ ../src/H5Gprivate.h \ ../src/H5Bprivate.h \ ../src/H5HLprivate.h -links.o: \ +links.lo: \ links.c \ h5test.h \ ../src/hdf5.h \ @@ -551,7 +551,7 @@ links.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -mount.o: \ +mount.lo: \ mount.c \ h5test.h \ ../src/hdf5.h \ @@ -583,7 +583,7 @@ mount.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -mtime.o: \ +mtime.lo: \ mtime.c \ h5test.h \ ../src/hdf5.h \ @@ -615,7 +615,7 @@ mtime.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -ohdr.o: \ +ohdr.lo: \ ohdr.c \ h5test.h \ ../src/hdf5.h \ @@ -653,7 +653,7 @@ ohdr.o: \ ../src/H5Oprivate.h \ ../src/H5Sprivate.h \ ../src/H5Zprivate.h -overhead.o: \ +overhead.lo: \ overhead.c \ ../src/hdf5.h \ ../src/H5public.h \ @@ -678,7 +678,7 @@ overhead.o: \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -ragged.o: \ +ragged.lo: \ ragged.c \ ../src/hdf5.h \ ../src/H5public.h \ @@ -704,7 +704,7 @@ ragged.o: \ ../src/H5Spublic.h \ ../src/H5Tpublic.h \ ../src/H5private.h -stab.o: \ +stab.lo: \ stab.c \ h5test.h \ ../src/hdf5.h \ @@ -739,7 +739,7 @@ stab.o: \ ../src/H5Gprivate.h \ ../src/H5Bprivate.h \ ../src/H5Gpkg.h -tattr.o: \ +tattr.lo: \ tattr.c \ testhdf5.h \ ../src/H5private.h \ @@ -766,7 +766,7 @@ tattr.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h -testhdf5.o: \ +testhdf5.lo: \ testhdf5.c \ testhdf5.h \ ../src/H5private.h \ @@ -775,7 +775,7 @@ testhdf5.o: \ ../src/H5api_adpt.h \ ../src/H5Eprivate.h \ ../src/H5Epublic.h -tfile.o: \ +tfile.lo: \ tfile.c \ testhdf5.h \ ../src/H5private.h \ @@ -790,7 +790,7 @@ tfile.o: \ ../src/H5Fprivate.h \ ../src/H5Fpublic.h \ ../src/H5Dpublic.h -th5s.o: \ +th5s.lo: \ th5s.c \ testhdf5.h \ ../src/H5private.h \ @@ -817,7 +817,7 @@ th5s.o: \ ../src/H5Tpublic.h \ ../src/H5Zprivate.h \ ../src/H5Zpublic.h -tmeta.o: \ +tmeta.lo: \ tmeta.c \ testhdf5.h \ ../src/H5private.h \ @@ -829,7 +829,7 @@ tmeta.o: \ ../src/H5Ipublic.h \ ../src/H5Fprivate.h \ ../src/H5Fpublic.h -trefer.o: \ +trefer.lo: \ trefer.c \ testhdf5.h \ ../src/H5private.h \ @@ -856,7 +856,7 @@ trefer.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h -tselect.o: \ +tselect.lo: \ tselect.c \ testhdf5.h \ ../src/H5private.h \ @@ -883,7 +883,7 @@ tselect.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h -unlink.o: \ +unlink.lo: \ unlink.c \ h5test.h \ ../src/hdf5.h \ @@ -915,7 +915,7 @@ unlink.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h -enum.o: \ +enum.lo: \ enum.c \ h5test.h \ ../src/hdf5.h \ diff --git a/test/dtypes.c b/test/dtypes.c index 0e164c7..1565888 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -2265,6 +2265,59 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) /*------------------------------------------------------------------------- + * Function: test_conv_int_2 + * + * Purpose: Tests overlap calculates in H5T_conv_i_i(), which should be + * the same as for H5T_conv_f_f() and H5T_conv_s_s(). + * + * Return: Success: 0 + * + * Failure: number of errors + * + * Programmer: Robb Matzke + * Friday, April 30, 1999 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +static int +test_conv_int_2(void) +{ + int i, j; + hid_t src_type, dst_type; + char buf[32*100]; + + printf("%-70s", "Testing overlap calculations"); + fflush(stdout); + + memset(buf, 0, sizeof buf); + for (i=1; i<=32; i++) { + for (j=1; j<=32; j++) { + + /* Source type */ + src_type = H5Tcopy(H5T_NATIVE_CHAR); + H5Tset_size(src_type, i); + + /* Destination type */ + dst_type = H5Tcopy(H5T_NATIVE_CHAR); + H5Tset_size(dst_type, j); + + /* + * Conversion. If overlap calculations aren't right then an + * assertion will fail in H5T_conv_i_i() + */ + H5Tconvert(src_type, dst_type, 100, buf, NULL); + H5Tclose(src_type); + H5Tclose(dst_type); + } + } + PASSED(); + return 0; +} + + +/*------------------------------------------------------------------------- * Function: my_isnan * * Purpose: Determines whether VAL points to NaN. @@ -2984,6 +3037,7 @@ main(void) reset_hdf5(); /* Test software integer conversion functions */ + nerrors += test_conv_int_2(); nerrors += run_integer_tests("sw"); /* Test software floating-point conversion functions */ |