|
|
ff921b3 |
commit 6175507c06de56e03407004bd2f289ed2cce034d
|
|
|
ff921b3 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
ff921b3 |
Date: Fri Feb 1 14:04:42 2019 +0100
|
|
|
ff921b3 |
|
|
|
ff921b3 |
support: Correct error message for TEST_COMPARE_STRING
|
|
|
ff921b3 |
|
|
|
ff921b3 |
It should say "string", not "blob".
|
|
|
ff921b3 |
|
|
|
ff921b3 |
diff --git a/support/support_test_compare_string.c b/support/support_test_compare_string.c
|
|
|
ff921b3 |
index a76ba8eda7782d9d..b6eaa24570c4cbe3 100644
|
|
|
ff921b3 |
--- a/support/support_test_compare_string.c
|
|
|
ff921b3 |
+++ b/support/support_test_compare_string.c
|
|
|
ff921b3 |
@@ -75,7 +75,7 @@ support_test_compare_string (const char *left, const char *right,
|
|
|
ff921b3 |
|| memcmp (left, right, left_length) != 0)
|
|
|
ff921b3 |
{
|
|
|
ff921b3 |
support_record_failure ();
|
|
|
ff921b3 |
- printf ("%s:%d: error: blob comparison failed\n", file, line);
|
|
|
ff921b3 |
+ printf ("%s:%d: error: string comparison failed\n", file, line);
|
|
|
ff921b3 |
if (left_length == right_length && right != NULL && left != NULL)
|
|
|
ff921b3 |
printf (" string length: %zu bytes\n", left_length);
|
|
|
ff921b3 |
else
|
|
|
ff921b3 |
diff --git a/support/tst-test_compare_string.c b/support/tst-test_compare_string.c
|
|
|
ff921b3 |
index 2a4b258587a7c8ec..d3c037a1ec23ab06 100644
|
|
|
ff921b3 |
--- a/support/tst-test_compare_string.c
|
|
|
ff921b3 |
+++ b/support/tst-test_compare_string.c
|
|
|
ff921b3 |
@@ -60,22 +60,22 @@ do_test (void)
|
|
|
ff921b3 |
|
|
|
ff921b3 |
TEST_VERIFY
|
|
|
ff921b3 |
(strcmp (proc.out.buffer,
|
|
|
ff921b3 |
-"tst-test_compare_string.c:29: error: blob comparison failed\n"
|
|
|
ff921b3 |
+"tst-test_compare_string.c:29: error: string comparison failed\n"
|
|
|
ff921b3 |
" left string: 0 bytes\n"
|
|
|
ff921b3 |
" right string: NULL\n"
|
|
|
ff921b3 |
-"tst-test_compare_string.c:30: error: blob comparison failed\n"
|
|
|
ff921b3 |
+"tst-test_compare_string.c:30: error: string comparison failed\n"
|
|
|
ff921b3 |
" left string: 1 bytes\n"
|
|
|
ff921b3 |
" right string: 0 bytes\n"
|
|
|
ff921b3 |
" left (evaluated from \"X\"):\n"
|
|
|
ff921b3 |
" \"X\"\n"
|
|
|
ff921b3 |
" 58\n"
|
|
|
ff921b3 |
-"tst-test_compare_string.c:31: error: blob comparison failed\n"
|
|
|
ff921b3 |
+"tst-test_compare_string.c:31: error: string comparison failed\n"
|
|
|
ff921b3 |
" left string: NULL\n"
|
|
|
ff921b3 |
" right string: 1 bytes\n"
|
|
|
ff921b3 |
" right (evaluated from \"X\"):\n"
|
|
|
ff921b3 |
" \"X\"\n"
|
|
|
ff921b3 |
" 58\n"
|
|
|
ff921b3 |
-"tst-test_compare_string.c:32: error: blob comparison failed\n"
|
|
|
ff921b3 |
+"tst-test_compare_string.c:32: error: string comparison failed\n"
|
|
|
ff921b3 |
" string length: 4 bytes\n"
|
|
|
ff921b3 |
" left (evaluated from \"abcd\"):\n"
|
|
|
ff921b3 |
" \"abcd\"\n"
|
|
|
ff921b3 |
@@ -83,13 +83,13 @@ do_test (void)
|
|
|
ff921b3 |
" right (evaluated from \"abcD\"):\n"
|
|
|
ff921b3 |
" \"abcD\"\n"
|
|
|
ff921b3 |
" 61 62 63 44\n"
|
|
|
ff921b3 |
-"tst-test_compare_string.c:33: error: blob comparison failed\n"
|
|
|
ff921b3 |
+"tst-test_compare_string.c:33: error: string comparison failed\n"
|
|
|
ff921b3 |
" left string: 4 bytes\n"
|
|
|
ff921b3 |
" right string: NULL\n"
|
|
|
ff921b3 |
" left (evaluated from \"abcd\"):\n"
|
|
|
ff921b3 |
" \"abcd\"\n"
|
|
|
ff921b3 |
" 61 62 63 64\n"
|
|
|
ff921b3 |
-"tst-test_compare_string.c:34: error: blob comparison failed\n"
|
|
|
ff921b3 |
+"tst-test_compare_string.c:34: error: string comparison failed\n"
|
|
|
ff921b3 |
" left string: NULL\n"
|
|
|
ff921b3 |
" right string: 4 bytes\n"
|
|
|
ff921b3 |
" right (evaluated from \"abcd\"):\n"
|