Skip to content

Commit 4350cc4

Browse files
committed
Make regexes windows compatible
Lines are separated with `\r\n` on windows, rather than just `\n`. So we need to match both kinds of separator in order to be platform independant. As we don't require the xml elements to be on separate lines and `\s` already matches both `\r` and `\n` we can just let `\s*` match all the line separators as well as any indentation characters.
1 parent 8d69682 commit 4350cc4

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

regression/cbmc/integral-trace/test.desc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ activate-multi-line-match
55
^EXIT=10$
66
^SIGNAL=0$
77
VERIFICATION FAILED
8-
<full_lhs>u8</full_lhs>\n\s*<full_lhs_value binary="01100001">97</full_lhs_value>
9-
<full_lhs>u16</full_lhs>\n\s*<full_lhs_value binary="0{12}1000">8</full_lhs_value>
10-
<full_lhs>u32</full_lhs>\n\s*<full_lhs_value binary="0{27}10000">16u</full_lhs_value>
11-
<full_lhs>u64</full_lhs>\n\s*<full_lhs_value binary="0{58}100000">32ul</full_lhs_value>
12-
<full_lhs>i1</full_lhs>\n\s*<full_lhs_value binary="0{6}10">2</full_lhs_value>
13-
<full_lhs>i2</full_lhs>\n\s*<full_lhs_value binary="0{14}11">3</full_lhs_value>
14-
<full_lhs>i3</full_lhs>\n\s*<full_lhs_value binary="0{29}100">4</full_lhs_value>
15-
<full_lhs>i4</full_lhs>\n\s*<full_lhs_value binary="0{61}101">5l</full_lhs_value>
16-
<full_lhs>in1</full_lhs>\n\s*<full_lhs_value binary="1{6}10">-2</full_lhs_value>
17-
<full_lhs>in2</full_lhs>\n\s*<full_lhs_value binary="1{14}01">-3</full_lhs_value>
18-
<full_lhs>in3</full_lhs>\n\s*<full_lhs_value binary="1{29}100">-4</full_lhs_value>
19-
<full_lhs>in4</full_lhs>\n\s*<full_lhs_value binary="1{61}011">-5l</full_lhs_value>
8+
<full_lhs>u8</full_lhs>\s*<full_lhs_value binary="01100001">97</full_lhs_value>
9+
<full_lhs>u16</full_lhs>\s*<full_lhs_value binary="0{12}1000">8</full_lhs_value>
10+
<full_lhs>u32</full_lhs>\s*<full_lhs_value binary="0{27}10000">16u</full_lhs_value>
11+
<full_lhs>u64</full_lhs>\s*<full_lhs_value binary="0{58}100000">32ul</full_lhs_value>
12+
<full_lhs>i1</full_lhs>\s*<full_lhs_value binary="0{6}10">2</full_lhs_value>
13+
<full_lhs>i2</full_lhs>\s*<full_lhs_value binary="0{14}11">3</full_lhs_value>
14+
<full_lhs>i3</full_lhs>\s*<full_lhs_value binary="0{29}100">4</full_lhs_value>
15+
<full_lhs>i4</full_lhs>\s*<full_lhs_value binary="0{61}101">5l</full_lhs_value>
16+
<full_lhs>in1</full_lhs>\s*<full_lhs_value binary="1{6}10">-2</full_lhs_value>
17+
<full_lhs>in2</full_lhs>\s*<full_lhs_value binary="1{14}01">-3</full_lhs_value>
18+
<full_lhs>in3</full_lhs>\s*<full_lhs_value binary="1{29}100">-4</full_lhs_value>
19+
<full_lhs>in4</full_lhs>\s*<full_lhs_value binary="1{61}011">-5l</full_lhs_value>
2020
--
2121
--
2222
Checks that the binary value is printed for integral types.

0 commit comments

Comments
 (0)