Skip to content

Commit f25f070

Browse files
committed
sort value-set output
value=-set ordering is unstable in the face of code changes, which made tests fragile. Sorting output fixes that and is also easier on the human eye too. We're sorting string representations, so the output isn't a true numerical sort but it's good enough.
1 parent 1d6640f commit f25f070

File tree

37 files changed

+166
-77
lines changed

37 files changed

+166
-77
lines changed

regression/goto-analyzer/ternary-operator-value-sets/test.desc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ main.c
33
--variable-sensitivity --vsd-values set-of-constants --show
44
^EXIT=0$
55
^SIGNAL=0$
6-
main::1::b1 \(\) -> value-set-begin: TRUE, :value-set-end
7-
main::1::b2 \(\) -> value-set-begin: FALSE, :value-set-end
8-
main::1::b3 \(\) -> value-set-begin: FALSE, TRUE, :value-set-end
9-
main::1::i \(\) -> value-set-begin: 10, :value-set-end
10-
main::1::j \(\) -> value-set-begin: 20, :value-set-end
11-
main::1::k \(\) -> value-set-begin: 10, 20, :value-set-end
6+
main::1::b1 \(\) -> value-set-begin: TRUE :value-set-end
7+
main::1::b2 \(\) -> value-set-begin: FALSE :value-set-end
8+
main::1::b3 \(\) -> value-set-begin: TRUE, FALSE :value-set-end
9+
main::1::i \(\) -> value-set-begin: 10 :value-set-end
10+
main::1::j \(\) -> value-set-begin: 20 :value-set-end
11+
main::1::k \(\) -> value-set-begin: 10, 20 :value-set-end
1212
--

regression/goto-analyzer/value-set-addition-01/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
int main(int argc, char argv[]) {
1+
int main(int argc, char argv[])
2+
{
23
int p = 1;
34

45
int q = p + 2;

regression/goto-analyzer/value-set-addition-01/test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ main.c
33
--variable-sensitivity --vsd-values set-of-constants --show
44
^EXIT=0$
55
^SIGNAL=0$
6-
main::1::p .* value-set-begin: 1, :value-set-end
7-
main::1::q .* value-set-begin: 3, :value-set-end
6+
main::1::p .* value-set-begin: 1 :value-set-end
7+
main::1::q .* value-set-begin: 3 :value-set-end
88
--

regression/goto-analyzer/value-set-addition-02/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
int main(int argc, char argv[]) {
1+
int main(int argc, char argv[])
2+
{
23
int p = 2;
34
int q = 3;
45

regression/goto-analyzer/value-set-addition-02/test.desc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ main.c
33
--variable-sensitivity --vsd-values set-of-constants --show
44
^EXIT=0$
55
^SIGNAL=0$
6-
main::1::p .* value-set-begin: 2, :value-set-end
7-
main::1::q .* value-set-begin: 3, :value-set-end
8-
main::1::t .* value-set-begin: 5, :value-set-end
6+
main::1::p .* value-set-begin: 2 :value-set-end
7+
main::1::q .* value-set-begin: 3 :value-set-end
8+
main::1::t .* value-set-begin: 5 :value-set-end
99
--

regression/goto-analyzer/value-set-addition-03/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
int unknown();
22

3-
int main(int argc, char argv[]) {
3+
int main(int argc, char argv[])
4+
{
45
int p = 2;
56

67
if (unknown())

regression/goto-analyzer/value-set-addition-03/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ main.c
33
--variable-sensitivity --vsd-values set-of-constants --show
44
^EXIT=0$
55
^SIGNAL=0$
6-
main::1::p .* value-set-begin: 4, 5, :value-set-end
6+
main::1::p .* value-set-begin: 4, 5 :value-set-end
77
--

regression/goto-analyzer/value-set-addition-04/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
int unknown();
22

3-
int main(int argc, char argv[]) {
3+
int main(int argc, char argv[])
4+
{
45
int p = 2;
56
int q = 3;
67

regression/goto-analyzer/value-set-addition-04/test.desc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ main.c
33
--variable-sensitivity --vsd-values set-of-constants --show
44
^EXIT=0$
55
^SIGNAL=0$
6-
main::1::p .* value-set-begin: 2, :value-set-end
7-
main::1::q .* value-set-begin: 3, :value-set-end
8-
main::1::p .* value-set-begin: 4, 5, :value-set-end
9-
main::1::t .* value-set-begin: 7, 8, :value-set-end
6+
main::1::p .* value-set-begin: 2 :value-set-end
7+
main::1::q .* value-set-begin: 3 :value-set-end
8+
main::1::p .* value-set-begin: 4, 5 :value-set-end
9+
main::1::t .* value-set-begin: 7, 8 :value-set-end
1010
--

regression/goto-analyzer/value-set-addition-05/test.desc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ main.c
33
--variable-sensitivity --vsd-values set-of-constants --show
44
^EXIT=0$
55
^SIGNAL=0$
6-
main::1::p .* value-set-begin: 2, 3, :value-set-end
7-
main::1::q .* value-set-begin: 5, 10, :value-set-end
8-
main::1::t .* value-set-begin: 7, 12, 8, 13, :value-set-end
6+
main::1::p .* value-set-begin: 2, 3 :value-set-end
7+
main::1::q .* value-set-begin: 5, 10 :value-set-end
8+
main::1::t .* value-set-begin: 7, 8, 12, 13 :value-set-end
99
--

0 commit comments

Comments
 (0)