summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
Diffstat (limited to 'testpar')
-rw-r--r--testpar/testphdf5.c94
1 files changed, 45 insertions, 49 deletions
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 815c21c..dbe3ecc 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -38,22 +38,16 @@ void *old_client_data; /* previous error handler arg.*/
/* other option flags */
-/* FILENAME and filenames must have the same number of names */
-const char *FILENAME[13]={
- "ParaEg1",
- "ParaEg2",
- "ParaEg3",
- "ParaMdset",
- "ParaMgroup",
- "ParaCompact",
- "ParaIndividual",
- "ParaBig",
- "ParaFill",
- "ParaCC",
- "ParaNull",
- "ModeConfusion",
+/* FILENAME and filenames must have the same number of names.
+ * Use PARATESTFILE in general and use a separated filename only if the file
+ * created in one test is accessed by a different test.
+ * FILENAME[0] is reserved as the file name for PARATESTFILE.
+ */
+#define PARATESTFILE filenames[0]
+const char *FILENAME[2]={
+ "ParaTest",
NULL};
-char filenames[13][PATH_MAX];
+char filenames[2][PATH_MAX];
hid_t fapl; /* file access property list */
#ifdef USE_PAUSE
@@ -363,44 +357,46 @@ int main(int argc, char **argv)
AddTest("posixdup", test_fapl_mpiposix_dup, NULL,
"fapl_mpiposix duplicate", NULL);
- ndsets_params.name = filenames[3];
+ AddTest("split", test_split_comm_access, NULL,
+ "dataset using split communicators", PARATESTFILE);
+
+ AddTest("idsetw", dataset_writeInd, NULL,
+ "dataset independent write", PARATESTFILE);
+ AddTest("idsetr", dataset_readInd, NULL,
+ "dataset independent read", PARATESTFILE);
+
+ AddTest("cdsetw", dataset_writeAll, NULL,
+ "dataset collective write", PARATESTFILE);
+ AddTest("cdsetr", dataset_readAll, NULL,
+ "dataset collective read", PARATESTFILE);
+
+ AddTest("eidsetw", extend_writeInd, NULL,
+ "extendible dataset independent write", PARATESTFILE);
+ AddTest("eidsetr", extend_readInd, NULL,
+ "extendible dataset independent read", PARATESTFILE);
+ AddTest("ecdsetw", extend_writeAll, NULL,
+ "extendible dataset collective write", PARATESTFILE);
+ AddTest("ecdsetr", extend_readAll, NULL,
+ "extendible dataset collective read", PARATESTFILE);
+ AddTest("eidsetw2", extend_writeInd2, NULL,
+ "extendible dataset independent write #2", PARATESTFILE);
+
+ ndsets_params.name = PARATESTFILE;
ndsets_params.count = ndatasets;
AddTest("ndsetw", multiple_dset_write, NULL,
"multiple datasets write", &ndsets_params);
- ngroups_params.name = filenames[4];
+ ngroups_params.name = PARATESTFILE;
ngroups_params.count = ngroups;
AddTest("ngrpw", multiple_group_write, NULL,
"multiple groups write", &ngroups_params);
AddTest("ngrpr", multiple_group_read, NULL,
"multiple groups read", &ngroups_params);
- AddTest("split", test_split_comm_access, NULL,
- "dataset using split communicators", filenames[0]);
- AddTest("idsetw", dataset_writeInd, NULL,
- "dataset independent write", filenames[0]);
- AddTest("cdsetw", dataset_writeAll, NULL,
- "dataset collective write", filenames[1]);
- AddTest("eidsetw", extend_writeInd, NULL,
- "extendible dataset independent write", filenames[2]);
- AddTest("eidsetw2", extend_writeInd2, NULL,
- "extendible dataset independent write #2", filenames[2]);
- AddTest("ecdsetw", extend_writeAll, NULL,
- "extendible dataset collective write", filenames[2]);
-
- AddTest("idsetr", dataset_readInd, NULL,
- "dataset independent read", filenames[0]);
- AddTest("cdsetr", dataset_readAll, NULL,
- "dataset collective read", filenames[1]);
- AddTest("eidsetr", extend_readInd, NULL,
- "extendible dataset independent read", filenames[2]);
- AddTest("ecdsetr", extend_readAll, NULL,
- "extendible dataset collective read", filenames[2]);
-
AddTest("compact", compact_dataset, NULL,
- "compact dataset test", filenames[5]);
+ "compact dataset test", PARATESTFILE);
- collngroups_params.name = filenames[6];
+ collngroups_params.name = PARATESTFILE;
collngroups_params.count = ngroups;
AddTest("cngrpw", collective_group_write, NULL,
"collective group and dataset write", &collngroups_params);
@@ -409,9 +405,9 @@ int main(int argc, char **argv)
/* By default, do not run big dataset. */
AddTest("-bigdset", big_dataset, NULL,
- "big dataset test", filenames[7]);
+ "big dataset test", PARATESTFILE);
AddTest("fill", dataset_fillvalue, NULL,
- "dataset fill value", filenames[8]);
+ "dataset fill value", PARATESTFILE);
if(mpi_size > 64) {
if(MAINPROCESS) {
@@ -424,18 +420,18 @@ int main(int argc, char **argv)
}
else {
AddTest("cchunk1", coll_chunk1,NULL,
- "simple collective chunk io",filenames[9]);
+ "simple collective chunk io",PARATESTFILE);
AddTest("cchunk2", coll_chunk2,NULL,
- "noncontiguous collective chunk io",filenames[9]);
+ "noncontiguous collective chunk io",PARATESTFILE);
AddTest("cchunk3", coll_chunk3,NULL,
- "multi-chunk collective chunk io",filenames[9]);
+ "multi-chunk collective chunk io",PARATESTFILE);
AddTest("cchunk4", coll_chunk4,NULL,
- "collective to independent chunk io",filenames[9]);
+ "collective to independent chunk io",PARATESTFILE);
}
AddTest("null", null_dataset, NULL,
- "null dataset test", filenames[10]);
+ "null dataset test", PARATESTFILE);
- io_mode_confusion_params.name = filenames[11];
+ io_mode_confusion_params.name = PARATESTFILE;
io_mode_confusion_params.count = 0; /* value not used */
AddTest("I/Omodeconf", io_mode_confusion, NULL,