summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.in12
-rw-r--r--test/h5test.h2
-rw-r--r--test/set_extent.c81
3 files changed, 63 insertions, 32 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 45f3aa7..29f30d0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -523,6 +523,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
+WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -630,11 +631,12 @@ TRACE = perl $(top_srcdir)/bin/trace
CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
compact_dataset.h5 dataset.h5 dset_offset.h5 \
max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \
- huge_chunks.h5 extend.h5 istore.h5 extlinks*.h5 frspace.h5 \
- links*.h5 tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 \
- stab.h5 extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
- dt_arith[1-2] links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
- big.data big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
+ huge_chunks.h5 chunk_cache.h5 big_chunk.h5 extend.h5 istore.h5 \
+ extlinks*.h5 frspace.h5 links*.h5 tfile[1-4].h5 th5s[1-3].h5 \
+ lheap.h5 fheap.h5 ohdr.h5 stab.h5 extern_[1-3].h5 \
+ extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2] links.h5 \
+ links[0-6]*.h5 extlinks[0-15].h5 tmp big.data \
+ big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
unlink.h5 unicode.h5 coord.h5 fillval_[0-9].h5 fillval.raw \
mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
diff --git a/test/h5test.h b/test/h5test.h
index 64d43cc..e3b3596 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -99,7 +99,7 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
* the H5_FAILED() macro is invoked automatically when an API function fails.
*/
#define TESTING(WHAT) {printf("Testing %-62s",WHAT); fflush(stdout);}
-#define TESTING2(WHAT) {printf(" Testing %-62s",WHAT); fflush(stdout);}
+#define TESTING_2(WHAT) {printf(" Testing %-62s",WHAT); fflush(stdout);}
#define PASSED() {puts(" PASSED");fflush(stdout);}
#define H5_FAILED() {puts("*FAILED*");fflush(stdout);}
#define H5_WARNING() {puts("*WARNING*");fflush(stdout);}
diff --git a/test/set_extent.c b/test/set_extent.c
index 87ff91c..b4e61b4 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -46,12 +46,12 @@ const char *FILENAME[] = {
#define RANK1 1
#define RANK2 2
#define RANK3 3
-#define DIM0 4
-#define DIM1 4
-#define DIM2 4
-#define DIMS0 2
-#define DIMS1 2
-#define DIMS2 2
+#define DIM0 5
+#define DIM1 5
+#define DIM2 5
+#define DIMS0 3
+#define DIMS1 3
+#define DIMS2 3
#define DIME0 7
#define DIME1 7
#define DIME2 7
@@ -89,6 +89,7 @@ int main( void )
hid_t fapl; /* file access property list */
hid_t fapl2; /* file access property list w/latest format set */
hbool_t new_format; /* Whether to use the latest file format */
+ hbool_t chunk_cache; /* Whether to enable chunk caching */
int nerrors = 0;
h5_reset();
@@ -97,6 +98,9 @@ int main( void )
/* Copy the file access property list */
if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
+ /* Disable chunk caching on fapl2 */
+ if(H5Pset_cache(fapl2, 521, 0, 0, 0.) < 0) TEST_ERROR
+
/* Set the "use the latest version of the format" bounds for creating objects in the file */
if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
@@ -104,19 +108,44 @@ int main( void )
for(new_format = FALSE; new_format <= TRUE; new_format++) {
hid_t my_fapl;
- /* Set the FAPL for the type of format */
- if(new_format) {
- puts("Testing with new file format:");
- my_fapl = fapl2;
- } /* end if */
- else {
- puts("Testing with old file format:");
- my_fapl = fapl;
- } /* end else */
-
- nerrors += do_ranks( my_fapl ) < 0 ? 1 : 0;
- nerrors += test_external( my_fapl ) < 0 ? 1 : 0;
- nerrors += do_layouts( my_fapl ) < 0 ? 1 : 0;
+ /* Test chunked datasets with and without chunk cache */
+ for(chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) {
+ /* Output message about the type of format */
+ if(new_format)
+ printf("Testing with new file format");
+ else
+ printf("Testing with old file format");
+
+ /* Set the FAPL for the chunk cache settings */
+ if(chunk_cache) {
+ puts(" and chunk cache enabled:");
+ my_fapl = fapl;
+ } /* end if */
+ else {
+ puts(" and chunk cache disabled:");
+ my_fapl = fapl2;
+ } /* end else */
+
+ /* Set the FAPL for the type of format */
+ if(new_format) {
+ /* Set the "use the latest version of the format" bounds for
+ * creating objects in the file */
+ if(H5Pset_libver_bounds(my_fapl, H5F_LIBVER_LATEST,
+ H5F_LIBVER_LATEST) < 0) TEST_ERROR
+ } /* end if */
+ else
+ /* Set the "use the earliest version of the format" bounds for
+ * creating objects in the file */
+ if(H5Pset_libver_bounds(my_fapl, H5F_LIBVER_EARLIEST,
+ H5F_LIBVER_LATEST) < 0) TEST_ERROR
+
+ /* Tests which use chunked datasets */
+ nerrors += do_ranks( my_fapl ) < 0 ? 1 : 0;
+ } /* end for */
+
+ /* Tests which do not use chunked datasets */
+ nerrors += test_external( fapl ) < 0 ? 1 : 0;
+ nerrors += do_layouts( fapl ) < 0 ? 1 : 0;
} /* end for */
/* Close 2nd FAPL */
@@ -153,7 +182,7 @@ static int do_ranks( hid_t fapl )
hbool_t set_istore_k = 0;
- TESTING2("with fill value, no compression");
+ TESTING_2("with fill value, no compression");
do_fillvalue = 1;
@@ -187,7 +216,7 @@ static int do_ranks( hid_t fapl )
PASSED();
- TESTING2("no fill value, no compression");
+ TESTING_2("no fill value, no compression");
do_fillvalue = 0;
@@ -208,7 +237,7 @@ static int do_ranks( hid_t fapl )
PASSED();
- TESTING2("with fill value, with compression");
+ TESTING_2("with fill value, with compression");
#ifdef H5_HAVE_FILTER_DEFLATE
@@ -246,7 +275,7 @@ static int do_ranks( hid_t fapl )
SKIPPED();
#endif
- TESTING2("no fill value, with compression");
+ TESTING_2("no fill value, with compression");
#ifdef H5_HAVE_FILTER_DEFLATE
@@ -270,7 +299,7 @@ static int do_ranks( hid_t fapl )
SKIPPED();
#endif
- TESTING2("with non-default indexed storage B-tree");
+ TESTING_2("with non-default indexed storage B-tree");
do_fillvalue = 1;
set_istore_k = 1;
@@ -299,7 +328,7 @@ error:
static int do_layouts( hid_t fapl )
{
- TESTING2("storage layout use");
+ TESTING_2("storage layout use");
if (test_layouts( H5D_COMPACT, fapl ) < 0)
{
@@ -2080,7 +2109,7 @@ static int test_external( hid_t fapl )
}
}
- TESTING2("external file use");
+ TESTING_2("external file use");
/* create a new file */
h5_fixname(FILENAME[3], fapl, filename, sizeof filename);
generated by cgit v0.12 at 2024-12-29 08:57:03 (GMT)