Make nondet function arg regression tests independent of variable output order

Author: danpoe

regression/cbmc/pointer-function-parameters-2/test.desc

@@ -3,10 +3,18 @@ main.c
 --function fun --cover branch
 ^\*\* 7 of 7 covered \(100.0%\)$
 ^Test suite:$
-^a=\(\(signed int \*\*\)NULL\), tmp(\$\d+)?=[^,]*, tmp(\$\d+)?=[^,]*$
-^a=&tmp(\$\d+)?!0, tmp(\$\d+)?=\(\(signed int \*\)NULL\), tmp(\$\d+)?=[^,]*$
-^a=&tmp(\$\d+)?!0, tmp(\$\d+)?=&tmp\$\d+!0, tmp(\$\d+)?=(-[0-9]+|[012356789][0-9]*|4[0-9]+)$
-^a=&tmp(\$\d+)?!0, tmp(\$\d+)?=&tmp(\$\d+)?!0, tmp(\$\d+)?=4$
+a=\(\(signed int \*\*\)NULL\)
+tmp(\$\d+)?=[^,]*
+tmp(\$\d+)?=[^,]*
+a=&tmp(\$\d+)?!0
+tmp(\$\d+)?=\(\(signed int \*\)NULL\)
+tmp(\$\d+)?=[^,]*
+a=&tmp(\$\d+)?!0
+tmp(\$\d+)?=&tmp\$\d+!0
+tmp(\$\d+)?=(-[0-9]+|[012356789][0-9]*|4[0-9]+)
+a=&tmp(\$\d+)?!0
+tmp(\$\d+)?=&tmp(\$\d+)?!0
+tmp(\$\d+)?=4
 ^EXIT=0$
 ^SIGNAL=0$
 --

regression/cbmc/pointer-function-parameters/test.desc

@@ -3,9 +3,9 @@ main.c
 --function fun --cover branch
 ^\*\* 5 of 5 covered \(100\.0%\)$
 ^Test suite:$
-^a=\(\(signed int \*\)NULL\), tmp(\$\d+)?=[^,]*$
-^a=&tmp(\$\d+)?!0, tmp(\$\d+)?=4$
-^a=&tmp(\$\d+)?!0, tmp(\$\d+)?=([012356789][0-9]*|4[0-9]+)$
+^(tmp(\$\d+)?=[^,]*, a=\(\(signed int \*\)NULL\))|(a=\(\(signed int \*\)NULL\), tmp(\$\d+)?=[^,]*)$
+^(a=&tmp(\$\d+)?!0, tmp(\$\d+)?=4)|(tmp(\$\d+)?=4, a=&tmp(\$\d+)?!0)$
+^(a=&tmp(\$\d+)?!0, tmp(\$\d+)?=([012356789][0-9]*|4[0-9]+))|(tmp(\$\d+)?=([012356789][0-9]*|4[0-9]+), a=&tmp(\$\d+)?!0)$
 ^EXIT=0$
 ^SIGNAL=0$
 --