diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2016-06-13 21:04:07 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2016-06-13 21:04:07 +0000 |
| commit | 09765e3a0a8be2f7bca694a1171ecf050f5400d1 (patch) | |
| tree | a7dc6a7feb0754dac0ba89c788d492dc8864951a /gcc/input.c | |
| parent | 0dda258b6f3194849dc9a47aa9417d7ce942a3ec (diff) | |
| download | gcc-09765e3a0a8be2f7bca694a1171ecf050f5400d1.zip gcc-09765e3a0a8be2f7bca694a1171ecf050f5400d1.tar.gz gcc-09765e3a0a8be2f7bca694a1171ecf050f5400d1.tar.bz2 | |
selftests: improve reported failure locations
This patch introduce a selftest::location struct to wrap up __FILE__
and __LINE__ information (and __FUNCTION__) throughout the selftests,
allowing location information to be passed around.
It updates the helper functions in pretty-print.c to pass through
the precise location of each test, so that if a failure occurs, the
correct line number is printed, rather than a line within a helper
function.
gcc/ChangeLog:
* input.c (test_reading_source_line): Use SELFTEST_LOCATION.
* pretty-print.c (assert_pp_format_va): Add location param and use
it with ASSERT_STREQ_AT.
(assert_pp_format): Add location param and pass it to
assert_pp_format_va.
(assert_pp_format_colored): Likewise.
(ASSERT_PP_FORMAT_1): New.
(ASSERT_PP_FORMAT_2): New.
(ASSERT_PP_FORMAT_3): New.
(test_pp_format): Provide SELFTEST_LOCATION throughout, either
explicitly, or implicitly via the above macros.
* selftest.c (selftest::pass): Use a selftest::location rather
than file and line.
(selftest::fail): Likewise. Print the function name.
(selftest::fail_formatted): Likewise.
(selftest::assert_streq): Use a selftest::location rather than
file and line.
* selftest.h (selftest::location): New struct.
(SELFTEST_LOCATION): New macro.
(selftest::pass): Accept a const location & rather than file
and line.
(selftest::fail): Likewise.
(selftest::fail_formatted): Likewise.
(selftest::assert_streq): Likewise.
(ASSERT_TRUE): Update for above changes, using SELFTEST_LOCATION.
(ASSERT_FALSE): Likewise.
(ASSERT_EQ): Likewise.
(ASSERT_NE): Likewise.
(ASSERT_STREQ): Likewise.
(ASSERT_PRED1): Likewise.
(ASSERT_STREQ_AT): New macro.
From-SVN: r237410
Diffstat (limited to 'gcc/input.c')
| -rw-r--r-- | gcc/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/input.c b/gcc/input.c index e872cf0..1d004f8 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -1231,10 +1231,10 @@ test_reading_source_line () ASSERT_EQ (53, line_size); if (!strncmp (" The quick brown fox jumps over the lazy dog. */", source_line, line_size)) - ::selftest::pass (__FILE__, __LINE__, + ::selftest::pass (SELFTEST_LOCATION, "source_line matched expected value"); else - ::selftest::fail (__FILE__, __LINE__, + ::selftest::fail (SELFTEST_LOCATION, "source_line did not match expected value"); } |