Trivial changes to the tests

A collection of typos in the tests.

Author: thk123

regression/goto-analyzer/sensitivity-test-common-files/array_of_array_sensitivity_tests.c

@@ -55,7 +55,10 @@ int main(int argc, char *argv[])
   }
   assert(b[0][1]==2);
   assert(b[0][1]==3);
-  assert(b[0][2]==3);
+  assert(b[0][2]==2);
+
+  // Reset this change to ensure tests later work as expected
+  b[0][1]=1;
 
   // The variables i, j and k will be used as indexes into arrays of size 3.
   // They all require merging paths in the CFG. For i there is only one value on
@@ -89,15 +92,16 @@ int main(int argc, char *argv[])
   assert(a[1][j]==1);
   assert(a[j][j]==0);
   assert(a[j][j]==1);
-  
+
   // Test how well we can deal with merging for an index on a non-uniform array
+
   assert(b[i][1]==1);
   assert(b[i][1]==11);
   assert(b[1][i]==3);
   assert(b[1][i]==11);
   assert(b[i][i]==0);
   assert(b[i][i]==11);
-  
+
   // Test how well we can deal with merging for an index on a non-uniform array
   assert(b[j][1]==1);
   assert(b[j][1]==11);

regression/goto-analyzer/sensitivity-test-constants-array-of-constants-array/test.desc

@@ -32,7 +32,7 @@ sensitivity_test_constants_array_of_constants_array.c
 ^\[main.assertion.27\] .* assertion a\[0\]\[2\]==0: Success$
 ^\[main.assertion.28\] .* assertion b\[0\]\[1\]==2: Unknown$
 ^\[main.assertion.29\] .* assertion b\[0\]\[1\]==3: Unknown$
-^\[main.assertion.30\] .* assertion b\[0\]\[2\]==3: Success$
+^\[main.assertion.30\] .* assertion b\[0\]\[2\]==2: Success$
 ^\[main.assertion.31\] .* assertion a\[i\]\[1\]==0: Success$
 ^\[main.assertion.32\] .* assertion a\[i\]\[1\]==1: Failure \(if reachable\)$
 ^\[main.assertion.33\] .* assertion a\[1\]\[i\]==0: Success$
@@ -61,13 +61,13 @@ sensitivity_test_constants_array_of_constants_array.c
 ^\[main.assertion.56\] .* assertion a\[0\]\[100\]==0: Unknown$
 ^\[main.assertion.57\] .* assertion c==0: Unknown$
 ^\[main.assertion.58\] .* assertion c==0: Unknown$
-^\[main.assertion.59\] .* assertion ei\[0\][1]==1: Success$
-^\[main.assertion.60\] .* assertion ei\[0\][1]==0: Failure \(if reachable\)$
-^\[main.assertion.61\] .* assertion ei\[2\][1]==0: Success$
-^\[main.assertion.62\] .* assertion ei\[2\][1]==1: Failure \(if reachable\)$
-^\[main.assertion.63\] .* assertion ej\[0\][1]==0: Unknown$
-^\[main.assertion.64\] .* assertion ej\[2\][1]==0: Unknown$
-^\[main.assertion.65\] .* assertion ek\[0\][1]==0: Unknown$
 ^\[main.assertion.66\] .* assertion c==0: Unknown$
+^\[main.assertion.59\] .* assertion ei\[0\]\[1\]==1: Success$
+^\[main.assertion.60\] .* assertion ei\[0\]\[1\]==0: Failure \(if reachable\)$
+^\[main.assertion.61\] .* assertion ei\[2\]\[1\]==0: Success$
+^\[main.assertion.62\] .* assertion ei\[2\]\[1\]==1: Failure \(if reachable\)$
+^\[main.assertion.63\] .* assertion ej\[0\]\[1\]==0: Unknown$
+^\[main.assertion.64\] .* assertion ej\[2\]\[1\]==0: Unknown$
+^\[main.assertion.65\] .* assertion ek\[0\]\[1\]==0: Unknown$
 --
 ^warning: ignoring

regression/goto-analyzer/sensitivity-test-constants-array/test.desc

@@ -17,7 +17,7 @@ sensitivity_test_constants_array.c
 ^\[main.assertion.12\] .* assertion c\[0\]==1: Failure \(if reachable\)$
 ^\[main.assertion.13\] .* assertion d\[0\]==0: Unknown$
 ^\[main.assertion.14\] .* assertion d\[0\]==2: Unknown$
-^\[main.assertion.15\] .* assertion d\[1\]==1: Success$
+^\[main.assertion.15\] .* assertion d\[1\]==0: Success$
 ^\[main.assertion.16\] .* assertion a\[i\]==0: Success$
 ^\[main.assertion.17\] .* assertion a\[i\]==1: Failure \(if reachable\)$
 ^\[main.assertion.18\] .* assertion a\[j\]==0: Unknown$

regression/goto-analyzer/sensitivity-test-constants-pointer-to-constants-struct/test.desc

@@ -11,3 +11,6 @@ sensitivity_test_constants_pointer_to_constants_struct.c
 ^\[main.assertion.6\] .* assertion p->b==1.0: Failure \(if reachable\)$
 --
 ^warning: ignoring
+--
+The final two assertions are the wrong way round as modifying the pointer
+does not seem to be propogating through. See #96

regression/goto-analyzer/sensitivity-test-constants-pointer-to-two-value-array/test.desc

@@ -3,7 +3,7 @@ sensitivity_test_constants_pointer_to_two_value_array.c
 --variable --pointers --verify
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.assertion.1\] .* assertion p==&a\[0\]: Unknown$
+^\[main.assertion.1\] .* assertion p==&a\[0\]: Success$
 ^\[main.assertion.2\] .* assertion \*p==1: Unknown$
 ^\[main.assertion.3\] .* assertion q==p\+1: Success$
 ^\[main.assertion.4\] .* assertion \*q==2: Unknown$

regression/goto-analyzer/sensitivity-test-two-value-array-of-two-value-array/test.desc

@@ -1,5 +1,5 @@
 FUTURE
-sensitivity_test_constants_array_of_constants_array.c
+sensitivity_test_two_value_array_of_two_value_array.c
 --variable --verify
 ^EXIT=0$
 ^SIGNAL=0$
@@ -32,7 +32,7 @@ sensitivity_test_constants_array_of_constants_array.c
 ^\[main.assertion.27\] .* assertion a\[0\]\[2\]==0: Unknown$
 ^\[main.assertion.28\] .* assertion b\[0\]\[1\]==2: Unknown$
 ^\[main.assertion.29\] .* assertion b\[0\]\[1\]==3: Unknown$
-^\[main.assertion.30\] .* assertion b\[0\]\[2\]==3: Unknown$
+^\[main.assertion.30\] .* assertion b\[0\]\[2\]==2: Unknown$
 ^\[main.assertion.31\] .* assertion a\[i\]\[1\]==0: Unknown$
 ^\[main.assertion.32\] .* assertion a\[i\]\[1\]==1: Unknown$
 ^\[main.assertion.33\] .* assertion a\[1\]\[i\]==0: Unknown$
@@ -61,13 +61,13 @@ sensitivity_test_constants_array_of_constants_array.c
 ^\[main.assertion.56\] .* assertion a\[0\]\[100\]==0: Unknown$
 ^\[main.assertion.57\] .* assertion c==0: Unknown$
 ^\[main.assertion.58\] .* assertion c==0: Unknown$
-^\[main.assertion.59\] .* assertion ei\[0\][1]==1: Unknown$
-^\[main.assertion.60\] .* assertion ei\[0\][1]==0: Unknown$
-^\[main.assertion.61\] .* assertion ei\[2\][1]==0: Unknown$
-^\[main.assertion.62\] .* assertion ei\[2\][1]==1: Unknown$
-^\[main.assertion.63\] .* assertion ej\[0\][1]==0: Unknown$
-^\[main.assertion.64\] .* assertion ej\[2\][1]==0: Unknown$
-^\[main.assertion.65\] .* assertion ek\[0\][1]==0: Unknown$
 ^\[main.assertion.66\] .* assertion c==0: Unknown$
+^\[main.assertion.59\] .* assertion ei\[0\]\[1\]==1: Unknown$
+^\[main.assertion.60\] .* assertion ei\[0\]\[1\]==0: Unknown$
+^\[main.assertion.61\] .* assertion ei\[2\]\[1\]==0: Unknown$
+^\[main.assertion.62\] .* assertion ei\[2\]\[1\]==1: Unknown$
+^\[main.assertion.63\] .* assertion ej\[0\]\[1\]==0: Unknown$
+^\[main.assertion.64\] .* assertion ej\[2\]\[1\]==0: Unknown$
+^\[main.assertion.65\] .* assertion ek\[0\]\[1\]==0: Unknown$
 --
 ^warning: ignoring

regression/goto-analyzer/sensitivity-test-two-value-array/test.desc

@@ -17,12 +17,12 @@ sensitivity_test_two_value_array.c
 ^\[main.assertion.12\] .* assertion c\[0\]==1: Unknown$
 ^\[main.assertion.13\] .* assertion d\[0\]==0: Unknown$
 ^\[main.assertion.14\] .* assertion d\[0\]==2: Unknown$
-^\[main.assertion.15\] .* assertion d\[1\]==1: Unknown$
+^\[main.assertion.15\] .* assertion d\[1\]==0: Unknown$
 ^\[main.assertion.16\] .* assertion a\[i\]==0: Unknown$
 ^\[main.assertion.17\] .* assertion a\[i\]==1: Unknown$
 ^\[main.assertion.18\] .* assertion a\[j\]==0: Unknown$
 ^\[main.assertion.19\] .* assertion a\[j\]==1: Unknown$
-^\[main.assertion.10\] .* assertion b\[i\]==1: Unknown$
+^\[main.assertion.20\] .* assertion b\[i\]==1: Unknown$
 ^\[main.assertion.21\] .* assertion b\[i\]==0: Unknown$
 ^\[main.assertion.22\] .* assertion b\[j\]==0: Unknown$
 ^\[main.assertion.23\] .* assertion b\[j\]==1: Unknown$
@@ -32,7 +32,7 @@ sensitivity_test_two_value_array.c
 ^\[main.assertion.27\] .* assertion ei\[0\]==0: Unknown$
 ^\[main.assertion.28\] .* assertion ei\[2\]==0: Unknown$
 ^\[main.assertion.29\] .* assertion ei\[2\]==1: Unknown$
-^\[main.assertion.20\] .* assertion ej\[0\]==0: Unknown$
+^\[main.assertion.30\] .* assertion ej\[0\]==0: Unknown$
 ^\[main.assertion.31\] .* assertion ej\[2\]==0: Unknown$
 ^\[main.assertion.32\] .* assertion ek\[0\]==0: Unknown$
 --