AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-25 04:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

support: Correct error message for TEST_COMPARE_STRING

Browse Source 
It should say "string", not "blob".
This commit is contained in:
Florian Weimer 2019-02-01 14:04:42 +01:00
parent baef194387
commit 6175507c06
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2019-02-01 Florian Weimer <fweimer@redhat.com>
* support/support_test_compare_string.c
(support_test_compare_string): Use "string" in error message.
* support/tst-test_compare_string.c (do_test): Adjust.
2019-02-01 Florian Weimer <fweimer@redhat.com> 2019-02-01 Florian Weimer <fweimer@redhat.com>
* support/support_format_address_family.c * support/support_format_address_family.c

2
support/support_test_compare_string.c
View File

@ -75,7 +75,7 @@ support_test_compare_string (const char *left, const char *right,
|| memcmp (left, right, left_length) != 0) || memcmp (left, right, left_length) != 0)
{ {
support_record_failure (); support_record_failure ();
printf ("%s:%d: error: blob comparison failed\n", file, line); printf ("%s:%d: error: string comparison failed\n", file, line);
if (left_length == right_length && right != NULL && left != NULL) if (left_length == right_length && right != NULL && left != NULL)
printf (" string length: %zu bytes\n", left_length); printf (" string length: %zu bytes\n", left_length);
else else

12
support/tst-test_compare_string.c
View File

@ -60,22 +60,22 @@ do_test (void)
TEST_VERIFY TEST_VERIFY
(strcmp (proc.out.buffer, (strcmp (proc.out.buffer,
"tst-test_compare_string.c:29: error: blob comparison failed\n" "tst-test_compare_string.c:29: error: string comparison failed\n"
" left string: 0 bytes\n" " left string: 0 bytes\n"
" right string: NULL\n" " right string: NULL\n"
"tst-test_compare_string.c:30: error: blob comparison failed\n" "tst-test_compare_string.c:30: error: string comparison failed\n"
" left string: 1 bytes\n" " left string: 1 bytes\n"
" right string: 0 bytes\n" " right string: 0 bytes\n"
" left (evaluated from \"X\"):\n" " left (evaluated from \"X\"):\n"
" \"X\"\n" " \"X\"\n"
" 58\n" " 58\n"
"tst-test_compare_string.c:31: error: blob comparison failed\n" "tst-test_compare_string.c:31: error: string comparison failed\n"
" left string: NULL\n" " left string: NULL\n"
" right string: 1 bytes\n" " right string: 1 bytes\n"
" right (evaluated from \"X\"):\n" " right (evaluated from \"X\"):\n"
" \"X\"\n" " \"X\"\n"
" 58\n" " 58\n"
"tst-test_compare_string.c:32: error: blob comparison failed\n" "tst-test_compare_string.c:32: error: string comparison failed\n"
" string length: 4 bytes\n" " string length: 4 bytes\n"
" left (evaluated from \"abcd\"):\n" " left (evaluated from \"abcd\"):\n"
" \"abcd\"\n" " \"abcd\"\n"
@ -83,13 +83,13 @@ do_test (void)
" right (evaluated from \"abcD\"):\n" " right (evaluated from \"abcD\"):\n"
" \"abcD\"\n" " \"abcD\"\n"
" 61 62 63 44\n" " 61 62 63 44\n"
"tst-test_compare_string.c:33: error: blob comparison failed\n" "tst-test_compare_string.c:33: error: string comparison failed\n"
" left string: 4 bytes\n" " left string: 4 bytes\n"
" right string: NULL\n" " right string: NULL\n"
" left (evaluated from \"abcd\"):\n" " left (evaluated from \"abcd\"):\n"
" \"abcd\"\n" " \"abcd\"\n"
" 61 62 63 64\n" " 61 62 63 64\n"
"tst-test_compare_string.c:34: error: blob comparison failed\n" "tst-test_compare_string.c:34: error: string comparison failed\n"
" left string: NULL\n" " left string: NULL\n"
" right string: 4 bytes\n" " right string: 4 bytes\n"
" right (evaluated from \"abcd\"):\n" " right (evaluated from \"abcd\"):\n"