Skip to content

Commit cde34c9

Browse files
MathiasVPMathiasVP
committed
C++: Accept test output which I previously forgot to accept
1 parent daac5c5 commit cde34c9

File tree

3 files changed

+34
-63
lines changed

3 files changed

+34
-63
lines changed

‎cpp/ql/test/library-tests/dataflow/fields/ir-flow.expected

Lines changed: 30 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,41 @@
11
edges
2-
| aliasing.cpp:37:3:37:24 | Store : void | aliasing.cpp:38:11:38:12 | m1 |
3-
| aliasing.cpp:37:13:37:22 | call to user_input : void | aliasing.cpp:37:3:37:24 | Store : void |
4-
| aliasing.cpp:37:13:37:22 | call to user_input : void | aliasing.cpp:38:11:38:12 | m1 |
5-
| aliasing.cpp:42:3:42:22 | Store : void | aliasing.cpp:43:13:43:14 | m1 |
6-
| aliasing.cpp:42:11:42:20 | call to user_input : void | aliasing.cpp:42:3:42:22 | Store : void |
7-
| aliasing.cpp:42:11:42:20 | call to user_input : void | aliasing.cpp:43:13:43:14 | m1 |
8-
| aliasing.cpp:60:3:60:22 | Chi [m1] : void | aliasing.cpp:61:13:61:14 | Store [m1] : void |
9-
| aliasing.cpp:60:3:60:22 | Store : void | aliasing.cpp:60:3:60:22 | Chi [m1] : void |
10-
| aliasing.cpp:60:11:60:20 | call to user_input : void | aliasing.cpp:60:3:60:22 | Store : void |
11-
| aliasing.cpp:61:13:61:14 | Store [m1] : void | aliasing.cpp:62:14:62:15 | m1 |
12-
| aliasing.cpp:79:3:79:22 | Store : void | aliasing.cpp:80:12:80:13 | m1 |
13-
| aliasing.cpp:79:11:79:20 | call to user_input : void | aliasing.cpp:79:3:79:22 | Store : void |
14-
| aliasing.cpp:79:11:79:20 | call to user_input : void | aliasing.cpp:80:12:80:13 | m1 |
15-
| aliasing.cpp:86:3:86:21 | Store : void | aliasing.cpp:87:12:87:13 | m1 |
16-
| aliasing.cpp:86:10:86:19 | call to user_input : void | aliasing.cpp:86:3:86:21 | Store : void |
17-
| aliasing.cpp:86:10:86:19 | call to user_input : void | aliasing.cpp:87:12:87:13 | m1 |
18-
| aliasing.cpp:92:3:92:23 | Store : void | aliasing.cpp:93:12:93:13 | m1 |
19-
| aliasing.cpp:92:12:92:21 | call to user_input : void | aliasing.cpp:92:3:92:23 | Store : void |
20-
| aliasing.cpp:92:12:92:21 | call to user_input : void | aliasing.cpp:93:12:93:13 | m1 |
21-
| struct_init.c:20:20:20:29 | Store : void | struct_init.c:22:11:22:11 | a |
22-
| struct_init.c:20:20:20:29 | call to user_input : void | struct_init.c:20:20:20:29 | Store : void |
23-
| struct_init.c:20:20:20:29 | call to user_input : void | struct_init.c:22:11:22:11 | a |
24-
| struct_init.c:27:7:27:16 | Store : void | struct_init.c:31:23:31:23 | a |
25-
| struct_init.c:27:7:27:16 | call to user_input : void | struct_init.c:27:7:27:16 | Store : void |
26-
| struct_init.c:27:7:27:16 | call to user_input : void | struct_init.c:31:23:31:23 | a |
2+
| aliasing.cpp:37:13:37:22 | call to user_input | aliasing.cpp:38:11:38:12 | m1 |
3+
| aliasing.cpp:42:11:42:20 | call to user_input | aliasing.cpp:43:13:43:14 | m1 |
4+
| aliasing.cpp:60:3:60:22 | Chi [m1] | aliasing.cpp:61:13:61:14 | Store [m1] |
5+
| aliasing.cpp:60:3:60:22 | Store | aliasing.cpp:60:3:60:22 | Chi [m1] |
6+
| aliasing.cpp:60:11:60:20 | call to user_input | aliasing.cpp:60:3:60:22 | Store |
7+
| aliasing.cpp:61:13:61:14 | Store [m1] | aliasing.cpp:62:14:62:15 | m1 |
8+
| aliasing.cpp:79:11:79:20 | call to user_input | aliasing.cpp:80:12:80:13 | m1 |
9+
| aliasing.cpp:86:10:86:19 | call to user_input | aliasing.cpp:87:12:87:13 | m1 |
10+
| aliasing.cpp:92:12:92:21 | call to user_input | aliasing.cpp:93:12:93:13 | m1 |
11+
| struct_init.c:20:20:20:29 | call to user_input | struct_init.c:22:11:22:11 | a |
12+
| struct_init.c:27:7:27:16 | call to user_input | struct_init.c:31:23:31:23 | a |
2713
nodes
28-
| aliasing.cpp:37:3:37:24 | Store : void | semmle.label | Store : void |
29-
| aliasing.cpp:37:13:37:22 | call to user_input : void | semmle.label | call to user_input : void |
14+
| aliasing.cpp:37:13:37:22 | call to user_input | semmle.label | call to user_input |
3015
| aliasing.cpp:38:11:38:12 | m1 | semmle.label | m1 |
31-
| aliasing.cpp:42:3:42:22 | Store : void | semmle.label | Store : void |
32-
| aliasing.cpp:42:11:42:20 | call to user_input : void | semmle.label | call to user_input : void |
16+
| aliasing.cpp:42:11:42:20 | call to user_input | semmle.label | call to user_input |
3317
| aliasing.cpp:43:13:43:14 | m1 | semmle.label | m1 |
34-
| aliasing.cpp:60:3:60:22 | Chi [m1] : void | semmle.label | Chi [m1] : void |
35-
| aliasing.cpp:60:3:60:22 | Store : void | semmle.label | Store : void |
36-
| aliasing.cpp:60:11:60:20 | call to user_input : void | semmle.label | call to user_input : void |
37-
| aliasing.cpp:61:13:61:14 | Store [m1] : void | semmle.label | Store [m1] : void |
18+
| aliasing.cpp:60:3:60:22 | Chi [m1] | semmle.label | Chi [m1] |
19+
| aliasing.cpp:60:3:60:22 | Store | semmle.label | Store |
20+
| aliasing.cpp:60:11:60:20 | call to user_input | semmle.label | call to user_input |
21+
| aliasing.cpp:61:13:61:14 | Store [m1] | semmle.label | Store [m1] |
3822
| aliasing.cpp:62:14:62:15 | m1 | semmle.label | m1 |
39-
| aliasing.cpp:79:3:79:22 | Store : void | semmle.label | Store : void |
40-
| aliasing.cpp:79:11:79:20 | call to user_input : void | semmle.label | call to user_input : void |
23+
| aliasing.cpp:79:11:79:20 | call to user_input | semmle.label | call to user_input |
4124
| aliasing.cpp:80:12:80:13 | m1 | semmle.label | m1 |
42-
| aliasing.cpp:86:3:86:21 | Store : void | semmle.label | Store : void |
43-
| aliasing.cpp:86:10:86:19 | call to user_input : void | semmle.label | call to user_input : void |
25+
| aliasing.cpp:86:10:86:19 | call to user_input | semmle.label | call to user_input |
4426
| aliasing.cpp:87:12:87:13 | m1 | semmle.label | m1 |
45-
| aliasing.cpp:92:3:92:23 | Store : void | semmle.label | Store : void |
46-
| aliasing.cpp:92:12:92:21 | call to user_input : void | semmle.label | call to user_input : void |
27+
| aliasing.cpp:92:12:92:21 | call to user_input | semmle.label | call to user_input |
4728
| aliasing.cpp:93:12:93:13 | m1 | semmle.label | m1 |
48-
| struct_init.c:20:20:20:29 | Store : void | semmle.label | Store : void |
49-
| struct_init.c:20:20:20:29 | call to user_input : void | semmle.label | call to user_input : void |
29+
| struct_init.c:20:20:20:29 | call to user_input | semmle.label | call to user_input |
5030
| struct_init.c:22:11:22:11 | a | semmle.label | a |
51-
| struct_init.c:27:7:27:16 | Store : void | semmle.label | Store : void |
52-
| struct_init.c:27:7:27:16 | call to user_input : void | semmle.label | call to user_input : void |
31+
| struct_init.c:27:7:27:16 | call to user_input | semmle.label | call to user_input |
5332
| struct_init.c:31:23:31:23 | a | semmle.label | a |
5433
#select
55-
| aliasing.cpp:38:11:38:12 | m1 | aliasing.cpp:37:13:37:22 | call to user_input : void | aliasing.cpp:38:11:38:12 | m1 | m1 flows from $@ | aliasing.cpp:37:13:37:22 | call to user_input : void | call to user_input : void |
56-
| aliasing.cpp:43:13:43:14 | m1 | aliasing.cpp:42:11:42:20 | call to user_input : void | aliasing.cpp:43:13:43:14 | m1 | m1 flows from $@ | aliasing.cpp:42:11:42:20 | call to user_input : void | call to user_input : void |
57-
| aliasing.cpp:62:14:62:15 | m1 | aliasing.cpp:60:11:60:20 | call to user_input : void | aliasing.cpp:62:14:62:15 | m1 | m1 flows from $@ | aliasing.cpp:60:11:60:20 | call to user_input : void | call to user_input : void |
58-
| aliasing.cpp:80:12:80:13 | m1 | aliasing.cpp:79:11:79:20 | call to user_input : void | aliasing.cpp:80:12:80:13 | m1 | m1 flows from $@ | aliasing.cpp:79:11:79:20 | call to user_input : void | call to user_input : void |
59-
| aliasing.cpp:87:12:87:13 | m1 | aliasing.cpp:86:10:86:19 | call to user_input : void | aliasing.cpp:87:12:87:13 | m1 | m1 flows from $@ | aliasing.cpp:86:10:86:19 | call to user_input : void | call to user_input : void |
60-
| aliasing.cpp:93:12:93:13 | m1 | aliasing.cpp:92:12:92:21 | call to user_input : void | aliasing.cpp:93:12:93:13 | m1 | m1 flows from $@ | aliasing.cpp:92:12:92:21 | call to user_input : void | call to user_input : void |
61-
| struct_init.c:22:11:22:11 | a | struct_init.c:20:20:20:29 | call to user_input : void | struct_init.c:22:11:22:11 | a | a flows from $@ | struct_init.c:20:20:20:29 | call to user_input : void | call to user_input : void |
62-
| struct_init.c:31:23:31:23 | a | struct_init.c:27:7:27:16 | call to user_input : void | struct_init.c:31:23:31:23 | a | a flows from $@ | struct_init.c:27:7:27:16 | call to user_input : void | call to user_input : void |
34+
| aliasing.cpp:38:11:38:12 | m1 | aliasing.cpp:37:13:37:22 | call to user_input | aliasing.cpp:38:11:38:12 | m1 | m1 flows from $@ | aliasing.cpp:37:13:37:22 | call to user_input | call to user_input |
35+
| aliasing.cpp:43:13:43:14 | m1 | aliasing.cpp:42:11:42:20 | call to user_input | aliasing.cpp:43:13:43:14 | m1 | m1 flows from $@ | aliasing.cpp:42:11:42:20 | call to user_input | call to user_input |
36+
| aliasing.cpp:62:14:62:15 | m1 | aliasing.cpp:60:11:60:20 | call to user_input | aliasing.cpp:62:14:62:15 | m1 | m1 flows from $@ | aliasing.cpp:60:11:60:20 | call to user_input | call to user_input |
37+
| aliasing.cpp:80:12:80:13 | m1 | aliasing.cpp:79:11:79:20 | call to user_input | aliasing.cpp:80:12:80:13 | m1 | m1 flows from $@ | aliasing.cpp:79:11:79:20 | call to user_input | call to user_input |
38+
| aliasing.cpp:87:12:87:13 | m1 | aliasing.cpp:86:10:86:19 | call to user_input | aliasing.cpp:87:12:87:13 | m1 | m1 flows from $@ | aliasing.cpp:86:10:86:19 | call to user_input | call to user_input |
39+
| aliasing.cpp:93:12:93:13 | m1 | aliasing.cpp:92:12:92:21 | call to user_input | aliasing.cpp:93:12:93:13 | m1 | m1 flows from $@ | aliasing.cpp:92:12:92:21 | call to user_input | call to user_input |
40+
| struct_init.c:22:11:22:11 | a | struct_init.c:20:20:20:29 | call to user_input | struct_init.c:22:11:22:11 | a | a flows from $@ | struct_init.c:20:20:20:29 | call to user_input | call to user_input |
41+
| struct_init.c:31:23:31:23 | a | struct_init.c:27:7:27:16 | call to user_input | struct_init.c:31:23:31:23 | a | a flows from $@ | struct_init.c:27:7:27:16 | call to user_input | call to user_input |

‎cpp/ql/test/library-tests/literals/literals/literals.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
| literals.c:3:13:3:16 | 1.0 |
33
| literals.c:4:13:4:16 | 1.0 |
44
| literals.c:5:13:5:16 | 1.0 |
5-
| literals.c:6:13:6:16 | (1.0,1.0i) |
6-
| literals.c:7:13:7:16 | (1.0,1.0i) |
7-
| literals.c:8:13:8:16 | (1.0,1.0i) |
8-
| literals.c:9:13:9:16 | (1.0,1.0i) |
5+
| literals.c:6:13:6:16 | (0.0,1.0i) |
6+
| literals.c:7:13:7:16 | (0.0,1.0i) |
7+
| literals.c:8:13:8:16 | (0.0,1.0i) |
8+
| literals.c:9:13:9:16 | (0.0,1.0i) |
99
| literals.c:10:13:10:16 | 1.0 |
1010
| literals.c:11:13:11:16 | 1.0 |
1111
| literals.c:12:13:12:16 | 1.0 |

‎cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/funcs/funcsLocal.expected

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ edges
1717
| funcsLocal.c:31:13:31:17 | call to fgets | funcsLocal.c:32:9:32:10 | i4 |
1818
| funcsLocal.c:31:13:31:17 | call to fgets | funcsLocal.c:32:9:32:10 | i4 |
1919
| funcsLocal.c:31:13:31:17 | call to fgets | funcsLocal.c:32:9:32:10 | i4 |
20-
| funcsLocal.c:31:13:31:17 | call to fgets | funcsLocal.c:32:9:32:10 | i4 |
21-
| funcsLocal.c:31:13:31:17 | call to fgets | funcsLocal.c:32:9:32:10 | i4 |
2220
| funcsLocal.c:31:19:31:21 | fgets output argument | funcsLocal.c:32:9:32:10 | (const char *)... |
2321
| funcsLocal.c:31:19:31:21 | fgets output argument | funcsLocal.c:32:9:32:10 | i4 |
2422
| funcsLocal.c:31:19:31:21 | i41 | funcsLocal.c:32:9:32:10 | (const char *)... |
2523
| funcsLocal.c:31:19:31:21 | i41 | funcsLocal.c:32:9:32:10 | i4 |
26-
| funcsLocal.c:32:9:32:10 | i4 | funcsLocal.c:32:9:32:10 | (const char *)... |
27-
| funcsLocal.c:32:9:32:10 | i4 | funcsLocal.c:32:9:32:10 | i4 |
2824
| funcsLocal.c:36:7:36:8 | gets output argument | funcsLocal.c:37:9:37:10 | (const char *)... |
2925
| funcsLocal.c:36:7:36:8 | gets output argument | funcsLocal.c:37:9:37:10 | i5 |
3026
| funcsLocal.c:36:7:36:8 | i5 | funcsLocal.c:37:9:37:10 | (const char *)... |
@@ -35,14 +31,10 @@ edges
3531
| funcsLocal.c:41:13:41:16 | call to gets | funcsLocal.c:42:9:42:10 | i6 |
3632
| funcsLocal.c:41:13:41:16 | call to gets | funcsLocal.c:42:9:42:10 | i6 |
3733
| funcsLocal.c:41:13:41:16 | call to gets | funcsLocal.c:42:9:42:10 | i6 |
38-
| funcsLocal.c:41:13:41:16 | call to gets | funcsLocal.c:42:9:42:10 | i6 |
39-
| funcsLocal.c:41:13:41:16 | call to gets | funcsLocal.c:42:9:42:10 | i6 |
4034
| funcsLocal.c:41:18:41:20 | gets output argument | funcsLocal.c:42:9:42:10 | (const char *)... |
4135
| funcsLocal.c:41:18:41:20 | gets output argument | funcsLocal.c:42:9:42:10 | i6 |
4236
| funcsLocal.c:41:18:41:20 | i61 | funcsLocal.c:42:9:42:10 | (const char *)... |
4337
| funcsLocal.c:41:18:41:20 | i61 | funcsLocal.c:42:9:42:10 | i6 |
44-
| funcsLocal.c:42:9:42:10 | i6 | funcsLocal.c:42:9:42:10 | (const char *)... |
45-
| funcsLocal.c:42:9:42:10 | i6 | funcsLocal.c:42:9:42:10 | i6 |
4638
nodes
4739
| funcsLocal.c:16:8:16:9 | fread output argument | semmle.label | fread output argument |
4840
| funcsLocal.c:16:8:16:9 | i1 | semmle.label | i1 |

0 commit comments

Comments
 (0)