Adapt tests for printing

We now print after all solving, and the last thing before the next
increment, therefore the printing checks are easier to check immediately
precedes the next unwinding, rather than checking appears after the
increment we are talking about.

Author: Thomas Kiley

regression/cbmc-incr-oneloop/alarm1/test.desc

@@ -1,8 +1,10 @@
 CORE
 main.c
 --incremental-loop main.0 --unwind-max 15
+activate-multi-line-match
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 15
 --
 ^warning: ignoring

regression/cbmc-incr-oneloop/alarm2/test.desc

@@ -4,8 +4,8 @@ main.c
 activate-multi-line-match
 Current unwinding: 1
 Incremental status: INCONCLUSIVE
-Current unwinding: 5\nUnwinding .*\nIncremental status: INCONCLUSIVE
-Current unwinding: 6\nUnwinding .*\nIncremental status: INCONCLUSIVE
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 6
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 7
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/cbmc-incr-oneloop/multiple-asserts/test-no-cp.desc

@@ -2,10 +2,9 @@ CORE
 test.c
 --incremental-loop main.0 --no-propagation
 activate-multi-line-match
-Current unwinding: 1\nUnwinding .*\nIncremental status: INCONCLUSIVE
-Current unwinding: 6\nUnwinding .*\nIncremental status: INCONCLUSIVE
-Current unwinding: 7\nUnwinding .*\nIncremental status: FAILURE
-Current unwinding: 9\nUnwinding .*\nIncremental status: FAILURE
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 2
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 6
+Incremental status: FAILURE\nCurrent unwinding: 7
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/cbmc-incr-oneloop/multiple-asserts/test.desc

@@ -2,10 +2,9 @@ CORE
 test.c
 --incremental-loop main.0
 activate-multi-line-match
-Current unwinding: 1\nUnwinding .*\nIncremental status: INCONCLUSIVE
-Current unwinding: 6\nUnwinding .*\nIncremental status: INCONCLUSIVE
-Current unwinding: 7\nUnwinding .*\nIncremental status: FAILURE
-Current unwinding: 9\nUnwinding .*\nIncremental status: FAILURE
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 2
+Incremental status: INCONCLUSIVE\nCurrent unwinding: 6
+Incremental status: FAILURE\nCurrent unwinding: 7
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$