mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r27420] Fixed VDS test to handle the family driver correctly.

Browse Source 
Tested: ummon
This commit is contained in:
Neil Fortner 2015-07-21 12:14:26 -05:00
parent 99a90f7fd6
commit a8fc7eeaec
3 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/h5test.c
View File

@ -93,7 +93,7 @@ static const char *multi_letters = "msbrglo";
static herr_t h5_errors(hid_t estack, void *client_data);
static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix,
char *fullname, size_t size);
char *fullname, size_t size, hbool_t nest_printf);
/*-------------------------------------------------------------------------
@ -295,7 +295,7 @@ h5_reset(void)
char *
h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
{
return (h5_fixname_real(base_name, fapl, ".h5", fullname, size));
return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, FALSE));
}
@ -315,7 +315,33 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
char *
h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size)
{
return (h5_fixname_real(base_name, fapl, NULL, fullname, size));
return (h5_fixname_real(base_name, fapl, NULL, fullname, size, FALSE));
}
/*-------------------------------------------------------------------------
* Function: h5_fixname_printf
*
* Purpose: Same as h5_fixname but returns a filename that can be passed
* through a printf-style function once before being passed to the file
* driver. Basically, replaces all % characters used by the file
* driver with %%.
*
* Return: Success: The FULLNAME pointer.
*
* Failure: NULL if BASENAME or FULLNAME is the null
* pointer or if FULLNAME isn't large enough for
* the result.
*
* Programmer: Neil Fortner
* Wednesday, July 15, 2015
*
*-------------------------------------------------------------------------
*/
char *
h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size)
{
return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, TRUE));
}
@ -343,7 +369,7 @@ h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t s
*/
static char *
h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
char *fullname, size_t size)
char *fullname, size_t size, hbool_t nest_printf)
{
const char *prefix = NULL;
char *ptr, last = '\0';
@ -364,7 +390,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
if(suffix) {
if(H5FD_FAMILY == driver)
suffix = "%05d.h5";
suffix = nest_printf ? "%%05d.h5" : "%05d.h5";
else if (H5FD_MULTI == driver)
suffix = NULL;
}

1
test/h5test.h
View File

@ -127,6 +127,7 @@ H5TEST_DLL int h5_cleanup(const char *base_name[], hid_t fapl);
H5TEST_DLL void h5_cleanup_files(const char *base_name[], hid_t fapl);
H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size);
H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size);
H5TEST_DLL char *h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size);
H5TEST_DLL hid_t h5_fileaccess(void);
H5TEST_DLL void h5_no_hwconv(void);
H5TEST_DLL const char *h5_rmprefix(const char *filename);

86
test/vds.c
View File

@ -994,11 +994,12 @@ static int
test_basic_io(unsigned config, hid_t fapl)
{
char srcfilename[FILENAME_BUF_SIZE];
char srcfilename_map[FILENAME_BUF_SIZE];
char vfilename[FILENAME_BUF_SIZE];
char vfilename2[FILENAME_BUF_SIZE];
char srcfilenamepct[FILENAME_BUF_SIZE];
char srcfilenamepct_fmt_fix[FILENAME_BUF_SIZE];
const char *srcfilenamepct_fmt = "vds%%_src";
char srcfilenamepct_map[FILENAME_BUF_SIZE];
const char *srcfilenamepct_map_orig = "vds%%_src";
hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */
hid_t vfile = -1; /* File with virtual dset */
hid_t vfile2 = -1; /* File with copied virtual dset */
@ -1026,8 +1027,9 @@ test_basic_io(unsigned config, hid_t fapl)
h5_fixname(FILENAME[0], fapl, vfilename, sizeof vfilename);
h5_fixname(FILENAME[1], fapl, vfilename2, sizeof vfilename2);
h5_fixname(FILENAME[2], fapl, srcfilename, sizeof srcfilename);
h5_fixname_printf(FILENAME[2], fapl, srcfilename_map, sizeof srcfilename_map);
h5_fixname(FILENAME[4], fapl, srcfilenamepct, sizeof srcfilenamepct);
h5_fixname(srcfilenamepct_fmt, fapl, srcfilenamepct_fmt_fix, sizeof srcfilenamepct_fmt_fix);
h5_fixname_printf(srcfilenamepct_map_orig, fapl, srcfilenamepct_map, sizeof srcfilenamepct_map);
/* Create DCPL */
if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@ -1055,7 +1057,7 @@ test_basic_io(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mapping */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset", srcspace[0]) < 0)
TEST_ERROR
/* Create virtual file */
@ -1212,9 +1214,9 @@ test_basic_io(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "%%src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "%%src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset2%%", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2%%", srcspace[0]) < 0)
TEST_ERROR
/* Reset dims */
@ -1547,9 +1549,9 @@ test_basic_io(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_fmt_fix : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_fmt_fix : ".", "src_dset2", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".", "src_dset2", srcspace[0]) < 0)
TEST_ERROR
/* Reset dims */
@ -1758,9 +1760,9 @@ test_basic_io(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset2", srcspace[1]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2", srcspace[1]) < 0)
TEST_ERROR
/* Create virtual file */
@ -2066,9 +2068,9 @@ test_basic_io(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset2", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2", srcspace[0]) < 0)
TEST_ERROR
/* Create virtual file */
@ -2407,9 +2409,9 @@ test_basic_io(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[1]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[1]) < 0)
TEST_ERROR
/* Create virtual file */
@ -2970,6 +2972,7 @@ static int
test_unlim(unsigned config, hid_t fapl)
{
char srcfilename[FILENAME_BUF_SIZE];
char srcfilename_map[FILENAME_BUF_SIZE];
char vfilename[FILENAME_BUF_SIZE];
hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */
hid_t vfile = -1; /* File with virtual dset */
@ -3000,6 +3003,7 @@ test_unlim(unsigned config, hid_t fapl)
h5_fixname(FILENAME[0], fapl, vfilename, sizeof vfilename);
h5_fixname(FILENAME[2], fapl, srcfilename, sizeof srcfilename);
h5_fixname_printf(FILENAME[2], fapl, srcfilename_map, sizeof srcfilename_map);
/* Create DCPLs */
if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@ -3060,9 +3064,9 @@ test_unlim(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset2", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2", srcspace[0]) < 0)
TEST_ERROR
/* Create virtual file */
@ -3730,9 +3734,9 @@ test_unlim(unsigned config, hid_t fapl)
start[1] = 0;
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset2", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2", srcspace[0]) < 0)
TEST_ERROR
/* Create virtual file */
@ -4416,11 +4420,11 @@ test_unlim(unsigned config, hid_t fapl)
start[1] = 0;
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset1", srcspace[0]) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset1", srcspace[0]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset2", srcspace[1]) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset2", srcspace[1]) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[2], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset3", srcspace[2]) < 0)
if(H5Pset_virtual(dcpl, vspace[2], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset3", srcspace[2]) < 0)
TEST_ERROR
/* Create virtual file */
@ -5340,13 +5344,15 @@ static int
test_printf(unsigned config, hid_t fapl)
{
char srcfilename[FILENAME_BUF_SIZE];
char srcfilename_map[FILENAME_BUF_SIZE];
char srcfilename2[FILENAME_BUF_SIZE];
char srcfilename2_map[FILENAME_BUF_SIZE];
char vfilename[FILENAME_BUF_SIZE];
char printf_srcfilename[FILENAME_BUF_SIZE];
const char *printf_srcfilename_fmt = "vds_src_%b";
char printf_srcfilename_map[FILENAME_BUF_SIZE];
const char *printf_srcfilename_map_orig = "vds_src_%b";
char srcfilenamepct[FILENAME_BUF_SIZE];
char srcfilenamepct_fmt_fix[FILENAME_BUF_SIZE];
const char *srcfilenamepct_fmt = "vds%%_src";
char srcfilenamepct_map[FILENAME_BUF_SIZE];
const char *srcfilenamepct_map_orig = "vds%%_src";
hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */
hid_t vfile = -1; /* File with virtual dset */
hid_t dcpl = -1; /* Dataset creation property list */
@ -5374,10 +5380,12 @@ test_printf(unsigned config, hid_t fapl)
h5_fixname(FILENAME[0], fapl, vfilename, sizeof vfilename);
h5_fixname(FILENAME[2], fapl, srcfilename, sizeof srcfilename);
h5_fixname_printf(FILENAME[2], fapl, srcfilename_map, sizeof srcfilename_map);
h5_fixname(FILENAME[3], fapl, srcfilename2, sizeof srcfilename2);
h5_fixname(printf_srcfilename_fmt, fapl, printf_srcfilename, sizeof printf_srcfilename);
h5_fixname_printf(FILENAME[2], fapl, srcfilename2_map, sizeof srcfilename2_map);
h5_fixname_printf(printf_srcfilename_map_orig, fapl, printf_srcfilename_map, sizeof printf_srcfilename_map);
h5_fixname(FILENAME[4], fapl, srcfilenamepct, sizeof srcfilenamepct);
h5_fixname(srcfilenamepct_fmt, fapl, srcfilenamepct_fmt_fix, sizeof srcfilenamepct_fmt_fix);
h5_fixname_printf(srcfilenamepct_map_orig, fapl, srcfilenamepct_map, sizeof srcfilenamepct_map);
/* Create DCPL */
if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@ -5423,7 +5431,7 @@ test_printf(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mapping */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset%b", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset%b", srcspace) < 0)
TEST_ERROR
/* Create virtual file */
@ -5811,7 +5819,7 @@ test_printf(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mapping */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_fmt_fix : ".", "src_dset%b", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilenamepct_map : ".", "src_dset%b", srcspace) < 0)
TEST_ERROR
/* Create virtual file */
@ -6066,7 +6074,7 @@ test_printf(unsigned config, hid_t fapl)
* config option specified */
if(H5Dclose(vdset) < 0)
TEST_ERROR
if(H5Pset_virtual_printf_gap(dapl, (size_t)1) < 0)
if(H5Pset_virtual_printf_gap(dapl, (hsize_t)1) < 0)
TEST_ERROR
if(config & TEST_IO_REOPEN_VIRT) {
if(H5Fclose(vfile) < 0)
@ -6130,7 +6138,7 @@ test_printf(unsigned config, hid_t fapl)
* config option specified */
if(H5Dclose(vdset) < 0)
TEST_ERROR
if(H5Pset_virtual_printf_gap(dapl, (size_t)2) < 0)
if(H5Pset_virtual_printf_gap(dapl, (hsize_t)2) < 0)
TEST_ERROR
if(config & TEST_IO_REOPEN_VIRT) {
if(H5Fclose(vfile) < 0)
@ -6194,7 +6202,7 @@ test_printf(unsigned config, hid_t fapl)
* config option specified */
if(H5Dclose(vdset) < 0)
TEST_ERROR
if(H5Pset_virtual_printf_gap(dapl, (size_t)3) < 0)
if(H5Pset_virtual_printf_gap(dapl, (hsize_t)3) < 0)
TEST_ERROR
if(config & TEST_IO_REOPEN_VIRT) {
if(H5Fclose(vfile) < 0)
@ -6258,7 +6266,7 @@ test_printf(unsigned config, hid_t fapl)
* config option specified */
if(H5Dclose(vdset) < 0)
TEST_ERROR
if(H5Pset_virtual_printf_gap(dapl, (size_t)4) < 0)
if(H5Pset_virtual_printf_gap(dapl, (hsize_t)4) < 0)
TEST_ERROR
if(config & TEST_IO_REOPEN_VIRT) {
if(H5Fclose(vfile) < 0)
@ -6452,7 +6460,7 @@ test_printf(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mapping */
if(H5Pset_virtual(dcpl, vspace[0], printf_srcfilename, "src_dset", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[0], printf_srcfilename_map, "src_dset", srcspace) < 0)
TEST_ERROR
/* Create virtual file */
@ -6762,7 +6770,7 @@ test_printf(unsigned config, hid_t fapl)
TEST_ERROR
/* Add virtual layout mapping */
if(H5Pset_virtual(dcpl, vspace[0], printf_srcfilename, "%%src%%_dset%%%b", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[0], printf_srcfilename_map, "%%src%%_dset%%%b", srcspace) < 0)
TEST_ERROR
/* Create virtual file */
@ -7084,9 +7092,9 @@ test_printf(unsigned config, hid_t fapl)
start[1] = 0;
/* Add virtual layout mappings */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "%bsrc_dset_a%b%%", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "%bsrc_dset_a%b%%", srcspace) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset_b%b%%%%", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset_b%b%%%%", srcspace) < 0)
TEST_ERROR
/* Create virtual file */
@ -7754,11 +7762,11 @@ test_printf(unsigned config, hid_t fapl)
/* Add virtual layout mappings (select ALL in source space for second
* mapping) */
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset_a%b", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[0], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset_a%b", srcspace) < 0)
TEST_ERROR
if(H5Sselect_all(srcspace) < 0)
TEST_ERROR
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename : ".", "src_dset_b%b", srcspace) < 0)
if(H5Pset_virtual(dcpl, vspace[1], config & TEST_IO_DIFFERENT_FILE ? srcfilename_map : ".", "src_dset_b%b", srcspace) < 0)
TEST_ERROR
/* Create virtual file */