diff --git a/nix/default.nix b/nix/default.nix index 056c432610ae8f2b12e9b605b208f72106ebc248..cb1f71005cd5df7c9cd2e21368320a53ab5aed49 100644 --- a/nix/default.nix +++ b/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 diff --git a/src/plugins/value/vtests b/src/plugins/value/vtests index d3fa638f3fcc3bc80b5e5e735b6b10b9f4ca22e5..85df8bc85540cbb3e2b267d51a1046b67ffd2ae8 100755 --- a/src/plugins/value/vtests +++ b/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 diff --git a/tests/builtins/oracle_equality/linked_list.1.res.oracle b/tests/builtins/oracle_equality/linked_list.1.res.oracle index f60cb5f5e10f4e05e006738213c909bd1d7eec32..774133063313f53127fa28dfc38973be6b215180 100644 --- a/tests/builtins/oracle_equality/linked_list.1.res.oracle +++ b/tests/builtins/oracle_equality/linked_list.1.res.oracle @@ -1,22 +1,22 @@ -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: diff --git a/tests/builtins/oracle_gauges/linked_list.0.res.oracle b/tests/builtins/oracle_gauges/linked_list.0.res.oracle index 3e663c0dba878b5c33d027da0e0592a81d0ff7d8..6581cd82981d515a98cf873ea616fec02ab8cefb 100644 --- a/tests/builtins/oracle_gauges/linked_list.0.res.oracle +++ b/tests/builtins/oracle_gauges/linked_list.0.res.oracle @@ -1,4 +1,4 @@ -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 diff --git a/tests/builtins/oracle_gauges/linked_list.1.res.oracle b/tests/builtins/oracle_gauges/linked_list.1.res.oracle index 7c13a08f9bb84b3ec370ab4095b0f66f9e5b4a81..502ee1bc97be7bc615585f34db7fa93a122a446b 100644 --- a/tests/builtins/oracle_gauges/linked_list.1.res.oracle +++ b/tests/builtins/oracle_gauges/linked_list.1.res.oracle @@ -1,4 +1,4 @@ -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 diff --git a/tests/builtins/oracle_octagon/linked_list.1.res.oracle b/tests/builtins/oracle_octagon/linked_list.1.res.oracle index 68e3c862caba586b10558d8444653c9887203172..0b153ddc59c5405c94b1f19d0a8ad9095b0b0f1d 100644 --- a/tests/builtins/oracle_octagon/linked_list.1.res.oracle +++ b/tests/builtins/oracle_octagon/linked_list.1.res.oracle @@ -1,16 +1,16 @@ -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: diff --git a/tests/builtins/oracle_symblocs/linked_list.1.res.oracle b/tests/builtins/oracle_symblocs/linked_list.1.res.oracle index 68e3c862caba586b10558d8444653c9887203172..0b153ddc59c5405c94b1f19d0a8ad9095b0b0f1d 100644 --- a/tests/builtins/oracle_symblocs/linked_list.1.res.oracle +++ b/tests/builtins/oracle_symblocs/linked_list.1.res.oracle @@ -1,16 +1,16 @@ -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: