results now include line number

Author: kroening

jbmc/regression/jbmc/catch1/test.desc

@@ -4,6 +4,6 @@ catch1.class
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$
-^\[.*\] no uncaught exception: FAILURE$
+^\[.*\] line 15 no uncaught exception: FAILURE$
 --
 ^warning: ignoring

jbmc/regression/jbmc/temp_stack_variable_packing/test.desc

@@ -1,7 +1,7 @@
 CORE
 Primary.class
 --function Primary.main
-^\[java::Primary.Run:\(\)V\.assertion\.1\] assertion at file Primary\.java line 6 function java::Primary.Run:\(\)V bytecode-index 22: FAILURE$
+^\[java::Primary.Run:\(\)V\.assertion\.1\] line 6 assertion at file Primary\.java line 6 function java::Primary.Run:\(\)V bytecode-index 22: FAILURE$
 ^VERIFICATION FAILED$
 --
 ^warning: ignoring

regression/cbmc/Array_operations1/test.desc

@@ -3,7 +3,7 @@ main.c
 
 ^EXIT=10$
 ^SIGNAL=0$
-^\[test_copy\.assertion\.4\] expected to fail: FAILURE$
+^\[test_copy\.assertion\.4\] .* expected to fail: FAILURE$
 ^\*\* 1 of 8 failed
 ^VERIFICATION FAILED$
 --

regression/cbmc/Function5/test.desc

@@ -3,6 +3,6 @@ main.c
 --pointer-check --bounds-check
 ^SIGNAL=0$
 ^EXIT=10$
-^\[.*\] dereference failure: pointer outside object bounds in \*p: FAILURE$
+^\[.*\] .* dereference failure: pointer outside object bounds in \*p: FAILURE$
 --
 ^warning: ignoring

regression/cbmc/Multi_Dimensional_Array6/test.desc

@@ -3,8 +3,8 @@ main.c
 --unwind 3 --no-unwinding-assertions
 ^EXIT=10$
 ^SIGNAL=0$
-^\[main\.assertion\.1\] : SUCCESS$
-^\[main\.assertion\.2\] : FAILURE$
+^\[main\.assertion\.1\] .* : SUCCESS$
+^\[main\.assertion\.2\] .* : FAILURE$
 ^\*\* 1 of 2 failed 
 --
 ^warning: ignoring

regression/cbmc/Multiple_Properties1/test.desc

@@ -5,6 +5,6 @@ activate-multi-line-match
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$
-^main.c function main\n\[main\.assertion\.1\] .* SUCCESS\n\[main\.assertion\.3\] .* FAILURE$
+^main.c function main\n\[main\.assertion\.1\] line 5 .* SUCCESS\n\[main\.assertion\.3\] line 9 .* FAILURE$
 --
 ^warning: ignoring

regression/cbmc/Overflow_Addition1/test.desc

@@ -3,7 +3,7 @@ main.c
 --signed-overflow-check
 ^EXIT=10$
 ^SIGNAL=0$
-^\[.*\] arithmetic overflow on signed \+ in .*: FAILURE$
+^\[.*\] .* arithmetic overflow on signed \+ in .*: FAILURE$
 ^VERIFICATION FAILED$
 --
 ^warning: ignoring

regression/cbmc/Overflow_Leftshift1/test.desc

@@ -3,7 +3,7 @@ main.c
 --signed-overflow-check
 ^EXIT=10$
 ^SIGNAL=0$
-^\[.*\] arithmetic overflow on signed shl in .*: FAILURE$
+^\[.*\] .* arithmetic overflow on signed shl in .*: FAILURE$
 ^\*\* 2 of 4 failed
 ^VERIFICATION FAILED$
 --

regression/cbmc/Quantifiers-assertion/test.desc

@@ -2,12 +2,12 @@ CORE
 main.c
 
 ^\*\* Results:$
-^\[main.assertion.1\] Exists-Exists: successful: SUCCESS$
-^\[main.assertion.2\] NotExists-NotExists: successful: SUCCESS$
-^\[main.assertion.3\] NotExists-Exists: failed: FAILURE$
-^\[main.assertion.4\] NotExists-Forall: failed: FAILURE$
-^\[main.assertion.5\] NotForall-Forall: successful: SUCCESS$
-^\[main.assertion.6\] NotForall-NotForall: successful: SUCCESS$
+^\[main.assertion.1\] .* Exists-Exists: successful: SUCCESS$
+^\[main.assertion.2\] .* NotExists-NotExists: successful: SUCCESS$
+^\[main.assertion.3\] .* NotExists-Exists: failed: FAILURE$
+^\[main.assertion.4\] .* NotExists-Forall: failed: FAILURE$
+^\[main.assertion.5\] .* NotForall-Forall: successful: SUCCESS$
+^\[main.assertion.6\] .* NotForall-NotForall: successful: SUCCESS$
 ^\*\* 2 of 6 failed
 ^VERIFICATION FAILED$
 ^EXIT=10$

regression/cbmc/Quantifiers-assignment/test.desc

@@ -2,10 +2,10 @@ CORE
 main.c
 
 ^\*\* Results:$
-^\[main.assertion.1\] assertion x: SUCCESS$
-^\[main.assertion.2\] assertion y: FAILURE$
-^\[main.assertion.3\] assertion z1: SUCCESS$
-^\[main.assertion.4\] assertion z2: SUCCESS$
+^\[main.assertion.1\] .* assertion x: SUCCESS$
+^\[main.assertion.2\] .* assertion y: FAILURE$
+^\[main.assertion.3\] .* assertion z1: SUCCESS$
+^\[main.assertion.4\] .* assertion z2: SUCCESS$
 ^\*\* 1 of 4 failed
 ^VERIFICATION FAILED$
 ^EXIT=10$