diff options
Diffstat (limited to 'test/testframe.c')
-rw-r--r-- | test/testframe.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/test/testframe.c b/test/testframe.c index 44c1701..310886f 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -69,11 +69,11 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const const void *Parameters) { /* Sanity checking */ - if (HDstrlen(TheDescr) >= MAXTESTDESC) { + if (strlen(TheDescr) >= MAXTESTDESC) { printf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n", TheDescr, MAXTESTDESC); exit(EXIT_FAILURE); } - if (HDstrlen(TheName) >= MAXTESTNAME) { + if (strlen(TheName) >= MAXTESTNAME) { printf("Test name too long, increase MAXTESTNAME(%d).\n", MAXTESTNAME); exit(EXIT_FAILURE); } @@ -96,13 +96,13 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const } /* Set up test function */ - HDstrcpy(Test[Index].Description, TheDescr); + strcpy(Test[Index].Description, TheDescr); if (*TheName != '-') { - HDstrcpy(Test[Index].Name, TheName); + strcpy(Test[Index].Name, TheName); Test[Index].SkipFlag = 0; } else { /* skip test by default */ - HDstrcpy(Test[Index].Name, TheName + 1); + strcpy(Test[Index].Name, TheName + 1); Test[Index].SkipFlag = 1; } Test[Index].Call = TheCall; @@ -214,7 +214,7 @@ TestParseCmdLine(int argc, char *argv[]) int ret_code; while ((void)argv++, --argc > 0) { - if ((HDstrcmp(*argv, "-verbose") == 0) || (HDstrcmp(*argv, "-v") == 0)) { + if ((strcmp(*argv, "-verbose") == 0) || (strcmp(*argv, "-v") == 0)) { if (argc > 0) { --argc; ++argv; @@ -225,7 +225,7 @@ TestParseCmdLine(int argc, char *argv[]) exit(EXIT_FAILURE); } } - else if (((HDstrcmp(*argv, "-exclude") == 0) || (HDstrcmp(*argv, "-x") == 0))) { + else if (((strcmp(*argv, "-exclude") == 0) || (strcmp(*argv, "-x") == 0))) { if (argc > 0) { --argc; ++argv; @@ -236,7 +236,7 @@ TestParseCmdLine(int argc, char *argv[]) exit(EXIT_FAILURE); } } - else if (((HDstrcmp(*argv, "-begin") == 0) || (HDstrcmp(*argv, "-b") == 0))) { + else if (((strcmp(*argv, "-begin") == 0) || (strcmp(*argv, "-b") == 0))) { if (argc > 0) { --argc; ++argv; @@ -247,7 +247,7 @@ TestParseCmdLine(int argc, char *argv[]) exit(EXIT_FAILURE); } } - else if (((HDstrcmp(*argv, "-only") == 0) || (HDstrcmp(*argv, "-o") == 0))) { + else if (((strcmp(*argv, "-only") == 0) || (strcmp(*argv, "-o") == 0))) { if (argc > 0) { unsigned Loop; @@ -267,15 +267,15 @@ TestParseCmdLine(int argc, char *argv[]) exit(EXIT_FAILURE); } } - else if ((HDstrcmp(*argv, "-summary") == 0) || (HDstrcmp(*argv, "-s") == 0)) + else if ((strcmp(*argv, "-summary") == 0) || (strcmp(*argv, "-s") == 0)) Summary = 1; - else if (HDstrcmp(*argv, "-enable-error-stack") == 0) + else if (strcmp(*argv, "-enable-error-stack") == 0) enable_error_stack = 1; - else if ((HDstrcmp(*argv, "-help") == 0) || (HDstrcmp(*argv, "-h") == 0)) { + else if ((strcmp(*argv, "-help") == 0) || (strcmp(*argv, "-h") == 0)) { TestUsage(); exit(EXIT_SUCCESS); } - else if ((HDstrcmp(*argv, "-cleanoff") == 0) || (HDstrcmp(*argv, "-c") == 0)) + else if ((strcmp(*argv, "-cleanoff") == 0) || (strcmp(*argv, "-c") == 0)) SetTestNoCleanup(); else { /* non-standard option. Break out. */ @@ -447,11 +447,11 @@ GetTestExpress(void) /* Check if HDF5TestExpress is set to override the default level */ env_val = HDgetenv("HDF5TestExpress"); if (env_val) { - if (HDstrcmp(env_val, "0") == 0) + if (strcmp(env_val, "0") == 0) express_val = 0; - else if (HDstrcmp(env_val, "1") == 0) + else if (strcmp(env_val, "1") == 0) express_val = 1; - else if (HDstrcmp(env_val, "2") == 0) + else if (strcmp(env_val, "2") == 0) express_val = 2; else express_val = 3; @@ -570,7 +570,7 @@ TestErrPrintf(const char *format, ...) /* Print the requested information */ va_start(arglist, format); - ret_value = HDvprintf(format, arglist); + ret_value = vprintf(format, arglist); va_end(arglist); /* Return the length of the string produced (like printf() does) */ @@ -592,14 +592,14 @@ SetTest(const char *testname, int action) switch (action) { case SKIPTEST: for (Loop = 0; Loop < Index; Loop++) - if (HDstrcmp(testname, Test[Loop].Name) == 0) { + if (strcmp(testname, Test[Loop].Name) == 0) { Test[Loop].SkipFlag = 1; break; } break; case BEGINTEST: for (Loop = 0; Loop < Index; Loop++) { - if (HDstrcmp(testname, Test[Loop].Name) != 0) + if (strcmp(testname, Test[Loop].Name) != 0) Test[Loop].SkipFlag = 1; else { /* Found it. Set it to run. Done. */ @@ -610,7 +610,7 @@ SetTest(const char *testname, int action) break; case ONLYTEST: for (Loop = 0; Loop < Index; Loop++) { - if (HDstrcmp(testname, Test[Loop].Name) == 0) { + if (strcmp(testname, Test[Loop].Name) == 0) { /* Found it. Set it to run. Break to skip the rest. */ Test[Loop].SkipFlag = 0; break; |