[tests] update alternative test oracles and fix vtests script

nix/default.nix

@@ -276,7 +276,7 @@ pkgs.lib.makeExtensible
                make clean_share_link
                make create_share_link
                export CONFIGS="equality bitwise symblocs gauges octagon"
-               src/plugins/value/vtests -j 4
+               src/plugins/value/vtests -j 4 -error-code
         '';
         installPhase = ''
                true

src/plugins/value/vtests

@@ -25,17 +25,16 @@ function has_target() {
     return $__has_target
 }
 
-
 if has_target ${ARGS[@]}; then
-    TARGETS="${ARGS[@]}"
+    TARGETS_AND_ARGS="${ARGS[@]}"
 else
-    TARGETS="${TARGETS[@]} ${ARGS[@]}"
+    TARGETS_AND_ARGS="${TARGETS[@]} ${ARGS[@]}"
 fi
 
 echo "CONFIGS: ${CONFIGS[@]}"
-echo "Testing: ${TARGETS[@]}"
 for config in ${CONFIGS[@]}
 do
-    echo $config
-    ./bin/ptests.opt -error-code -config $config ${TARGETS[@]}
+    set -x
+    ./bin/ptests.opt -config $config ${TARGETS_AND_ARGS[@]}
+    { set +x; } 2>&-
 done

tests/builtins/oracle_equality/linked_list.1.res.oracle

-477a478,479
+488a489,490
 > [kernel] tests/builtins/linked_list.c:19: 
 >   more than 100(127) elements to enumerate. Approximating.
-530a533,534
+542a545,546
 > [kernel] tests/builtins/linked_list.c:43: 
 >   more than 100(127) elements to enumerate. Approximating.
-532a537,538
+544a549,550
 > [kernel] tests/builtins/linked_list.c:44: 
 >   more than 100(127) elements to enumerate. Approximating.
-658a665,666
+673a680,681
 > [kernel] tests/builtins/linked_list.c:19: 
 >   more than 100(128) elements to enumerate. Approximating.
-702a711,712
+718a727,728
 > [kernel] tests/builtins/linked_list.c:43: 
 >   more than 100(128) elements to enumerate. Approximating.
-704a715,716
+720a731,732
 > [kernel] tests/builtins/linked_list.c:44: 
 >   more than 100(128) elements to enumerate. Approximating.
-800,803d811
+818,821d829
 < [kernel] tests/builtins/linked_list.c:43: 
 <   more than 100(128) elements to enumerate. Approximating.
 < [kernel] tests/builtins/linked_list.c:44: 

tests/builtins/oracle_gauges/linked_list.0.res.oracle

-2290a2291,2296
+2308a2309,2314
 > [eva] computing for function printf_va_1 <- main.
 >   Called from tests/builtins/linked_list.c:51.
 > [eva] Done for function printf_va_1

tests/builtins/oracle_gauges/linked_list.1.res.oracle

-798a799,804
+816a817,822
 > [eva] computing for function printf_va_1 <- main.
 >   Called from tests/builtins/linked_list.c:51.
 > [eva] Done for function printf_va_1

tests/builtins/oracle_octagon/linked_list.1.res.oracle

-530a531,532
+542a543,544
 > [kernel] tests/builtins/linked_list.c:43: 
 >   more than 100(127) elements to enumerate. Approximating.
-532a535,536
+544a547,548
 > [kernel] tests/builtins/linked_list.c:44: 
 >   more than 100(127) elements to enumerate. Approximating.
-702a707,708
+718a723,724
 > [kernel] tests/builtins/linked_list.c:43: 
 >   more than 100(128) elements to enumerate. Approximating.
-704a711,712
+720a727,728
 > [kernel] tests/builtins/linked_list.c:44: 
 >   more than 100(128) elements to enumerate. Approximating.
-800,803d807
+818,821d825
 < [kernel] tests/builtins/linked_list.c:43: 
 <   more than 100(128) elements to enumerate. Approximating.
 < [kernel] tests/builtins/linked_list.c:44: 

tests/builtins/oracle_symblocs/linked_list.1.res.oracle

-530a531,532
+542a543,544
 > [kernel] tests/builtins/linked_list.c:43: 
 >   more than 100(127) elements to enumerate. Approximating.
-532a535,536
+544a547,548
 > [kernel] tests/builtins/linked_list.c:44: 
 >   more than 100(127) elements to enumerate. Approximating.
-702a707,708
+718a723,724
 > [kernel] tests/builtins/linked_list.c:43: 
 >   more than 100(128) elements to enumerate. Approximating.
-704a711,712
+720a727,728
 > [kernel] tests/builtins/linked_list.c:44: 
 >   more than 100(128) elements to enumerate. Approximating.
-800,803d807
+818,821d825
 < [kernel] tests/builtins/linked_list.c:43: 
 <   more than 100(128) elements to enumerate. Approximating.
 < [kernel] tests/builtins/linked_list.c:44: