diff --git a/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc b/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc index bf47edf8dbd..967e32ecbc4 100644 --- a/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc +++ b/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc @@ -1,16 +1,16 @@ CORE main.c --verbosity 10 --pointer-check --remove-const-function-pointers -^\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 diff --git a/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc b/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc index a88ad48002a..30e6cdedfd3 100644 --- a/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc +++ b/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc @@ -1,16 +1,16 @@ CORE main.c --verbosity 10 --pointer-check --remove-function-pointers -^\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