Commit 2cfe4dc
Carolyn Zech
Fix
#3968 [failed in the merge
queue](https://github.com/model-checking/kani/actions/runs/14180398658/job/39724995535)
because the `cargo_autoharness_termination` test assumed that the
recursion test wouldn't time out, but it did. This doesn't happen often,
since this test has worked up until now, but in the interest of having
robust tests, this PR splits the termination test into two:
- `autoharness_timeout`, which tests that the default timeout of 60s
kicks in
- `autoharness_unwind`, which tests that the default unwind bound of 20
kicks in
The unwind test specifies a timeout of 5m to ensure that the unwind
bound takes effect before the timeout.
While I was fixing this, I also fixed some inconsistencies with the
printed metadata:
- We use "Chosen Function" in one table and "Selected Function" in
another--changed it to "Selected Function" in both to be consistent
- The functions aren't printed alphabetically in 2/3 tables--fixed so
that they're always sorted
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.autoharness termination test & print metadata in alphabetical order (#3971)1 parent 6e9cb87 commit 2cfe4dc
File tree
22 files changed
+253
-210
lines changed- kani-compiler/src/kani_middle
- kani-driver/src/autoharness
- kani_metadata/src
- tests/script-based-pre
- cargo_autoharness_contracts
- cargo_autoharness_dependencies
- cargo_autoharness_exclude
- cargo_autoharness_filter
- cargo_autoharness_harnesses_fail
- cargo_autoharness_include
- cargo_autoharness_list
- cargo_autoharness_termination_timeout
- src
- cargo_autoharness_termination_unwind
- src
- cargo_autoharness_termination
- src
22 files changed
+253
-210
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
96 | 95 | | |
97 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
98 | 100 | | |
99 | 101 | | |
100 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
86 | | - | |
| 86 | + | |
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
181 | | - | |
| 181 | + | |
| 182 | + | |
182 | 183 | | |
183 | 184 | | |
184 | 185 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
49 | | - | |
| 50 | + | |
50 | 51 | | |
51 | | - | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
Lines changed: 7 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| |||
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
0 commit comments