Skip to content

Commit e75dcd2

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent 69a1a87 commit e75dcd2

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

‎cpp/ql/test/library-tests/dataflow/external-models/flow.expected

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ edges
1313
| test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | provenance | MaD:969 |
1414
| test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | provenance | MaD:970 |
1515
| test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | provenance | MaD:971 |
16-
| test.cpp:7:5:7:30 | [summary param] 0 in ymlStepGenerated_with_body | test.cpp:7:5:7:30 | [summary] to write: ReturnValue in ymlStepGenerated_with_body | provenance | MaD:972 |
16+
| test.cpp:7:47:7:52 | value2 | test.cpp:7:64:7:69 | value2 | provenance | |
17+
| test.cpp:7:64:7:69 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | provenance | |
1718
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:10:10:10:18 | call to ymlSource | provenance | Src:MaD:967 |
1819
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:14:10:14:10 | x | provenance | Sink:MaD:968 |
1920
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:17:24:17:24 | x | provenance | |
2021
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:21:27:21:27 | x | provenance | |
2122
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:25:35:25:35 | x | provenance | |
22-
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:35:38:35:38 | x | provenance | |
23+
| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:32:41:32:41 | x | provenance | |
2324
| test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual | provenance | |
2425
| test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:18:10:18:10 | y | provenance | Sink:MaD:968 |
2526
| test.cpp:17:24:17:24 | x | test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | provenance | |
@@ -32,10 +33,10 @@ edges
3233
| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:26:10:26:11 | y2 | provenance | Sink:MaD:968 |
3334
| test.cpp:25:35:25:35 | x | test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | provenance | |
3435
| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance | MaD:971 |
35-
| test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body | test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body | provenance | |
36-
| test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body | test.cpp:36:10:36:11 | z3 | provenance | Sink:MaD:968 |
37-
| test.cpp:35:38:35:38 | x | test.cpp:7:5:7:30 | [summary param] 0 in ymlStepGenerated_with_body | provenance | |
38-
| test.cpp:35:38:35:38 | x | test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body | provenance | MaD:972 |
36+
| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance | |
37+
| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:33:10:33:11 | z2 | provenance | Sink:MaD:968 |
38+
| test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | provenance | |
39+
| test.cpp:32:41:32:41 | x | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance | |
3940
nodes
4041
| asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | semmle.label | [summary param] *0 in buffer |
4142
| asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | semmle.label | [summary] to write: ReturnValue in buffer |
@@ -55,8 +56,9 @@ nodes
5556
| test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | semmle.label | [summary] to write: ReturnValue in ymlStepGenerated |
5657
| test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | semmle.label | [summary param] 0 in ymlStepManual_with_body |
5758
| test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | semmle.label | [summary] to write: ReturnValue in ymlStepManual_with_body |
58-
| test.cpp:7:5:7:30 | [summary param] 0 in ymlStepGenerated_with_body | semmle.label | [summary param] 0 in ymlStepGenerated_with_body |
59-
| test.cpp:7:5:7:30 | [summary] to write: ReturnValue in ymlStepGenerated_with_body | semmle.label | [summary] to write: ReturnValue in ymlStepGenerated_with_body |
59+
| test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | semmle.label | *ymlStepGenerated_with_body |
60+
| test.cpp:7:47:7:52 | value2 | semmle.label | value2 |
61+
| test.cpp:7:64:7:69 | value2 | semmle.label | value2 |
6062
| test.cpp:10:10:10:18 | call to ymlSource | semmle.label | call to ymlSource |
6163
| test.cpp:10:10:10:18 | call to ymlSource | semmle.label | call to ymlSource |
6264
| test.cpp:14:10:14:10 | x | semmle.label | x |
@@ -72,13 +74,13 @@ nodes
7274
| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | semmle.label | call to ymlStepManual_with_body |
7375
| test.cpp:25:35:25:35 | x | semmle.label | x |
7476
| test.cpp:26:10:26:11 | y2 | semmle.label | y2 |
75-
| test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
76-
| test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
77-
| test.cpp:35:38:35:38 | x | semmle.label | x |
78-
| test.cpp:36:10:36:11 | z3 | semmle.label | z3 |
77+
| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
78+
| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
79+
| test.cpp:32:41:32:41 | x | semmle.label | x |
80+
| test.cpp:33:10:33:11 | z2 | semmle.label | z2 |
7981
subpaths
8082
| asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | asio_streams.cpp:100:44:100:62 | call to buffer |
8183
| test.cpp:17:24:17:24 | x | test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual |
8284
| test.cpp:21:27:21:27 | x | test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | test.cpp:21:10:21:25 | call to ymlStepGenerated |
8385
| test.cpp:25:35:25:35 | x | test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | test.cpp:25:11:25:33 | call to ymlStepManual_with_body |
84-
| test.cpp:35:38:35:38 | x | test.cpp:7:5:7:30 | [summary param] 0 in ymlStepGenerated_with_body | test.cpp:7:5:7:30 | [summary] to write: ReturnValue in ymlStepGenerated_with_body | test.cpp:35:11:35:36 | call to ymlStepGenerated_with_body |
86+
| test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body |

‎cpp/ql/test/library-tests/dataflow/external-models/test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ void test() {
3030

3131
// ymlStepGenerated_with_body is modeled by the model generator so we should use the model only if there is no body
3232
int z2 = ymlStepGenerated_with_body(0, x);
33-
ymlSink(z2); // $ MISSING: ir
33+
ymlSink(z2); // $ ir
3434

3535
int z3 = ymlStepGenerated_with_body(x, 0);
36-
ymlSink(z3); // $ SPURIOUS: ir
36+
ymlSink(z3); // clean
3737
}

0 commit comments

Comments
 (0)