mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1692 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

Browse Source 
* commit '8a4f679fda20577c4528977d0ee9a7e4c5bee055':
  Combine "collective group and dataset write" and "independent group and dataset read" tests into one test.  The second test is dependent on the file created by the first test, and will not pass when run by itself.
This commit is contained in:
Scot Breitenfeld 2019-05-03 17:09:11 -05:00
commit e0ff0e8dd5
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testpar/CMakeTests.cmake
View File

@ -33,8 +33,7 @@ set (SKIP_tests
ecdsetw ecdsetw
eidsetw2 eidsetw2
selnone selnone
cngrpw cngrpw-ingrpr
ingrpr
cschunkw cschunkw
ccchunkw ccchunkw
tldsc tldsc

7
testpar/t_mdset.c
View File

@ -838,6 +838,13 @@ void dataset_fillvalue(void)
HDfree(wdata); HDfree(wdata);
} }
/* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
void collective_group_write_independent_group_read(void)
{
collective_group_write();
independent_group_read();
}
/* Write multiple groups with a chunked dataset in each group collectively. /* Write multiple groups with a chunked dataset in each group collectively.
* These groups and datasets are for testing independent read later. * These groups and datasets are for testing independent read later.
* *

8
testpar/testphdf5.c
View File

@ -409,10 +409,10 @@ int main(int argc, char **argv)
collngroups_params.name = PARATESTFILE; collngroups_params.name = PARATESTFILE;
collngroups_params.count = ngroups; collngroups_params.count = ngroups;
AddTest("cngrpw", collective_group_write, NULL, /* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
"collective group and dataset write", &collngroups_params); AddTest("cngrpw-ingrpr", collective_group_write_independent_group_read, NULL,
AddTest("ingrpr", independent_group_read, NULL, "collective grp/dset write - independent grp/dset read",
"independent group and dataset read", &collngroups_params); &collngroups_params);
#ifndef H5_HAVE_WIN32_API #ifndef H5_HAVE_WIN32_API
AddTest("bigdset", big_dataset, NULL, AddTest("bigdset", big_dataset, NULL,
"big dataset test", PARATESTFILE); "big dataset test", PARATESTFILE);

1
testpar/testphdf5.h
View File

@ -240,6 +240,7 @@ void test_file_properties(void);
void multiple_dset_write(void); void multiple_dset_write(void);
void multiple_group_write(void); void multiple_group_write(void);
void multiple_group_read(void); void multiple_group_read(void);
void collective_group_write_independent_group_read(void);
void collective_group_write(void); void collective_group_write(void);
void independent_group_read(void); void independent_group_read(void);
void test_fapl_mpio_dup(void); void test_fapl_mpio_dup(void);