picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use TEST_COMPARE_STRING in recently added test

Browse source 
The commit

commit 1df872fd74
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Nov 7 12:42:44 2018 +0100

    support: Implement TEST_COMPARE_STRING

added the new macro TEST_COMPARE_STRING, which compares the output of
functions under test against expected strings, and, when there's a
mismatch, automatically reports an error and prints the differences.
This patch adapts recently added test cases to use this new macro.

Tested for powerpc64le (as is, and locally patched to intentionally fail
and produce error output).

	* argp/tst-ldbl-argp.c (do_one_test): Use TEST_COMPARE_STRING,
	instead of manually comparing and reporting mismatching strings.
	* misc/tst-ldbl-error.c (do_one_test): Likewise.
	* misc/tst-ldbl-warn.c (do_one_test): Likewise.
This commit is contained in:
Gabriel F. T. Gomes 2018-11-06 17:44:13 -02:00
parent e5de3b5b72
commit 43257c335a
4 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2018-11-08 Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
* argp/tst-ldbl-argp.c (do_one_test): Use TEST_COMPARE_STRING,
instead of manually comparing and reporting mismatching strings.
* misc/tst-ldbl-error.c (do_one_test): Likewise.
* misc/tst-ldbl-warn.c (do_one_test): Likewise.
2018-11-08 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h: Remove comment about

9
argp/tst-ldbl-argp.c
View file

@ -73,14 +73,7 @@ do_one_test (const char *expected)
struct support_capture_subprocess result;
result = support_capture_subprocess ((void *) &do_test_call, NULL);
if (strcmp (result.err.buffer, expected) != 0)
{
support_record_failure ();
printf ("error:\n"
" expected: '%s'\n"
" actual: '%s'\n",
expected, result.err.buffer);
}
TEST_COMPARE_STRING (result.err.buffer, expected);
return 0;
}

9
misc/tst-ldbl-error.c
View file

@ -95,14 +95,7 @@ do_one_test (void *callback, const char *expected, ...)
message = strstr (result.err.buffer, needle);
/* Verify that the output message is as expected. */
if (strcmp (message, expected) != 0)
{
support_record_failure ();
printf ("error:\n"
" expected: '%s'\n"
" actual: '%s'\n",
expected, message);
}
TEST_COMPARE_STRING (message, expected);
va_end (args);
}

6
misc/tst-ldbl-warn.c
View file

@ -61,11 +61,7 @@ do_one_test (int select, const char *format, va_list args,
/* Close the in-memory stream and check the output buffer. */
xfclose_memstream (&stream);
if (strcmp (stream.buffer, expected) != 0)
FAIL_EXIT1 ("error:\n"
" expected: '%s'\n"
" actual: '%s'\n",
expected, stream.buffer);
TEST_COMPARE_STRING (stream.buffer, expected);
if (stream.buffer != NULL)
free (stream.buffer);