diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-12-22 19:27:39 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-12-22 19:27:39 +0000 |
| commit | 8a031172c235ab0def5763dd5f3a00f9ff10c053 (patch) | |
| tree | 11ba9c29e8edc754174f18e6db425971144769c9 /libc/string/test-strcmp.c | |
| parent | a179b968417641981213cfe422c741141d8394e4 (diff) | |
| download | eglibc2-8a031172c235ab0def5763dd5f3a00f9ff10c053.tar.gz | |
Merge changes between r16068 and r16332 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16333 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/string/test-strcmp.c')
| -rw-r--r-- | libc/string/test-strcmp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libc/string/test-strcmp.c b/libc/string/test-strcmp.c index 9ea4df759..62a42eba8 100644 --- a/libc/string/test-strcmp.c +++ b/libc/string/test-strcmp.c @@ -221,14 +221,16 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, static void do_random_tests (void) { - for (size_t a = 0; a < CHARBYTES; a += CHARALIGN) - for (size_t b = 0; b < CHARBYTES; b += CHARALIGN) - { - UCHAR *p1 = (UCHAR *) (buf1 + page_size - 512 * CHARBYTES - a); - UCHAR *p2 = (UCHAR *) (buf2 + page_size - 512 * CHARBYTES - b); + UCHAR *p1 = (UCHAR *) (buf1 + page_size - 512 * CHARBYTES); + UCHAR *p2 = (UCHAR *) (buf2 + page_size - 512 * CHARBYTES); for (size_t n = 0; n < ITERATIONS; n++) { + /* for wcscmp case align1 and align2 mean here alignment + in wchar_t symbols, it equal 4*k alignment in bytes, we + don't check other alignments like for example + p1 = (wchar_t *)(buf1 + 1) + because it's wrong using of wchar_t type. */ size_t align1 = random () & 31; size_t align2; if (random () & 1) @@ -274,7 +276,7 @@ do_random_tests (void) } int result = 0; - MEMCPY ((CHAR *) (p2 + align2), (CHAR *) (p1 + align1), pos); + MEMCPY (p2 + align2, p1 + align1, pos); if (pos < len1) { if (p2[align2 + pos] == p1[align1 + pos]) @@ -302,13 +304,12 @@ do_random_tests (void) || (r < 0 && result >= 0) || (r > 0 && result <= 0)) { - error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd, %zd) %d != %d, p1 %p p2 %p", + error (0, 0, "Iteration %zd - wrong result in function %s (align in bytes: %zd, align in bytes: %zd, len1: %zd, len2: %zd, pos: %zd) %d != %d, p1 %p p2 %p", n, impl->name, (size_t) (p1 + align1) & 63, (size_t) (p1 + align2) & 63, len1, len2, pos, r, result, p1, p2); ret = 1; } } - } - } + } } static void |