diff options
| -rw-r--r-- | test/Makefile | 5 | ||||
| -rw-r--r-- | test/regex/Makefile | 2 | ||||
| -rw-r--r-- | test/regex/tst-regex2.c | 425 | ||||
| -rw-r--r-- | test/test-skeleton.c | 14 |
4 files changed, 223 insertions, 223 deletions
diff --git a/test/Makefile b/test/Makefile index f38427e41..728845bdf 100644 --- a/test/Makefile +++ b/test/Makefile @@ -44,7 +44,10 @@ test check all: run run: subdirs_run -compile: subdirs_compile +compile: $(top_builddir)/$(LOCAL_INSTALL_PATH) subdirs_compile + +$(top_builddir)/$(LOCAL_INSTALL_PATH): + $(Q)$(MAKE) -C $(top_builddir) $(LOCAL_INSTALL_PATH) tags: ctags -R diff --git a/test/regex/Makefile b/test/regex/Makefile index 7c55c3c0e..f443d72f2 100644 --- a/test/regex/Makefile +++ b/test/regex/Makefile @@ -5,8 +5,6 @@ include ../Test.mak -CFLAGS_tst-regex2 := -std=c99 - OPTS_testregex := < basic.dat OPTS_testregexc := < categorize.dat OPTS_testregexf := < forcedassoc.dat diff --git a/test/regex/tst-regex2.c b/test/regex/tst-regex2.c index 1cf3e1d09..db7c533b3 100644 --- a/test/regex/tst-regex2.c +++ b/test/regex/tst-regex2.c @@ -7,243 +7,228 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <sys/time.h> #include <time.h> #include <unistd.h> #include <errno.h> -#undef _POSIX_CPUTIME -#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 -static clockid_t cl; -static int use_clock; -#endif - static int -do_test (void) +do_test(void) { -#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 -# if _POSIX_CPUTIME == 0 - if (sysconf (_SC_CPUTIME) < 0) - use_clock = 0; - else -# endif - /* See whether we can use the CPU clock. */ - use_clock = clock_getcpuclockid (0, &cl) == 0; -#endif - - static const char *pat[] = { - ".?.?.?.?.?.?.?Log\\.13", - "(.?)(.?)(.?)(.?)(.?)(.?)(.?)Log\\.13", - "((((((((((.?))))))))))((((((((((.?))))))))))((((((((((.?))))))))))" - "((((((((((.?))))))))))((((((((((.?))))))))))((((((((((.?))))))))))" - "((((((((((.?))))))))))Log\\.13" }; - - int fd = open (".regex.ChangeLog.14", O_RDONLY); - if (fd < 0) - { - printf ("Couldn't open .regex.ChangeLog.14: %s\n", strerror(errno)); - return 1; - } - - struct stat st; - if (fstat (fd, &st) < 0) - { - printf ("Couldn't fstat ChangeLog.14: %s\n", strerror(errno)); - return 1; - } - - char *buf = malloc (st.st_size + 1); - if (buf == NULL) - { - printf ("Couldn't allocate buffer: %s\n", strerror(errno)); - return 1; - } - - if (read (fd, buf, st.st_size) != (ssize_t) st.st_size) - { - puts ("Couldn't read ChangeLog.14"); - return 1; - } - - close (fd); - buf[st.st_size] = '\0'; - -#ifdef __UCLIBC_HAS_XLOCALE__ - setlocale (LC_ALL, "de_DE.UTF-8"); -#endif - - char *string = buf; - size_t len = st.st_size; - int testno, i; - - for (testno = 0; testno < 4; ++testno) - for (i = 0; i < sizeof (pat) / sizeof (pat[0]); ++i) - { - printf ("test %d pattern %d", testno, i); - - regex_t rbuf; - struct re_pattern_buffer rpbuf; - int err; - if (testno < 2) - { - err = regcomp (&rbuf, pat[i], - REG_EXTENDED | (testno ? REG_NOSUB : 0)); - if (err != 0) - { - putchar ('\n'); - char errstr[300]; - regerror (err, &rbuf, errstr, sizeof (errstr)); - puts (errstr); - return err; - } - } - else - { - re_set_syntax (RE_SYNTAX_POSIX_EGREP - | (testno == 3 ? RE_NO_SUB : 0)); - - memset (&rpbuf, 0, sizeof (rpbuf)); - const char *s = re_compile_pattern (pat[i], strlen (pat[i]), - &rpbuf); - if (s != NULL) - { - printf ("\n%s\n", s); + static const char *pat[] = { + ".?.?.?.?.?.?.?Log\\.13", + "(.?)(.?)(.?)(.?)(.?)(.?)(.?)Log\\.13", + "((((((((((.?))))))))))((((((((((.?))))))))))((((((((((.?))))))))))" + "((((((((((.?))))))))))((((((((((.?))))))))))((((((((((.?))))))))))" + "((((((((((.?))))))))))Log\\.13" + }; + char *buf, *string; + const char *fname = "tst-regex2.data"; + struct stat st; + unsigned len; + int testno; + + int fd = open(fname, O_RDONLY); + if (fd < 0) { + printf("Couldn't open %s: %s\n", fname, strerror(errno)); + return 1; + } + if (fstat(fd, &st) < 0) { + printf("Couldn't fstat %s: %s\n", fname, strerror(errno)); + return 1; + } + len = st.st_size; + string = buf = malloc(len + 1); + if (buf == NULL) { + printf("Couldn't allocate %u bytes\n", len + 1); + return 1; + } + if (read(fd, buf, st.st_size) != (ssize_t) st.st_size) { + printf("Couldn't read %s\n", fname); return 1; - } + } - /* Just so that this can be tested with earlier glibc as well. */ - if (testno == 3) - rpbuf.no_sub = 1; - } + close(fd); + buf[len] = '\0'; -#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 - struct timespec start, stop; - if (use_clock) - use_clock = clock_gettime (cl, &start) == 0; +#if defined __UCLIBC_HAS_XLOCALE__ || !defined __UCLIBC__ + setlocale(LC_ALL, "de_DE.UTF-8"); #endif - if (testno < 2) - { - regmatch_t pmatch[71]; - err = regexec (&rbuf, string, 71, pmatch, 0); - if (err == REG_NOMATCH) - { - puts ("\nregexec failed"); - return 1; - } - - if (testno == 0) - { - if (pmatch[0].rm_eo != pmatch[0].rm_so + 13 - || pmatch[0].rm_eo > len - || pmatch[0].rm_so < len - 100 - || strncmp (string + pmatch[0].rm_so, - " ChangeLog.13 for earlier changes", - sizeof " ChangeLog.13 for earlier changes" - 1) - != 0) - { - puts ("\nregexec without REG_NOSUB did not find the correct match"); - return 1; + for (testno = 0; testno < 2; ++testno) { + int i; + for (i = 0; i < sizeof(pat) / sizeof(pat[0]); ++i) { + struct timeval start, stop; + regex_t rbuf; + int err; + + printf("test %d pattern %d '%s'\n", testno, i, pat[i]); + gettimeofday(&start, NULL); + + err = regcomp(&rbuf, pat[i], + REG_EXTENDED | (testno ? REG_NOSUB : 0)); + if (err != 0) { + char errstr[300]; + regerror(err, &rbuf, errstr, sizeof(errstr)); + puts(errstr); + return err; + } + + regmatch_t pmatch[71]; + err = regexec(&rbuf, string, 71, pmatch, 0); + if (err == REG_NOMATCH) { + puts("regexec failed"); + return 1; + } + + if (testno == 0) { + if (pmatch[0].rm_eo != pmatch[0].rm_so + 13 + || pmatch[0].rm_eo > len + || pmatch[0].rm_so < len - 100 + || strncmp(string + pmatch[0].rm_so, + " ChangeLog.13 for earlier changes", + sizeof " ChangeLog.13 for earlier changes" - 1 + ) != 0 + ) { + puts("regexec without REG_NOSUB did not find the correct match"); + return 1; + } + + if (i > 0) { + int j, k, l; + for (j = 0, l = 1; j < 7; ++j) { + for (k = 0; k < (i == 1 ? 1 : 10); ++k, ++l) { + if (pmatch[l].rm_so != pmatch[0].rm_so + j + || pmatch[l].rm_eo != pmatch[l].rm_so + 1 + ) { + printf("pmatch[%d] incorrect\n", l); + return 1; + } + } + } + } + } + + gettimeofday(&stop, NULL); + stop.tv_sec -= start.tv_sec; + if (stop.tv_usec < start.tv_usec) { + stop.tv_sec--; + stop.tv_usec += 1000000; + } + stop.tv_usec -= start.tv_usec; + printf(" %lu.%06lus\n", (unsigned long) stop.tv_sec, + (unsigned long) stop.tv_usec); + regfree(&rbuf); } - - int j, k, l; - if (i > 0) - for (j = 0, l = 1; j < 7; ++j) - for (k = 0; k < (i == 1 ? 1 : 10); ++k, ++l) - if (pmatch[l].rm_so != pmatch[0].rm_so + j - || pmatch[l].rm_eo != pmatch[l].rm_so + 1) - { - printf ("\npmatch[%d] incorrect\n", l); - return 1; - } - } } - else - { - struct re_registers regs; - - memset (®s, 0, sizeof (regs)); - int match = re_search (&rpbuf, string, len, 0, len, - ®s); - if (match < 0) - { - puts ("\nre_search failed"); - return 1; - } - - if (match + 13 > len - || match < len - 100 - || strncmp (string + match, - " ChangeLog.13 for earlier changes", - sizeof " ChangeLog.13 for earlier changes" - 1) - != 0) - { - puts ("\nre_search did not find the correct match"); - return 1; - } - - if (testno == 2) - { - if (regs.num_regs != 2 + (i == 0 ? 0 : i == 1 ? 7 : 70)) - { - printf ("\nincorrect num_regs %d\n", regs.num_regs); - return 1; - } - if (regs.start[0] != match || regs.end[0] != match + 13) - { - printf ("\nincorrect regs.{start,end}[0] = { %d, %d}\n", - regs.start[0], regs.end[0]); - return 1; + for (testno = 2; testno < 4; ++testno) { + int i; + for (i = 0; i < sizeof(pat) / sizeof(pat[0]); ++i) { + struct timeval start, stop; + struct re_pattern_buffer rpbuf; + struct re_registers regs; + const char *s; + int match; + + printf("test %d pattern %d '%s'\n", testno, i, pat[i]); + gettimeofday(&start, NULL); + + re_set_syntax(RE_SYNTAX_POSIX_EGREP + | (testno == 3 ? RE_NO_SUB : 0)); + memset(&rpbuf, 0, sizeof(rpbuf)); + s = re_compile_pattern(pat[i], strlen(pat[i]), &rpbuf); + if (s != NULL) { + printf("%s\n", s); + return 1; + } + + memset(®s, 0, sizeof(regs)); + match = re_search(&rpbuf, string, len, 0, len, ®s); + if (match < 0) { + printf("re_search failed (err:%d)\n", match); + return 1; + } + if (match + 13 > len) { + printf("re_search: match+13 > len (%d > %d)\n", match + 13, len); + return 1; + } + if (match < len - 100) { + printf("re_search: match < len-100 (%d < %d)\n", match, len - 100); + return 1; + } + if (strncmp(string + match, " ChangeLog.13 for earlier changes", + sizeof(" ChangeLog.13 for earlier changes") - 1 + ) != 0 + ) { + printf("re_search did not find the correct match" + "(found '%s' instead)\n", string + match); + return 1; + } + + if (testno == 2) { + int expected = 72; + if (i == 0) + expected = 2; + if (i == 1) + expected = 9; + if (regs.num_regs != expected) { + printf("incorrect num_regs %d, expected %d\n", regs.num_regs, expected); + return 1; + } + if (regs.start[0] != match || regs.end[0] != match + 13) { + printf("incorrect regs.{start,end}[0] = { %d, %d }," + " expected { %d, %d }\n", + regs.start[0], regs.end[0], + match, match + 13 + ); + return 1; + } + if (regs.start[regs.num_regs - 1] != -1 + || regs.end[regs.num_regs - 1] != -1 + ) { + printf("incorrect regs.{start,end}[num_regs - 1] = { %d, %d }," + " expected { -1, -1 }\n", + regs.start[regs.num_regs - 1], regs.end[regs.num_regs - 1] + ); + return 1; + } + + if (i > 0) { + int j, k, l; + for (j = 0, l = 1; j < 7; ++j) { + for (k = 0; k < (i == 1 ? 1 : 10); ++k, ++l) { + if (regs.start[l] != match + j + || regs.end[l] != match + j + 1 + ) { + printf("incorrect regs.{start,end}[%d] = { %d, %d }," + " expected { %d, %d }\n", + l, + regs.start[l], regs.end[l], + match + j, match + j + 1 + ); + return 1; + } + } + } + } + } + + gettimeofday(&stop, NULL); + stop.tv_sec -= start.tv_sec; + if (stop.tv_usec < start.tv_usec) { + stop.tv_sec--; + stop.tv_usec += 1000000; + } + stop.tv_usec -= start.tv_usec; + printf(" %lu.%06lus\n", (unsigned long) stop.tv_sec, + (unsigned long) stop.tv_usec); + regfree(&rpbuf); } - - if (regs.start[regs.num_regs - 1] != -1 - || regs.end[regs.num_regs - 1] != -1) - { - puts ("\nincorrect regs.{start,end}[num_regs - 1]"); - return 1; - } - - int j, k, l; - if (i > 0) - for (j = 0, l = 1; j < 7; ++j) - for (k = 0; k < (i == 1 ? 1 : 10); ++k, ++l) - if (regs.start[l] != match + j - || regs.end[l] != regs.start[l] + 1) - { - printf ("\nregs.{start,end}[%d] incorrect\n", l); - return 1; - } - } } - -#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 - if (use_clock) - use_clock = clock_gettime (cl, &stop) == 0; - if (use_clock) - { - stop.tv_sec -= start.tv_sec; - if (stop.tv_nsec < start.tv_nsec) - { - stop.tv_sec--; - stop.tv_nsec += 1000000000 - start.tv_nsec; - } - else - stop.tv_nsec -= start.tv_nsec; - printf (": %ld.%09lds\n", (long) stop.tv_sec, (long) stop.tv_nsec); - } - else -#endif - putchar ('\n'); - - if (testno < 2) - regfree (&rbuf); - else - regfree (&rpbuf); - } - - return 0; + return 0; } #define TIMEOUT 20 -#define TEST_FUNCTION do_test () +#define TEST_FUNCTION do_test() #include "../test-skeleton.c" diff --git a/test/test-skeleton.c b/test/test-skeleton.c index adfc8b75b..c61d09e82 100644 --- a/test/test-skeleton.c +++ b/test/test-skeleton.c @@ -190,6 +190,16 @@ timeout_handler (int sig __attribute__ ((unused))) exit (1); } +static void +__attribute__ ((noreturn)) +handler_killpid(int sig) +{ + kill(pid, SIGKILL); /* kill test */ + signal(sig, SIG_DFL); + raise(sig); /* kill ourself */ + _exit(128 + sig); /* paranoia */ +} + /* We provide the entry point here. */ int main (int argc, char *argv[]) @@ -332,6 +342,10 @@ main (int argc, char *argv[]) exit (1); } + signal (SIGTERM, handler_killpid); + signal (SIGINT, handler_killpid); + signal (SIGQUIT, handler_killpid); + /* Set timeout. */ #ifndef TIMEOUT /* Default timeout is two seconds. */ |