diff options
| -rw-r--r-- | test/h5test.h | 2 | ||||
| -rw-r--r-- | test/testframe.c | 25 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 6 |
3 files changed, 21 insertions, 12 deletions
diff --git a/test/h5test.h b/test/h5test.h index 6afbd61..396be2b 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -133,7 +133,7 @@ H5TEST_DLL int GetTestVerbosity(void); H5TEST_DLL int SetTestVerbosity(int newval); H5TEST_DLL void ParseTestVerbosity(char *argv); H5TEST_DLL int GetTestNumErrs(void); -H5TEST_DLL void *GetTestParameters(void); +H5TEST_DLL const void *GetTestParameters(void); H5TEST_DLL int TestErrPrintf(const char *format, ...); H5TEST_DLL void SetTest(const char *testname, int action); diff --git a/test/testframe.c b/test/testframe.c index b00bff0..a8b4d00 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -36,7 +36,7 @@ typedef struct TestStruct { char Name[MAXTESTNAME]; void (*Call)(void); void (*Cleanup)(void); - void *Parameters; + const void *Parameters; } TestStruct; @@ -47,16 +47,17 @@ static int num_errs = 0; /* Total number of errors during testing */ static int Verbosity = VERBO_DEF; /* Default Verbosity is Low */ static TestStruct Test[MAXNUMOFTESTS]; static int Index = 0; -static void *Test_parameters = NULL; +static const void *Test_parameters = NULL; /* * Setup a test function and add it to the list of tests. * It must have no parameters and returns void. - * TheName--short test name - * TheCall--the test routine - * Cleanup--the cleanup routine for the test - * TheDescr--Long description of the test + * TheName--short test name. + * If the name starts with '-', do not run it by default. + * TheCall--the test routine. + * Cleanup--the cleanup routine for the test. + * TheDescr--Long description of the test. * Parameters--pointer to extra parameters. Use NULL if none used. * Since only the pointer is copied, the contents should not change. */ @@ -82,11 +83,17 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con /* Set up test function */ HDstrcpy(Test[Index].Description, TheDescr); - HDstrcpy(Test[Index].Name, TheName); + if (*TheName != '-'){ + HDstrcpy(Test[Index].Name, TheName); + Test[Index].SkipFlag = 0; + } + else { /* skip test by default */ + HDstrcpy(Test[Index].Name, TheName+1); + Test[Index].SkipFlag = 1; + } Test[Index].Call = TheCall; Test[Index].Cleanup = Cleanup; Test[Index].NumErrors = -1; - Test[Index].SkipFlag = 0; Test[Index].Parameters = Parameters; /* Increment test count */ @@ -343,7 +350,7 @@ int GetTestNumErrs(void) /* * Retrieve the current Test Parameters pointer. */ -void *GetTestParameters(void) +const void *GetTestParameters(void) { return(Test_parameters); } diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index ba6a075..2e5efb7 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -462,9 +462,11 @@ int main(int argc, char **argv) AddTest("indngroupsread", independent_group_read, NULL, "independent group and dataset read", &collngroups_params); + /* By default, do not run big dataset. */ + AddTest("-bigdataset", big_dataset, NULL, + "big dataset test", filenames[7]); if (dobig && sizeof(MPI_Offset)>4){ - AddTest("bigdataset", big_dataset, NULL, - "big dataset test", filenames[7]); + SetTest("bigdataset", ONLYTEST); } AddTest("fillvalue", dataset_fillvalue, NULL, "dataset fill value", filenames[8]); |