public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/release/2.27/master] support: Correct error message for TEST_COMPARE_STRING
@ 2021-09-21 0:54 Dmitry Levin
0 siblings, 0 replies; only message in thread
From: Dmitry Levin @ 2021-09-21 0:54 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=222b1517cd86e5a3eadcfd7787f757fdb76db11b
commit 222b1517cd86e5a3eadcfd7787f757fdb76db11b
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Feb 1 14:04:42 2019 +0100
support: Correct error message for TEST_COMPARE_STRING
It should say "string", not "blob".
(cherry picked from commit 6175507c06de56e03407004bd2f289ed2cce034d)
Diff:
---
ChangeLog | 6 ++++++
support/support_test_compare_string.c | 2 +-
support/tst-test_compare_string.c | 12 ++++++------
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 190b9ea0d0..23b740dc2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
2018-11-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* support/support_test_compare_string.c
diff --git a/support/support_test_compare_string.c b/support/support_test_compare_string.c
index a76ba8eda7..b6eaa24570 100644
--- a/support/support_test_compare_string.c
+++ b/support/support_test_compare_string.c
@@ -75,7 +75,7 @@ support_test_compare_string (const char *left, const char *right,
|| memcmp (left, right, left_length) != 0)
{
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)
printf (" string length: %zu bytes\n", left_length);
else
diff --git a/support/tst-test_compare_string.c b/support/tst-test_compare_string.c
index 2a4b258587..d3c037a1ec 100644
--- a/support/tst-test_compare_string.c
+++ b/support/tst-test_compare_string.c
@@ -60,22 +60,22 @@ do_test (void)
TEST_VERIFY
(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"
" 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"
" right string: 0 bytes\n"
" left (evaluated from \"X\"):\n"
" \"X\"\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"
" right string: 1 bytes\n"
" right (evaluated from \"X\"):\n"
" \"X\"\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"
" left (evaluated from \"abcd\"):\n"
" \"abcd\"\n"
@@ -83,13 +83,13 @@ do_test (void)
" right (evaluated from \"abcD\"):\n"
" \"abcD\"\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"
" right string: NULL\n"
" left (evaluated from \"abcd\"):\n"
" \"abcd\"\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"
" right string: 4 bytes\n"
" right (evaluated from \"abcd\"):\n"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-21 0:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-21 0:54 [glibc/release/2.27/master] support: Correct error message for TEST_COMPARE_STRING Dmitry Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).