Merge pull request #2371 from diffblue/fix-tests2

make test independent of index type

Author: Daniel Kroening

jbmc/regression/jbmc/json_trace3/test.desc

@@ -4,7 +4,7 @@ Test.class
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-"lhs": "dynamic_2_array\[1L\]",\n *"mode": "java",\n *"sourceLocation": \{\n *"bytecodeIndex": "15",\n *"file": "Test\.java",\n *"function": "java::Test\.main:\(\[J\)V",\n *"line": "6"\n *\},\n *"stepType": "assignment",\n *"thread": 0,\n *"value": \{\n *"binary": "0000000000000000000000000000000000000000000000000000000000000001",\n *"data": "1L",\n *"name": "integer",\n *"type": "long",\n *"width": 64
+"lhs": "dynamic_2_array\[1L?\]",\n *"mode": "java",\n *"sourceLocation": \{\n *"bytecodeIndex": "15",\n *"file": "Test\.java",\n *"function": "java::Test\.main:\(\[J\)V",\n *"line": "6"\n *\},\n *"stepType": "assignment",\n *"thread": 0,\n *"value": \{\n *"binary": "0000000000000000000000000000000000000000000000000000000000000001",\n *"data": "1L",\n *"name": "integer",\n *"type": "long",\n *"width": 64
 --
 "name": "unknown"
 ^warning: ignoring

regression/goto-analyzer/approx-array-variable-const-fp/test.desc

@@ -2,17 +2,17 @@ CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
 ^Removing function pointers and virtual functions$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f2 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f3 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f4 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f2 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f3 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f4 THEN GOTO [0-9]$
 ^EXIT=0$
 ^SIGNAL=0$
 --
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f1 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f5 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f6 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f7 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f8 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f9 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[.*i\] == f9 THEN GOTO [0-9]$
 ^warning: ignoring
 function \w+: replacing function pointer by 9 possible targets

regression/goto-analyzer/no-match-dereference-const-pointer-const-array-literal-pointer-const-fp/test.desc

@@ -2,15 +2,15 @@ CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
 ^Removing function pointers and virtual functions$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f1 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f2 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f3 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f4 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f5 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f6 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f7 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f8 THEN GOTO [0-9]$
-^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f9 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f1 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f2 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f3 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f4 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f5 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f6 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f7 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f8 THEN GOTO [0-9]$
+^\s*IF \*container_ptr->fp_tbl\[.*1\] == f9 THEN GOTO [0-9]$
 ^EXIT=0$
 ^SIGNAL=0$
 --

regression/goto-analyzer/no-match-pointer-const-struct-array-literal-non-const-fp/test.desc

@@ -2,15 +2,15 @@ CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
 ^Removing function pointers and virtual functions$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f1 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f2 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f3 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f4 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f5 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f6 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f7 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f8 THEN GOTO [0-9]$
-^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f9 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f1 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f2 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f3 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f4 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f5 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f6 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f7 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f8 THEN GOTO [0-9]$
+^\s*IF container_ptr->fp_tbl\[.*1\] == f9 THEN GOTO [0-9]$
 ^EXIT=0$
 ^SIGNAL=0$
 --