summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-08-05 22:22:59 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-08-05 22:22:59 (GMT)
commit002b1494b79e2fd638a0676745c340a9a9e9d8e7 (patch)
tree9b98efcd614acd02fd3de309d5d9f1d12048230e /test
parent99506091b3a72fa05f364ea5fb2c51fad3b176ec (diff)
downloadhdf5-002b1494b79e2fd638a0676745c340a9a9e9d8e7.zip
hdf5-002b1494b79e2fd638a0676745c340a9a9e9d8e7.tar.gz
hdf5-002b1494b79e2fd638a0676745c340a9a9e9d8e7.tar.bz2
[svn-r569] Changes since 19980731
---------------------- ./bin/release Added ./Makefile to the distribution again -- it got lost in the changes last week although it isn't all that important a file since it gets clobbered by configure anyway. ./bin/trace ./doc/html/Filters.html ./doc/html/H5.format.html ./doc/html/H5.user.html ./src/H5.c ./src/H5D.c ./src/H5Dprivate.h ./src/H5E.c ./src/H5Epublic.h ./src/H5Farray.c ./src/H5Fistore.c ./src/H5Fprivate.h ./src/H5O.c ./src/H5Ocomp.c ./src/H5Oprivate.h ./src/H5P.c ./src/H5Ppublic.h ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Spoint.c ./src/H5Sprivate.h ./src/H5Ssimp.c ./src/H5Z.c ./src/H5Zprivate.h ./src/H5Zpublic.h ./src/hdf5.h ./test/dsets.c ./tools/h5ls.c Added the data filter pipeline, a generalization of the compression stuff which allows things like checksums, encryption, compression, performance monitoring, etc. See ./doc/html/Filters.html for details -- it replaces the Compression.html doc. ./src/H5T.c Cleaned up debugging output. ./config/linux Added checks for egcs and pgcc and changed optimization flags for the compilers. ./src/H5G.c ./tools/h5dump.c Fixed compiler warnings in these files and others. ./configure.in ./src/H5private.h ./test/mtime.c Added a check for difftime() and defined HDdifftime() to do something else on systems that don't have difftime().
Diffstat (limited to 'test')
-rw-r--r--test/.distdep3
-rw-r--r--test/dsets.c33
-rw-r--r--test/mtime.c4
3 files changed, 21 insertions, 19 deletions
diff --git a/test/.distdep b/test/.distdep
index 82aaa44..2b28ca4 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -492,4 +492,5 @@ mtime.o: \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
+ ../src/H5Tpublic.h \
+ ../src/H5private.h
diff --git a/test/dsets.c b/test/dsets.c
index 6ad7ee0..1a66600 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -40,7 +40,7 @@
#define DSET_COMPRESS_NAME "compressed"
#define DSET_BOGUS_NAME "bogus"
-#define H5Z_BOGUS 255
+#define H5Z_BOGUS 305
/*-------------------------------------------------------------------------
@@ -354,9 +354,9 @@ test_tconv(hid_t file)
/*-------------------------------------------------------------------------
* Function: bogus
*
- * Purpose: A bogus compression method.
+ * Purpose: A bogus compression method that doesn't do anything.
*
- * Return: Success: SRC_NBYTES, see compression documentation.
+ * Return: Success: Data chunk size
*
* Failure: 0
*
@@ -368,12 +368,11 @@ test_tconv(hid_t file)
*-------------------------------------------------------------------------
*/
static size_t
-bogus (unsigned int __unused__ flags, size_t __unused__ cd_size,
- const void __unused__ *client_data, size_t src_nbytes, const void *src,
- size_t __unused__ dst_nbytes, void *dst/*out*/)
+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)
{
- memcpy (dst, src, src_nbytes);
- return src_nbytes;
+ return nbytes;
}
@@ -586,7 +585,7 @@ test_compression(hid_t file)
points[hs_offset[0]+i][hs_offset[1]+j] = rand ();
}
}
- H5Sselect_hyperslab (space, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL);
+ H5Sselect_hyperslab(space, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL);
status = H5Dwrite (dataset, H5T_NATIVE_INT, space, space, xfer, points);
if (status<0) goto error;
@@ -603,8 +602,10 @@ test_compression(hid_t file)
printf(" At index %lu,%lu\n",
(unsigned long)(hs_offset[0]+i),
(unsigned long)(hs_offset[1]+j));
- printf(" At original: %d\n", (int)points[hs_offset[0]+i][hs_offset[1]+j]);
- printf(" At returned: %d\n", (int)check[hs_offset[0]+i][hs_offset[1]+j]);
+ printf(" At original: %d\n",
+ (int)points[hs_offset[0]+i][hs_offset[1]+j]);
+ printf(" At returned: %d\n",
+ (int)check[hs_offset[0]+i][hs_offset[1]+j]);
goto error;
}
}
@@ -619,11 +620,11 @@ test_compression(hid_t file)
printf ("%-70s", "Testing compression (app-defined method)");
fflush (stdout);
- H5Zregister (H5Z_BOGUS, "bogus", bogus, bogus);
- H5Pset_compression (dc, H5Z_BOGUS, 0, 0, NULL);
- H5Dclose (dataset);
- H5Sclose (space);
- space = H5Screate_simple (2, size, NULL);
+ if (H5Zregister (H5Z_BOGUS, "bogus", bogus)<0) goto error;
+ if (H5Pset_filter (dc, H5Z_BOGUS, 0, 0, NULL)<0) goto error;
+ if (H5Dclose (dataset)<0) goto error;
+ if (H5Sclose (space)<0) goto error;
+ if ((space = H5Screate_simple (2, size, NULL))<0) goto error;
dataset = H5Dcreate (file, DSET_BOGUS_NAME, H5T_NATIVE_INT, space, dc);
assert (dataset>=0);
diff --git a/test/mtime.c b/test/mtime.c
index cd78cc1..019ce26 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -20,7 +20,7 @@
#define TRUE 1
#define FILE_NAME_1 "mtime.h5"
-#include <H5config.h>
+#include <H5private.h>
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
@@ -130,7 +130,7 @@ main(void)
puts(" Modification times will be mantained in the file bug cannot");
puts(" be queried on this system. See H5O_mtime_decode().");
return 1;
- } else if (fabs(difftime(now, sb.mtime))>60.0) {
+ } else if (fabs(HDdifftime(now, sb.mtime))>60.0) {
puts("*FAILED*");
tm = localtime(&(sb.mtime));
strftime(buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);