From 85ecd05c26d107921b166374dd77c40a393312c8 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 13 Jun 2016 21:20:10 +0000 Subject: [PATCH] PR bootstrap/71481: fix input.c selftest gcc/ChangeLog: PR bootstrap/71481 * input.c (selftest::test_reading_source_line): Avoid reading from __FILE__ by creating a tempfile with known content and reading from that instead. From-SVN: r237414 --- gcc/ChangeLog | 7 +++++++ gcc/input.c | 31 +++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cfad51813b0..7486c3245d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-06-13 David Malcolm + + PR bootstrap/71481 + * input.c (selftest::test_reading_source_line): Avoid reading from + __FILE__ by creating a tempfile with known content and reading + from that instead. + 2016-06-13 David Malcolm * pretty-print.c (assert_pp_format_colored): Skip the test if diff --git a/gcc/input.c b/gcc/input.c index 1d004f8cd73..3fb4a2586b0 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -1219,23 +1219,34 @@ test_builtins () static void test_reading_source_line () { - /* We will read *this* source file, using __FILE__. - Here is some specific text to read and test for: - The quick brown fox jumps over the lazy dog. */ - const int linenum_after_test_message = __LINE__; - const int linenum = linenum_after_test_message - 1; - + /* Create a tempfile and write some text to it. */ + char *filename = make_temp_file (".txt"); + ASSERT_NE (filename, NULL); + FILE *out = fopen (filename, "w"); + if (!out) + ::selftest::fail_formatted (SELFTEST_LOCATION, + "unable to open tempfile: %s", filename); + fprintf (out, + "01234567890123456789\n" + "This is the test text\n" + "This is the 3rd line\n"); + fclose (out); + + /* Read back a specific line from the tempfile. */ int line_size; - const char *source_line = location_get_source_line (__FILE__, linenum, &line_size); + const char *source_line = location_get_source_line (filename, 2, &line_size); ASSERT_TRUE (source_line != NULL); - ASSERT_EQ (53, line_size); - if (!strncmp (" The quick brown fox jumps over the lazy dog. */", - source_line, line_size)) + ASSERT_EQ (21, line_size); + if (!strncmp ("This is the test text", + source_line, line_size)) ::selftest::pass (SELFTEST_LOCATION, "source_line matched expected value"); else ::selftest::fail (SELFTEST_LOCATION, "source_line did not match expected value"); + + unlink (filename); + free (filename); } /* Run all of the selftests within this file. */ -- 2.30.2