OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bootstrap: fix failing diagnostic selftest on Windows [PR98696] 

In one of the selftests in g:f10960558540636800cf5d3d6355969621fbc17e
I didn't consider that paths can contain backslashes, which happens
for the tempfiles on Windows hosts.

gcc/ChangeLog:
	PR bootstrap/98696
	* diagnostic.c
	(selftest::test_print_parseable_fixits_bytes_vs_display_columns):
	Escape the tempfile name when constructing the expected output.
This commit is contained in:
David Malcolm 2021-01-15 13:26:39 -05:00
parent adb520606c
commit a3128bf012
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/diagnostic.c
View File

@ -2188,7 +2188,12 @@ test_print_parseable_fixits_bytes_vs_display_columns ()
where.m_finish = linemap_position_for_column (line_table, 17);
richloc.add_fixit_replace (where, "color");
const int buf_len = strlen (fname) + 100;
/* Escape fname. */
pretty_printer tmp_pp;
print_escaped_string (&tmp_pp, fname);
char *escaped_fname = xstrdup (pp_formatted_text (&tmp_pp));
const int buf_len = strlen (escaped_fname) + 100;
char *const expected = XNEWVEC (char, buf_len);
{
@ -2196,7 +2201,7 @@ test_print_parseable_fixits_bytes_vs_display_columns ()
print_parseable_fixits (&pp, &richloc, DIAGNOSTICS_COLUMN_UNIT_BYTE,
tabstop);
snprintf (expected, buf_len,
"fix-it:\"%s\":{1:12-1:18}:\"color\"\n", fname);
"fix-it:%s:{1:12-1:18}:\"color\"\n", escaped_fname);
ASSERT_STREQ (expected, pp_formatted_text (&pp));
}
{
@ -2204,11 +2209,12 @@ test_print_parseable_fixits_bytes_vs_display_columns ()
print_parseable_fixits (&pp, &richloc, DIAGNOSTICS_COLUMN_UNIT_DISPLAY,
tabstop);
snprintf (expected, buf_len,
"fix-it:\"%s\":{1:10-1:16}:\"color\"\n", fname);
"fix-it:%s:{1:10-1:16}:\"color\"\n", escaped_fname);
ASSERT_STREQ (expected, pp_formatted_text (&pp));
}
XDELETEVEC (expected);
free (escaped_fname);
}
/* Verify that