From 8e013bc3f243d776c66dbaded41eb9e6abad96e1 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 21 Dec 2018 14:21:03 +0000 Subject: [PATCH] Add missing EXIT or SIGNAL specifications We should always check for these to avoid spuriously passing tests. --- .../jbmc-concurrency/anonymous-java.lang.thread/test2.desc | 1 + .../jbmc-concurrency/explicit-thread-blocks/test2.desc | 1 + .../jbmc-concurrency/java-lang-runnable/test2.desc | 1 + jbmc/regression/jbmc-concurrency/java-lang-thread/test2.desc | 1 + jbmc/regression/jbmc-concurrency/several-threads/test2.desc | 1 + .../synchronized-blocks-null-throw/test.desc | 2 ++ .../jbmc-concurrency/synchronized-blocks-throw/test.desc | 2 ++ .../jbmc-concurrency/synchronized-blocks/test1.desc | 2 ++ .../jbmc-concurrency/synchronized-methods/test1.desc | 2 ++ .../jbmc-concurrency/synchronized-methods/test2.desc | 2 ++ jbmc/regression/jbmc-generics/type_erasure/test.desc | 4 ++-- .../jbmc-generics/type_erasure/test_function_input.desc | 4 ++-- .../StartsWithConstantEvalution/constant_equals.desc | 2 ++ jbmc/regression/jbmc-strings/stub-string-length/test.desc | 4 ++-- jbmc/regression/jbmc/JumpSimplification/test.desc | 4 ++-- .../jbmc/NondetEnumArg/test_specific_constant1.desc | 2 ++ .../jbmc/NondetEnumArg/test_specific_constant2.desc | 2 ++ .../jbmc/NondetEnumArg/test_specific_constant3.desc | 2 ++ jbmc/regression/jbmc/NondetEnumArgField/test.desc | 2 ++ .../jbmc/NondetEnumOpaqueReturn/test_specific_constant1.desc | 2 ++ .../jbmc/NondetEnumOpaqueReturn/test_specific_constant2.desc | 2 ++ .../jbmc/NondetEnumOpaqueReturn/test_specific_constant3.desc | 2 ++ .../test-array-value-annotation-on-class.desc | 2 ++ .../test-array-value-annotation-on-field.desc | 2 ++ .../test-array-value-annotation-on-method.desc | 2 ++ .../test-array-value-annotation-on-parameter.desc | 2 ++ .../test-class-value-annotation-on-class.desc | 2 ++ .../test-class-value-annotation-on-field.desc | 2 ++ .../test-class-value-annotation-on-method.desc | 2 ++ .../test-class-value-annotation-on-parameter.desc | 2 ++ jbmc/regression/jbmc/class_hierarchy/test_json.desc | 4 ++-- jbmc/regression/jbmc/class_hierarchy/test_plain.desc | 4 ++-- .../jbmc/classpath-class-incorrect-package/test.desc | 1 + .../jbmc/classpath-class-with-one-dir/test_prefix.desc | 1 + jbmc/regression/jbmc/classpath-jar-entry-method/test.desc | 4 ++-- .../jbmc/classpath-jar-incorrect-package/test_class.desc | 1 + .../classpath-jar-incorrect-package/test_jar_main_class.desc | 1 + jbmc/regression/jbmc/classpath-two-classes/test.desc | 1 + .../jbmc/classpath-two-classes/test_incorrect.desc | 1 + jbmc/regression/jbmc/classpath-two-jars/test.desc | 1 + jbmc/regression/jbmc/classpath-two-jars/test2.desc | 1 + jbmc/regression/jbmc/classpath-two-jars/test_incorrect.desc | 1 + jbmc/regression/jbmc/classpath-two-jars/test_incorrect2.desc | 1 + .../jbmc/cprover-always-load-nondet-initialize/test.desc | 4 ++-- jbmc/regression/jbmc/destructors/block.desc | 2 ++ jbmc/regression/jbmc/destructors/break.desc | 2 ++ jbmc/regression/jbmc/destructors/continue.desc | 2 ++ jbmc/regression/jbmc/destructors/decl.desc | 4 +++- jbmc/regression/jbmc/destructors/return.desc | 2 ++ jbmc/regression/jbmc/internal1/test.desc | 4 ++-- jbmc/regression/jbmc/json_trace3/test.desc | 4 ++-- jbmc/regression/jbmc/lambda2/test.desc | 4 ++-- jbmc/regression/jbmc/lambda2/test_no_crash.desc | 4 ++-- jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc | 5 ++--- jbmc/regression/jbmc/lazyloading10/test.desc | 1 + jbmc/regression/jbmc/lazyloading_opaquereturn/test.desc | 2 ++ jbmc/regression/jbmc/reachability-slice/test.desc | 2 ++ jbmc/regression/jbmc/reachability-slice/test2.desc | 2 ++ jbmc/regression/jbmc/reachability-slice/test3.desc | 2 ++ jbmc/regression/jbmc/swap1/test.desc | 2 +- jbmc/regression/jbmc/swap2/test.desc | 2 +- jbmc/regression/jbmc/temp_stack_variable_packing/test.desc | 2 ++ jbmc/regression/jdiff/java-add-package/test.desc | 4 ++-- jbmc/regression/jdiff/java-clinit-wrapper/test.desc | 4 ++-- jbmc/regression/jdiff/java-del-package/test.desc | 4 ++-- jbmc/regression/jdiff/java-deleted-function/test.desc | 4 ++-- jbmc/regression/jdiff/java-instanceof/test.desc | 4 ++-- jbmc/regression/jdiff/java-mod-comment/test.desc | 4 ++-- jbmc/regression/jdiff/java-mod-identifier/test.desc | 4 ++-- jbmc/regression/jdiff/java-mod-identifier2/test.desc | 4 ++-- jbmc/regression/jdiff/java-mod-package/test.desc | 4 ++-- jbmc/regression/jdiff/java-new-function/test.desc | 4 ++-- jbmc/regression/jdiff/java-no-change/test.desc | 4 ++-- jbmc/regression/jdiff/java-properties/test.desc | 4 ++-- jbmc/regression/jdiff/java-scope-change/test.desc | 4 ++-- jbmc/regression/jdiff/java-scope-change2/test.desc | 4 ++-- jbmc/regression/jdiff/java-scope-change3/test.desc | 4 ++-- jbmc/regression/jdiff/java-tmp-vars-array/test.desc | 4 ++-- jbmc/regression/jdiff/java-tmp-vars-inc/test.desc | 4 ++-- jbmc/regression/jdiff/java-tmp-vars-new/test.desc | 4 ++-- jbmc/regression/jdiff/java-tmp-vars-string/test.desc | 4 ++-- jbmc/regression/jdiff/java-virtual-methods/test.desc | 4 ++-- jbmc/regression/jdiff/syntactic-diff-java1/test.desc | 4 ++-- regression/cbmc-cover/block-coverage-report1/test.desc | 2 ++ regression/cbmc-cover/block-coverage-report2/test.desc | 2 ++ regression/cbmc-cover/block-coverage-report3/test.desc | 2 ++ regression/cbmc-cover/block-coverage-report4/test.desc | 2 ++ regression/cbmc/address_space_size_limit2/test.desc | 2 ++ regression/cbmc/array-function-parameters/test.desc | 2 ++ regression/cbmc/destructors/compound_literal.desc | 2 ++ regression/cbmc/destructors/enter_lexical_block.desc | 2 ++ regression/cbmc/json1/test.desc | 4 ++-- regression/cbmc/multiple-goto-traces/test.desc | 4 ++-- regression/cbmc/reachability-slice-interproc/test.desc | 2 ++ regression/cbmc/reachability-slice/test.desc | 2 ++ regression/cbmc/reachability-slice/test2.desc | 2 ++ regression/cbmc/reachability-slice/test3.desc | 2 ++ regression/cbmc/typedef-anon-struct1/test.desc | 4 ++-- regression/cbmc/typedef-anon-struct2/test.desc | 4 ++-- regression/cbmc/typedef-anon-union1/test.desc | 4 ++-- regression/cbmc/typedef-anon-union2/test.desc | 4 ++-- regression/cbmc/typedef-const-struct1/test.desc | 4 ++-- regression/cbmc/typedef-const-type1/test.desc | 4 ++-- regression/cbmc/typedef-const-union1/test.desc | 4 ++-- regression/cbmc/typedef-param-anon-struct1/test.desc | 4 ++-- regression/cbmc/typedef-param-anon-union1/test.desc | 4 ++-- regression/cbmc/typedef-param-struct1/test.desc | 4 ++-- regression/cbmc/typedef-param-type1/test.desc | 4 ++-- regression/cbmc/typedef-param-type2/test.desc | 4 ++-- regression/cbmc/typedef-param-type3/test.desc | 4 ++-- regression/cbmc/typedef-param-union1/test.desc | 4 ++-- regression/cbmc/typedef-return-anon-struct1/test.desc | 4 ++-- regression/cbmc/typedef-return-anon-union1/test.desc | 4 ++-- regression/cbmc/typedef-return-struct1/test.desc | 4 ++-- regression/cbmc/typedef-return-type1/test.desc | 4 ++-- regression/cbmc/typedef-return-type2/test.desc | 4 ++-- regression/cbmc/typedef-return-type3/test.desc | 4 ++-- regression/cbmc/typedef-return-union1/test.desc | 4 ++-- regression/cbmc/typedef-struct1/test.desc | 4 ++-- regression/cbmc/typedef-struct2/test.desc | 4 ++-- regression/cbmc/typedef-type1/test.desc | 4 ++-- regression/cbmc/typedef-type2/test.desc | 4 ++-- regression/cbmc/typedef-type3/test.desc | 4 ++-- regression/cbmc/typedef-type4/test.desc | 4 ++-- regression/cbmc/typedef-union1/test.desc | 4 ++-- regression/cbmc/typedef-union2/test.desc | 4 ++-- regression/contracts/function_check_04/test.desc | 2 ++ regression/contracts/function_check_05/test.desc | 2 ++ regression/contracts/invar_check_04/test.desc | 2 ++ regression/goto-analyzer/dependence-graph10/test.desc | 4 ++-- regression/goto-analyzer/dependence-graph11/test.desc | 4 ++-- regression/goto-analyzer/dependence-graph12/test.desc | 4 ++-- regression/goto-analyzer/dependence-graph4/test.desc | 4 ++-- regression/goto-analyzer/dependence-graph7/test.desc | 4 ++-- regression/goto-analyzer/dependence-graph8/test.desc | 4 ++-- regression/goto-analyzer/dependence-graph9/test.desc | 4 ++-- regression/goto-diff/syntactic-diff1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-anon-struct1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-anon-struct2/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-anon-union1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-anon-union2/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-const-struct1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-const-type1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-const-union1/test.desc | 4 ++-- .../typedef-param-anon-struct1/test.desc | 4 ++-- .../typedef-param-anon-union1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-param-struct1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-param-type1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-param-type2/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-param-type3/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-param-union1/test.desc | 4 ++-- .../typedef-return-anon-struct1/test.desc | 4 ++-- .../typedef-return-anon-union1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-return-struct1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-return-type1/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-return-type2/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-return-type3/test.desc | 4 ++-- .../goto-instrument-typedef/typedef-return-union1/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-struct1/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-struct2/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-type1/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-type2/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-type3/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-type4/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-union1/test.desc | 4 ++-- regression/goto-instrument-typedef/typedef-union2/test.desc | 4 ++-- .../generate-function-body-nondet-return-const/test.desc | 1 + .../test.desc | 1 + .../generate-function-body-nondet-return-simple/test.desc | 1 + regression/goto-instrument/is-threaded1/test.desc | 4 ++-- regression/goto-instrument/show-call-sequences4/test.desc | 4 ++-- regression/goto-instrument/splice_call_01/test.desc | 4 ++-- regression/test-script/failing-excluded-line/test.desc | 2 ++ regression/test-script/failing-multi-line/test.desc | 2 ++ regression/test-script/failing-single-line/test.desc | 2 ++ regression/test-script/multi-line/test.desc | 4 ++-- 176 files changed, 332 insertions(+), 216 deletions(-) diff --git a/jbmc/regression/jbmc-concurrency/anonymous-java.lang.thread/test2.desc b/jbmc/regression/jbmc-concurrency/anonymous-java.lang.thread/test2.desc index c39ba088b5..62dedf9006 100644 --- a/jbmc/regression/jbmc-concurrency/anonymous-java.lang.thread/test2.desc +++ b/jbmc/regression/jbmc-concurrency/anonymous-java.lang.thread/test2.desc @@ -1,5 +1,6 @@ CORE A.class --function 'A.me2:()V' --java-threading --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` +^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/jbmc/regression/jbmc-concurrency/explicit-thread-blocks/test2.desc b/jbmc/regression/jbmc-concurrency/explicit-thread-blocks/test2.desc index 545f4effa2..ffc053a2d1 100644 --- a/jbmc/regression/jbmc-concurrency/explicit-thread-blocks/test2.desc +++ b/jbmc/regression/jbmc-concurrency/explicit-thread-blocks/test2.desc @@ -1,5 +1,6 @@ CORE A.class --function 'A.me2:()V' --java-threading +^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED diff --git a/jbmc/regression/jbmc-concurrency/java-lang-runnable/test2.desc b/jbmc/regression/jbmc-concurrency/java-lang-runnable/test2.desc index 02c95662b4..0dd5c0b2bd 100644 --- a/jbmc/regression/jbmc-concurrency/java-lang-runnable/test2.desc +++ b/jbmc/regression/jbmc-concurrency/java-lang-runnable/test2.desc @@ -1,5 +1,6 @@ CORE A.class --function 'A.me2:()V' --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --java-threading +^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED diff --git a/jbmc/regression/jbmc-concurrency/java-lang-thread/test2.desc b/jbmc/regression/jbmc-concurrency/java-lang-thread/test2.desc index dbde3635d9..32e2da0af9 100644 --- a/jbmc/regression/jbmc-concurrency/java-lang-thread/test2.desc +++ b/jbmc/regression/jbmc-concurrency/java-lang-thread/test2.desc @@ -1,5 +1,6 @@ CORE A.class --function 'A.me2:()V' --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --java-threading +^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/jbmc/regression/jbmc-concurrency/several-threads/test2.desc b/jbmc/regression/jbmc-concurrency/several-threads/test2.desc index acfc61c48c..79e49311d8 100644 --- a/jbmc/regression/jbmc-concurrency/several-threads/test2.desc +++ b/jbmc/regression/jbmc-concurrency/several-threads/test2.desc @@ -1,5 +1,6 @@ CORE A.class --function A.me2 --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --java-threading +^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/jbmc/regression/jbmc-concurrency/synchronized-blocks-null-throw/test.desc b/jbmc/regression/jbmc-concurrency/synchronized-blocks-null-throw/test.desc index 21891800ef..70695265e9 100644 --- a/jbmc/regression/jbmc-concurrency/synchronized-blocks-null-throw/test.desc +++ b/jbmc/regression/jbmc-concurrency/synchronized-blocks-null-throw/test.desc @@ -1,6 +1,8 @@ KNOWNBUG Sync.class --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --java-threading +^EXIT=0$ +^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ -- ^warning: ignoring diff --git a/jbmc/regression/jbmc-concurrency/synchronized-blocks-throw/test.desc b/jbmc/regression/jbmc-concurrency/synchronized-blocks-throw/test.desc index 2a4878a473..44dfce6fa2 100644 --- a/jbmc/regression/jbmc-concurrency/synchronized-blocks-throw/test.desc +++ b/jbmc/regression/jbmc-concurrency/synchronized-blocks-throw/test.desc @@ -1,6 +1,8 @@ KNOWNBUG Sync.class --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --java-threading +^EXIT=0$ +^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ -- ^warning: ignoring diff --git a/jbmc/regression/jbmc-concurrency/synchronized-blocks/test1.desc b/jbmc/regression/jbmc-concurrency/synchronized-blocks/test1.desc index f284db38cf..b809da678b 100644 --- a/jbmc/regression/jbmc-concurrency/synchronized-blocks/test1.desc +++ b/jbmc/regression/jbmc-concurrency/synchronized-blocks/test1.desc @@ -1,6 +1,8 @@ CORE A.class --function 'A.me0:()V' --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --show-goto-functions --java-threading +^EXIT=0$ +^SIGNAL=0$ ATOMIC_BEGIN ATOMIC_END -- diff --git a/jbmc/regression/jbmc-concurrency/synchronized-methods/test1.desc b/jbmc/regression/jbmc-concurrency/synchronized-methods/test1.desc index 32be2704a7..825487b58c 100644 --- a/jbmc/regression/jbmc-concurrency/synchronized-methods/test1.desc +++ b/jbmc/regression/jbmc-concurrency/synchronized-methods/test1.desc @@ -1,6 +1,8 @@ CORE A.class --function 'A.me1:()V' --java-threading --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --show-goto-functions +^EXIT=0$ +^SIGNAL=0$ ATOMIC_BEGIN ATOMIC_END -- diff --git a/jbmc/regression/jbmc-concurrency/synchronized-methods/test2.desc b/jbmc/regression/jbmc-concurrency/synchronized-methods/test2.desc index 4420b0af9f..ce9d4da643 100644 --- a/jbmc/regression/jbmc-concurrency/synchronized-methods/test2.desc +++ b/jbmc/regression/jbmc-concurrency/synchronized-methods/test2.desc @@ -1,6 +1,8 @@ CORE A.class --function 'A.me1:()V' --java-threading --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` --show-goto-functions +^EXIT=0$ +^SIGNAL=0$ ATOMIC_BEGIN ATOMIC_END -- diff --git a/jbmc/regression/jbmc-generics/type_erasure/test.desc b/jbmc/regression/jbmc-generics/type_erasure/test.desc index 0665b549d3..aa611c6563 100644 --- a/jbmc/regression/jbmc-generics/type_erasure/test.desc +++ b/jbmc/regression/jbmc-generics/type_erasure/test.desc @@ -1,6 +1,6 @@ CORE TestClass.class --function TestClass.testFunction --classpath `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ VERIFICATION SUCCESSFUL diff --git a/jbmc/regression/jbmc-generics/type_erasure/test_function_input.desc b/jbmc/regression/jbmc-generics/type_erasure/test_function_input.desc index 61b0439417..221b89663d 100644 --- a/jbmc/regression/jbmc-generics/type_erasure/test_function_input.desc +++ b/jbmc/regression/jbmc-generics/type_erasure/test_function_input.desc @@ -1,8 +1,8 @@ CORE TestClass.class --function TestClass.testFunctionWithInput -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ VERIFICATION SUCCESSFUL -- -- diff --git a/jbmc/regression/jbmc-strings/StartsWithConstantEvalution/constant_equals.desc b/jbmc/regression/jbmc-strings/StartsWithConstantEvalution/constant_equals.desc index 65acfeb4e0..a15d4fd63a 100644 --- a/jbmc/regression/jbmc-strings/StartsWithConstantEvalution/constant_equals.desc +++ b/jbmc/regression/jbmc-strings/StartsWithConstantEvalution/constant_equals.desc @@ -2,6 +2,8 @@ CORE RefineStrings.class --function string_refinement.RefineStrings.constantComparison --show-vcc --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^Generated [0-9]+ VCC\(s\), 0 remaining after simplification$ +^EXIT=0$ +^SIGNAL=0$ -- .*cprover_string_startswith_func*. -- diff --git a/jbmc/regression/jbmc-strings/stub-string-length/test.desc b/jbmc/regression/jbmc-strings/stub-string-length/test.desc index fd2d62e8e4..b3d69f255a 100644 --- a/jbmc/regression/jbmc-strings/stub-string-length/test.desc +++ b/jbmc/regression/jbmc-strings/stub-string-length/test.desc @@ -2,5 +2,5 @@ CORE Test.class --function Test.main --max-nondet-string-length 10 VERIFICATION SUCCESSFUL -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ diff --git a/jbmc/regression/jbmc/JumpSimplification/test.desc b/jbmc/regression/jbmc/JumpSimplification/test.desc index 3f7c124323..0220a22fc7 100644 --- a/jbmc/regression/jbmc/JumpSimplification/test.desc +++ b/jbmc/regression/jbmc/JumpSimplification/test.desc @@ -2,8 +2,8 @@ CORE Test.class --show-goto-functions --function Test.foo activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ IF \w* <= 0 THEN GOTO 1\n\s*//.*\n\s*//.*\n\s*\w*:: -- IF !\(\w* <= 0\) THEN GOTO 1\n\s*//.*\n.*GOTO 2\n\s*//.*\n\s*//.*\n\s*1: \w*:: diff --git a/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant1.desc b/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant1.desc index b4304eb8ba..2780c61703 100644 --- a/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant1.desc +++ b/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant1.desc @@ -2,6 +2,8 @@ CORE NondetEnumArg.class --function NondetEnumArg.canChooseRed --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- Test 1 of 3 to check that any of the enum constants can be chosen. diff --git a/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant2.desc b/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant2.desc index 4e477d932a..f11dce399d 100644 --- a/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant2.desc +++ b/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant2.desc @@ -2,6 +2,8 @@ CORE NondetEnumArg.class --function NondetEnumArg.canChooseGreen --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- Test 2 of 3 to check that any of the enum constants can be chosen. diff --git a/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant3.desc b/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant3.desc index f7a50aa07c..b8882ae247 100644 --- a/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant3.desc +++ b/jbmc/regression/jbmc/NondetEnumArg/test_specific_constant3.desc @@ -2,6 +2,8 @@ CORE NondetEnumArg.class --function NondetEnumArg.canChooseBlue --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- Test 3 of 3 to check that any of the enum constants can be chosen. diff --git a/jbmc/regression/jbmc/NondetEnumArgField/test.desc b/jbmc/regression/jbmc/NondetEnumArgField/test.desc index 48937ec19c..2fc4a76783 100644 --- a/jbmc/regression/jbmc/NondetEnumArgField/test.desc +++ b/jbmc/regression/jbmc/NondetEnumArgField/test.desc @@ -2,6 +2,8 @@ CORE NondetEnumArgField.class --function NondetEnumArgField.test --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- The test checks that even when none of the enum constants are referenced in user diff --git a/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant1.desc b/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant1.desc index 42d534d40b..baebe04df8 100644 --- a/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant1.desc +++ b/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant1.desc @@ -2,6 +2,8 @@ CORE NondetEnumOpaqueReturn.class --function NondetEnumOpaqueReturn.canChooseRed --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- Test 1 of 3 to check that any of the enum constants can be chosen. diff --git a/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant2.desc b/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant2.desc index 656e2dafee..381d48bfeb 100644 --- a/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant2.desc +++ b/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant2.desc @@ -2,6 +2,8 @@ CORE NondetEnumOpaqueReturn.class --function NondetEnumOpaqueReturn.canChooseGreen --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- Test 2 of 3 to check that any of the enum constants can be chosen. diff --git a/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant3.desc b/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant3.desc index 425b27ce54..be718b3acd 100644 --- a/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant3.desc +++ b/jbmc/regression/jbmc/NondetEnumOpaqueReturn/test_specific_constant3.desc @@ -2,6 +2,8 @@ CORE NondetEnumOpaqueReturn.class --function NondetEnumOpaqueReturn.canChooseBlue --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar` ^VERIFICATION FAILED$ +^EXIT=10$ +^SIGNAL=0$ -- -- Test 3 of 3 to check that any of the enum constants can be chosen. diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-class.desc b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-class.desc index 8c3b4c1963..3c08765123 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-class.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-class.desc @@ -1,6 +1,8 @@ CORE ArrayValueAnnotationOnClass.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class Getting class `MyClassB' from file \.[\\/]MyClassB\.class -- diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-field.desc b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-field.desc index aaa798de6e..0774f63bd1 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-field.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-field.desc @@ -1,6 +1,8 @@ CORE ArrayValueAnnotationOnField.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class Getting class `MyClassB' from file \.[\\/]MyClassB\.class -- diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-method.desc b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-method.desc index 7ecdd8d3cc..9c75a2df3a 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-method.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-method.desc @@ -1,6 +1,8 @@ CORE ArrayValueAnnotationOnMethod.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class Getting class `MyClassB' from file \.[\\/]MyClassB\.class -- diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-parameter.desc b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-parameter.desc index 558b9d9b89..20defa487e 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-parameter.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-parameter.desc @@ -1,6 +1,8 @@ CORE ArrayValueAnnotationOnParameter.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class Getting class `MyClassB' from file \.[\\/]MyClassB\.class -- diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-class.desc b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-class.desc index 78f7e0d9fc..5139fd0a95 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-class.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-class.desc @@ -1,6 +1,8 @@ CORE ClassValueAnnotationOnClass.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class -- MyClassB diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-field.desc b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-field.desc index 86174bd18d..b825f7af17 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-field.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-field.desc @@ -1,6 +1,8 @@ CORE ClassValueAnnotationOnField.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class -- MyClassB diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-method.desc b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-method.desc index 7ec796919f..4c1565f6e9 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-method.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-method.desc @@ -1,6 +1,8 @@ CORE ClassValueAnnotationOnMethod.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class -- MyClassB diff --git a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-parameter.desc b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-parameter.desc index a1f61ef11a..c1897af858 100644 --- a/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-parameter.desc +++ b/jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-parameter.desc @@ -1,6 +1,8 @@ CORE ClassValueAnnotationOnParameter.class --verbosity 10 +^EXIT=6$ +^SIGNAL=0$ Getting class `MyClassA' from file \.[\\/]MyClassA\.class -- MyClassB diff --git a/jbmc/regression/jbmc/class_hierarchy/test_json.desc b/jbmc/regression/jbmc/class_hierarchy/test_json.desc index 1a61736d0b..a1b3883bde 100644 --- a/jbmc/regression/jbmc/class_hierarchy/test_json.desc +++ b/jbmc/regression/jbmc/class_hierarchy/test_json.desc @@ -2,6 +2,6 @@ CORE symex-driven-lazy-loading-expected-failure HierarchyTest.class --show-class-hierarchy --json-ui activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ \{\n *"isAbstract": true,\n *"name": "java::HierarchyTest",\n *"parents": \[\n *"java::java.lang.Object"\n *\],\n *"children": \[\n *"java::HierarchyTestChild(1|2)",\n *"java::HierarchyTestChild(1|2)"\n *\]\n *\},\n *\{\n *"isAbstract": false,\n *"name": "java::HierarchyTestGrandchild",\n *"parents": \[\n *"java::HierarchyTestChild1",\n *"java::HierarchyTestInterface1",\n *"java::HierarchyTestInterface2"\n *\],\n *"children": \[\n *\]\n *\},\n *\{\n *"isAbstract": false,\n *"name": "java::HierarchyTestChild2",\n *"parents": \[\n *"java::HierarchyTest"\n *\],\n *"children": \[\n *\]\n *\},\n *\{\n *"isAbstract": false,\n *"name": "java::HierarchyTestChild1",\n *"parents": \[\n *"java::HierarchyTest"\n *\],\n *"children": \[\n *"java::HierarchyTestGrandchild"\n *\]\n *\},\n *\{\n *"isAbstract": true,\n *"name": "java::HierarchyTestInterface1",\n *"parents": \[\n *"java::java.lang.Object"\n *\],\n *"children": \[\n *"java::HierarchyTestGrandchild"\n *\]\n *\},\n *\{\n *"isAbstract": true,\n *"name": "java::HierarchyTestInterface2",\n *"parents": \[\n *"java::java.lang.Object"\n *\],\n *"children": \[\n *"java::HierarchyTestGrandchild"\n *\]\n *\}, diff --git a/jbmc/regression/jbmc/class_hierarchy/test_plain.desc b/jbmc/regression/jbmc/class_hierarchy/test_plain.desc index fa11b97bfe..8494ec04d0 100644 --- a/jbmc/regression/jbmc/class_hierarchy/test_plain.desc +++ b/jbmc/regression/jbmc/class_hierarchy/test_plain.desc @@ -2,6 +2,6 @@ CORE symex-driven-lazy-loading-expected-failure HierarchyTest.class --show-class-hierarchy activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ java::HierarchyTest \(abstract\):\n *parents:\n *java::java\.lang\.Object\n *children:\n *java::HierarchyTestChild(1|2)\n *java::HierarchyTestChild(1|2)\njava::HierarchyTestGrandchild:\n *parents:\n *java::HierarchyTestChild1\n *java::HierarchyTestInterface1\n *java::HierarchyTestInterface2\n *children:\njava::HierarchyTestChild2:\n *parents:\n *java::HierarchyTest\n *children:\njava::HierarchyTestChild1:\n *parents:\n *java::HierarchyTest\n *children:\n *java::HierarchyTestGrandchild\njava::HierarchyTestInterface1 \(abstract\):\n *parents:\n *java::java\.lang\.Object\n *children:\n *java::HierarchyTestGrandchild\njava::HierarchyTestInterface2 \(abstract\):\n *parents:\n *java::java\.lang\.Object\n *children:\n *java::HierarchyTestGrandchild diff --git a/jbmc/regression/jbmc/classpath-class-incorrect-package/test.desc b/jbmc/regression/jbmc/classpath-class-incorrect-package/test.desc index 80c7ebf54e..8ecc46cd9d 100644 --- a/jbmc/regression/jbmc/classpath-class-incorrect-package/test.desc +++ b/jbmc/regression/jbmc/classpath-class-incorrect-package/test.desc @@ -2,6 +2,7 @@ KNOWNBUG Test.class --classpath src ^EXIT=6$ +^SIGNAL=0$ -- Java main class: Test failed to open input file `Test.class' diff --git a/jbmc/regression/jbmc/classpath-class-with-one-dir/test_prefix.desc b/jbmc/regression/jbmc/classpath-class-with-one-dir/test_prefix.desc index 540db90a55..bdf7c94830 100644 --- a/jbmc/regression/jbmc/classpath-class-with-one-dir/test_prefix.desc +++ b/jbmc/regression/jbmc/classpath-class-with-one-dir/test_prefix.desc @@ -2,6 +2,7 @@ KNOWNBUG src/Test.class ^EXIT=6$ +^SIGNAL=0$ -- Parsing src/Test.class -- diff --git a/jbmc/regression/jbmc/classpath-jar-entry-method/test.desc b/jbmc/regression/jbmc/classpath-jar-entry-method/test.desc index 80f49f889e..71e0940787 100644 --- a/jbmc/regression/jbmc/classpath-jar-entry-method/test.desc +++ b/jbmc/regression/jbmc/classpath-jar-entry-method/test.desc @@ -1,8 +1,8 @@ CORE jar_file.jar --function RelevantClass.entry --verbosity 10 -^EXIT=10 -^SIGNAL=0 +^EXIT=10$ +^SIGNAL=0$ VERIFICATION FAILED Getting class `RelevantClass' from JAR jar_file.jar Getting class `RelatedClass' from JAR jar_file.jar diff --git a/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_class.desc b/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_class.desc index e4f84fe846..56820974f1 100644 --- a/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_class.desc +++ b/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_class.desc @@ -2,6 +2,7 @@ KNOWNBUG Test.class --classpath test.jar ^EXIT=6$ +^SIGNAL=0$ -- Java main class: Test failed to open input file `Test.class' diff --git a/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_jar_main_class.desc b/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_jar_main_class.desc index 4571dd6f8c..e7befbb741 100644 --- a/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_jar_main_class.desc +++ b/jbmc/regression/jbmc/classpath-jar-incorrect-package/test_jar_main_class.desc @@ -2,6 +2,7 @@ KNOWNBUG test.jar --main-class Test.class ^EXIT=6$ +^SIGNAL=0$ -- Java main class: Test failed to open input file `Test.class' diff --git a/jbmc/regression/jbmc/classpath-two-classes/test.desc b/jbmc/regression/jbmc/classpath-two-classes/test.desc index 0e52df3241..cfb64f41ec 100644 --- a/jbmc/regression/jbmc/classpath-two-classes/test.desc +++ b/jbmc/regression/jbmc/classpath-two-classes/test.desc @@ -2,6 +2,7 @@ CORE Test.class ^EXIT=10$ +^SIGNAL=0$ ^VERIFICATION FAILED$ -- -- diff --git a/jbmc/regression/jbmc/classpath-two-classes/test_incorrect.desc b/jbmc/regression/jbmc/classpath-two-classes/test_incorrect.desc index be27fd91d4..06e74a8e0e 100644 --- a/jbmc/regression/jbmc/classpath-two-classes/test_incorrect.desc +++ b/jbmc/regression/jbmc/classpath-two-classes/test_incorrect.desc @@ -2,6 +2,7 @@ KNOWNBUG Test.class Test2.class ^EXIT=6$ +^SIGNAL=0$ -- Invariant check failed -- diff --git a/jbmc/regression/jbmc/classpath-two-jars/test.desc b/jbmc/regression/jbmc/classpath-two-jars/test.desc index 3b4730cad8..dc5f896361 100644 --- a/jbmc/regression/jbmc/classpath-two-jars/test.desc +++ b/jbmc/regression/jbmc/classpath-two-jars/test.desc @@ -2,6 +2,7 @@ CORE libs/test.jar --main-class Test --classpath lib/test2.jar ^EXIT=10$ +^SIGNAL=0$ ^VERIFICATION FAILED$ -- -- diff --git a/jbmc/regression/jbmc/classpath-two-jars/test2.desc b/jbmc/regression/jbmc/classpath-two-jars/test2.desc index 3a040529ef..aa072736d4 100644 --- a/jbmc/regression/jbmc/classpath-two-jars/test2.desc +++ b/jbmc/regression/jbmc/classpath-two-jars/test2.desc @@ -2,6 +2,7 @@ CORE lib/test2.jar --main-class Test --classpath libs/test.jar ^EXIT=10$ +^SIGNAL=0$ ^VERIFICATION FAILED$ -- -- diff --git a/jbmc/regression/jbmc/classpath-two-jars/test_incorrect.desc b/jbmc/regression/jbmc/classpath-two-jars/test_incorrect.desc index 8cf2f2aea0..a743428a54 100644 --- a/jbmc/regression/jbmc/classpath-two-jars/test_incorrect.desc +++ b/jbmc/regression/jbmc/classpath-two-jars/test_incorrect.desc @@ -2,6 +2,7 @@ KNOWNBUG libs/test.jar lib/test2.jar --main-class Test.class ^EXIT=6$ +^SIGNAL=0$ -- Invariant check failed the program has no entry point diff --git a/jbmc/regression/jbmc/classpath-two-jars/test_incorrect2.desc b/jbmc/regression/jbmc/classpath-two-jars/test_incorrect2.desc index 39ab68717b..5a19b046a9 100644 --- a/jbmc/regression/jbmc/classpath-two-jars/test_incorrect2.desc +++ b/jbmc/regression/jbmc/classpath-two-jars/test_incorrect2.desc @@ -2,6 +2,7 @@ KNOWNBUG Test.class --classpath `../../../../scripts/format_classpath.sh libs/test.jar lib/test2.jar` ^EXIT=6$ +^SIGNAL=0$ -- -- This is incorrect as it would search for a Test.class file outside the jar files. diff --git a/jbmc/regression/jbmc/cprover-always-load-nondet-initialize/test.desc b/jbmc/regression/jbmc/cprover-always-load-nondet-initialize/test.desc index 7c4117e0a1..1a8633be3c 100644 --- a/jbmc/regression/jbmc/cprover-always-load-nondet-initialize/test.desc +++ b/jbmc/regression/jbmc/cprover-always-load-nondet-initialize/test.desc @@ -1,8 +1,8 @@ KNOWNBUG Test.class --function Test.test --show-goto-functions -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ ObjectWithNondetInitialize\.cproverNondetInitialize\(\) -- -- diff --git a/jbmc/regression/jbmc/destructors/block.desc b/jbmc/regression/jbmc/destructors/block.desc index 8e7503ab59..93393cf92d 100644 --- a/jbmc/regression/jbmc/destructors/block.desc +++ b/jbmc/regression/jbmc/destructors/block.desc @@ -3,6 +3,8 @@ DestructorStackTests.class --show-goto-functions --function DestructorStackTests.mainTest --unwind 10 activate-multi-line-match [0-9]+: dead strings;[\s]*(?P(\/\/ [0-9]+ file DestructorStackTests\.java line 42 function java::DestructorStackTests\.mainTest:\(Z\)V bytecode-index 90)|(\/\/ [0-9]+ no location))[\s]*dead minor1;[\s]*(?P>comment_block)[\s]*dead anonlocal::[0-9a-zA-Z]+;[\s]*(?P>comment_block)[\s]*[0-9]+: END_FUNCTION +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: diff --git a/jbmc/regression/jbmc/destructors/break.desc b/jbmc/regression/jbmc/destructors/break.desc index 8ec352af9d..c29d206184 100644 --- a/jbmc/regression/jbmc/destructors/break.desc +++ b/jbmc/regression/jbmc/destructors/break.desc @@ -3,6 +3,8 @@ DestructorStackTests.class --show-goto-functions --function DestructorStackTests.mainTest --unwind 10 activate-multi-line-match (?P\/\/ [0-9]+ file DestructorStackTests\.java line 34 function java::DestructorStackTests\.mainTest:\(Z\)V bytecode-index 84)[\s]*dead throwaway;[\s]*(?P>comment_block)[\s]*dead new_tmp[0-9]+;[\s]*(?P>comment_block)[\s]*dead val;[\s]*(?P>comment_block)[\s]*GOTO [0-9]+ +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: diff --git a/jbmc/regression/jbmc/destructors/continue.desc b/jbmc/regression/jbmc/destructors/continue.desc index 1a49d322fa..c85834997e 100644 --- a/jbmc/regression/jbmc/destructors/continue.desc +++ b/jbmc/regression/jbmc/destructors/continue.desc @@ -3,6 +3,8 @@ DestructorStackTests.class --show-goto-functions --function DestructorStackTests.mainTest --unwind 10 activate-multi-line-match (?P\/\/ [0-9]+ file DestructorStackTests\.java line 39 function java::DestructorStackTests\.mainTest:\(Z\)V bytecode-index 89)[\s]*dead throwaway;[\s]*(?P>comment_block)[\s]*dead new_tmp[0-9]+;[\s]*(?P>comment_block)[\s]*dead val;[\s]*(?P>comment_block)[\s]*GOTO [0-9]+ +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: diff --git a/jbmc/regression/jbmc/destructors/decl.desc b/jbmc/regression/jbmc/destructors/decl.desc index ec95c24691..0310abb2ca 100644 --- a/jbmc/regression/jbmc/destructors/decl.desc +++ b/jbmc/regression/jbmc/destructors/decl.desc @@ -3,6 +3,8 @@ DestructorStackTests.class --show-goto-functions --function DestructorStackTests.mainTest --unwind 10 activate-multi-line-match IF !\(\(int\)unknown == 0\) THEN GOTO [0-9]+[\s]*(?P\/\/ [0-9]+ file DestructorStackTests\.java line 24 function java::DestructorStackTests\.mainTest:\(Z\)V bytecode-index 50)[\s]*dead new_tmp[0-9]+;[\s]*(?P>comment_block)[\s]*GOTO [0-9]+[\s]*\/\/ [0-9]+ no location[\s]*[0-9]+: dead new_tmp[0-9]+;[\s]* +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: @@ -16,4 +18,4 @@ Checks for: 1: dead new_tmp0; Tests to make sure a declaration kills its temp variable before continuing. -Numbers vary between symex load / normal load. \ No newline at end of file +Numbers vary between symex load / normal load. diff --git a/jbmc/regression/jbmc/destructors/return.desc b/jbmc/regression/jbmc/destructors/return.desc index 1f81d7dae2..e6775eda0d 100644 --- a/jbmc/regression/jbmc/destructors/return.desc +++ b/jbmc/regression/jbmc/destructors/return.desc @@ -3,6 +3,8 @@ DestructorStackTests.class --show-goto-functions --function DestructorStackTests.mainTest --unwind 10 activate-multi-line-match (?\/\/ [0-9]+ file DestructorStackTests\.java line 18 function java::DestructorStackTests.mainTest:\(Z\)V bytecode-index 40)[\s]*dead minor[0-9]+;[\s]*(?P>comment_block)[\s]*dead new_tmp[0-9]+;[\s]*(?P>comment_block)[\s]*dead anonlocal::[0-9a-zA-Z]+;[\s]*(?P>comment_block)[\s]*dead new_tmp[0-9]+;[\s]*(?P>comment_block)[\s]*dead ex;[\s]*(?P>comment_block)[\s]*dead minor2;[\s]*(?P>comment_block)[\s]*dead minor1;[\s]*(?P>comment_block)[\s]*dead anonlocal::[0-9a-zA-Z]+;[\s]*(?P>comment_block)[\s]*GOTO [0-9]+ +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: diff --git a/jbmc/regression/jbmc/internal1/test.desc b/jbmc/regression/jbmc/internal1/test.desc index cf3ffadb36..354200e6f1 100644 --- a/jbmc/regression/jbmc/internal1/test.desc +++ b/jbmc/regression/jbmc/internal1/test.desc @@ -2,8 +2,8 @@ CORE com/diffblue/javatest/nestedobjects/subpackage/Order.class --json-ui --function 'com.diffblue.javatest.nestedobjects.subpackage.Order.setItem:(Lcom/diffblue/javatest/nestedobjects/subpackage/Item;)Z' --trace activate-multi-line-match -EXIT=10 -SIGNAL=0 +^EXIT=10$ +^SIGNAL=0$ "identifier": "__CPROVER_initialize",\n *"sourceLocation": [{][}]\n *[}],\n *"hidden": false,\n *"internal": true,\n *"stepType": "function-call", "internal": true,\n *"lhs": "tmp_object_factory[$][0-9]+", "internal": false,\n *"sourceLocation": [{]\n *"file": "com/diffblue/javatest/nestedobjects/subpackage/Order.java",\n *"function": "java::com.diffblue.javatest.nestedobjects.subpackage.Order.setItem:[(]Lcom/diffblue/javatest/nestedobjects/subpackage/Item;[)]Z",\n *"line": "21"\n *[}],\n *"stepType": "function-call", diff --git a/jbmc/regression/jbmc/json_trace3/test.desc b/jbmc/regression/jbmc/json_trace3/test.desc index 8cedd7690f..2996d7a5ca 100644 --- a/jbmc/regression/jbmc/json_trace3/test.desc +++ b/jbmc/regression/jbmc/json_trace3/test.desc @@ -2,8 +2,8 @@ CORE Test.class --trace --json-ui --unwind 5 --function Test.main activate-multi-line-match -EXIT=10 -SIGNAL=0 +^EXIT=10$ +^SIGNAL=0$ "lhs": "dynamic_object3\[1L?\]",\n *"mode": "java",\n *"sourceLocation": \{\n *"bytecodeIndex": "18",\n *"file": "Test\.java",\n *"function": "java::Test\.main:\(\[J\)V",\n *"line": "8"\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" diff --git a/jbmc/regression/jbmc/lambda2/test.desc b/jbmc/regression/jbmc/lambda2/test.desc index c536fbae21..dff6e49bd9 100644 --- a/jbmc/regression/jbmc/lambda2/test.desc +++ b/jbmc/regression/jbmc/lambda2/test.desc @@ -2,8 +2,8 @@ KNOWNBUG SymStream.class --show-goto-functions lambda function reference org/symphonyoss/symphony/clients/model/SymUser\.toSymUser in class \"SymStream\" -^EXIT=0 -^SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ -- -- lambda functions without "lambda$" prefix aren't recognized currently TG-2691 diff --git a/jbmc/regression/jbmc/lambda2/test_no_crash.desc b/jbmc/regression/jbmc/lambda2/test_no_crash.desc index 360dcbd372..6bdc9f87dd 100644 --- a/jbmc/regression/jbmc/lambda2/test_no_crash.desc +++ b/jbmc/regression/jbmc/lambda2/test_no_crash.desc @@ -1,8 +1,8 @@ CORE symex-driven-lazy-loading-expected-failure SymStream.class --no-lazy-methods --show-goto-functions -^EXIT=0 -^SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ -- -- just to test that it doesn't crash in this situation, cf. TG-2684 diff --git a/jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc b/jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc index 2532ac7cf6..f18eaba6d6 100644 --- a/jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc +++ b/jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc @@ -2,9 +2,8 @@ CORE StaticMethodRef.class --function StaticMethodRef.Smr VERIFICATION FAILED -EXIT=10 -SIGNAL=0 -^SIGNAL=0 +^EXIT=10$ +^SIGNAL=0$ -- -- Tests that it doesn't crash when failing to read a `BootstrapMethods` entry and diff --git a/jbmc/regression/jbmc/lazyloading10/test.desc b/jbmc/regression/jbmc/lazyloading10/test.desc index 9941229be9..5cf192f076 100644 --- a/jbmc/regression/jbmc/lazyloading10/test.desc +++ b/jbmc/regression/jbmc/lazyloading10/test.desc @@ -1,6 +1,7 @@ CORE symex-driven-lazy-loading-expected-failure test.class --verbosity 10 --function test.f --lazy-methods-extra-entry-point test.sety +^EXIT=0$ ^SIGNAL=0$ CI lazy methods: elaborate java::test\.sety:\(I\)V CI lazy methods: elaborate java::test\.sety:\(F\)V diff --git a/jbmc/regression/jbmc/lazyloading_opaquereturn/test.desc b/jbmc/regression/jbmc/lazyloading_opaquereturn/test.desc index 422bcd0309..9585b1dd61 100644 --- a/jbmc/regression/jbmc/lazyloading_opaquereturn/test.desc +++ b/jbmc/regression/jbmc/lazyloading_opaquereturn/test.desc @@ -1,6 +1,8 @@ CORE symex-driven-lazy-loading-expected-failure TestClass.class --function TestClass.testFunction --verbosity 10 +^EXIT=10$ +^SIGNAL=0$ CI lazy methods: elaborate java::Foo\.cproverNondetInitialize:\(\)V CI lazy methods: elaborate java::Bar\.cproverNondetInitialize:\(\)V CI lazy methods: elaborate java::Baz\.cproverNondetInitialize:\(\)V diff --git a/jbmc/regression/jbmc/reachability-slice/test.desc b/jbmc/regression/jbmc/reachability-slice/test.desc index 0ddbc9d050..4123f36ff6 100644 --- a/jbmc/regression/jbmc/reachability-slice/test.desc +++ b/jbmc/regression/jbmc/reachability-slice/test.desc @@ -1,6 +1,8 @@ CORE symex-driven-lazy-loading-expected-failure A.class --reachability-slice --function A.foo --show-goto-functions --property 'java::A.foo:(I)V.assertion.1' +^EXIT=0$ +^SIGNAL=0$ = \(int\)\(short\)1001 = \(int\)\(short\)1002 = \(int\)\(short\)1003 diff --git a/jbmc/regression/jbmc/reachability-slice/test2.desc b/jbmc/regression/jbmc/reachability-slice/test2.desc index 11c6476898..e17333cc64 100644 --- a/jbmc/regression/jbmc/reachability-slice/test2.desc +++ b/jbmc/regression/jbmc/reachability-slice/test2.desc @@ -1,6 +1,8 @@ CORE symex-driven-lazy-loading-expected-failure A.class --reachability-slice --function A.foo --show-goto-functions --property 'java::A.foo:(I)V.assertion.2' +^EXIT=0$ +^SIGNAL=0$ = \(int\)\(short\)1001 = \(int\)\(short\)1004 -- diff --git a/jbmc/regression/jbmc/reachability-slice/test3.desc b/jbmc/regression/jbmc/reachability-slice/test3.desc index 4c7e8091dc..d0df5bd37c 100644 --- a/jbmc/regression/jbmc/reachability-slice/test3.desc +++ b/jbmc/regression/jbmc/reachability-slice/test3.desc @@ -1,6 +1,8 @@ CORE symex-driven-lazy-loading-expected-failure A.class --reachability-slice --function A.foo --show-goto-functions +^EXIT=0$ +^SIGNAL=0$ = \(int\)\(short\)1001 = \(int\)\(short\)1002 = \(int\)\(short\)1003 diff --git a/jbmc/regression/jbmc/swap1/test.desc b/jbmc/regression/jbmc/swap1/test.desc index 8f803004f2..2befbf4463 100644 --- a/jbmc/regression/jbmc/swap1/test.desc +++ b/jbmc/regression/jbmc/swap1/test.desc @@ -1,7 +1,7 @@ CORE Swap.class -^EXIT=0 +^EXIT=0$ ^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ -- diff --git a/jbmc/regression/jbmc/swap2/test.desc b/jbmc/regression/jbmc/swap2/test.desc index 69f2f769e4..70ddeb332f 100644 --- a/jbmc/regression/jbmc/swap2/test.desc +++ b/jbmc/regression/jbmc/swap2/test.desc @@ -1,7 +1,7 @@ CORE org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class --function 'org.springframework.build.gradle.MergePlugin$1$_execute_closure1$_closure2.$getCallSiteArray:()[Lorg/codehaus/groovy/runtime/callsite/CallSite;' -^EXIT=0 +^EXIT=0$ ^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ -- diff --git a/jbmc/regression/jbmc/temp_stack_variable_packing/test.desc b/jbmc/regression/jbmc/temp_stack_variable_packing/test.desc index 9a2c49b2f3..5c7ea223fc 100644 --- a/jbmc/regression/jbmc/temp_stack_variable_packing/test.desc +++ b/jbmc/regression/jbmc/temp_stack_variable_packing/test.desc @@ -1,6 +1,8 @@ CORE Primary.class --function Primary.main +^EXIT=10$ +^SIGNAL=0$ ^\[java::Primary.Run:\(\)V\.assertion\.1\] line 6 assertion at file Primary\.java line 6 function java::Primary.Run:\(\)V bytecode-index 22: FAILURE$ ^VERIFICATION FAILED$ -- diff --git a/jbmc/regression/jdiff/java-add-package/test.desc b/jbmc/regression/jdiff/java-add-package/test.desc index 7562b7bb7e..7cddf6b5ae 100644 --- a/jbmc/regression/jdiff/java-add-package/test.desc +++ b/jbmc/regression/jdiff/java-add-package/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[\n \{\n "name": "java::Test\.:\(\)V",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.:\(\)\V",\n "line": "1"\n \}\n \},\n \{\n "name": "java::Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(I\)I",\n "line": "4"\n \}\n \},\n \{\n "name": "java::Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test.bar:\(I\)I",\n "line": "12"\n \}\n \}\n \],\n "modifiedFunctions": \[ \], "newFunctions": \[\n \{\n "name": "java::foo\.Test\.:\(\)V",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.:\(\)V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n \}\n \},\n \{\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \], diff --git a/jbmc/regression/jdiff/java-clinit-wrapper/test.desc b/jbmc/regression/jdiff/java-clinit-wrapper/test.desc index a4f9c4d155..b8f606532f 100644 --- a/jbmc/regression/jdiff/java-clinit-wrapper/test.desc +++ b/jbmc/regression/jdiff/java-clinit-wrapper/test.desc @@ -1,8 +1,8 @@ CORE new.jar old.jar -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ -- java::java\.nio\.charset\.StandardCharsets::clinit_wrapper$ java::org\.apache\.tika\.mime\.MediaType::clinit_wrapper$ diff --git a/jbmc/regression/jdiff/java-del-package/test.desc b/jbmc/regression/jdiff/java-del-package/test.desc index 2106c6a855..6e5b4c91d9 100644 --- a/jbmc/regression/jdiff/java-del-package/test.desc +++ b/jbmc/regression/jdiff/java-del-package/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[\n \{\n "name": "java::foo\.Test\.:\(\)V",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.:\(\)V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n \}\n \},\n \{\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \], "modifiedFunctions": \[ \], "newFunctions": \[\n \{\n "name": "java::Test\.:\(\)V",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.:\(\)\V",\n "line": "1"\n \}\n \},\n \{\n "name": "java::Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(I\)I",\n "line": "4"\n \}\n \},\n \{\n "name": "java::Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test.bar:\(I\)I",\n "line": "12"\n \}\n \}\n \],\n diff --git a/jbmc/regression/jdiff/java-deleted-function/test.desc b/jbmc/regression/jdiff/java-deleted-function/test.desc index 4aa71eb90e..195acc61ea 100644 --- a/jbmc/regression/jdiff/java-deleted-function/test.desc +++ b/jbmc/regression/jdiff/java-deleted-function/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[\n \{\n "name": "java::Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(I\)I",\n "line": "4"\n \}\n \}\n \], "modifiedFunctions": \[ \], "newFunctions": \[ \], diff --git a/jbmc/regression/jdiff/java-instanceof/test.desc b/jbmc/regression/jdiff/java-instanceof/test.desc index 9e5863b5a5..0d4c9a935b 100644 --- a/jbmc/regression/jdiff/java-instanceof/test.desc +++ b/jbmc/regression/jdiff/java-instanceof/test.desc @@ -3,8 +3,8 @@ new.jar old.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\nmodified functions:\ndeleted functions: -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-mod-comment/test.desc b/jbmc/regression/jdiff/java-mod-comment/test.desc index 3a4cbfe0bc..33aa972fcb 100644 --- a/jbmc/regression/jdiff/java-mod-comment/test.desc +++ b/jbmc/regression/jdiff/java-mod-comment/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \], "modifiedFunctions": \[ \], "newFunctions": \[ \], diff --git a/jbmc/regression/jdiff/java-mod-identifier/test.desc b/jbmc/regression/jdiff/java-mod-identifier/test.desc index 3a4cbfe0bc..33aa972fcb 100644 --- a/jbmc/regression/jdiff/java-mod-identifier/test.desc +++ b/jbmc/regression/jdiff/java-mod-identifier/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \], "modifiedFunctions": \[ \], "newFunctions": \[ \], diff --git a/jbmc/regression/jdiff/java-mod-identifier2/test.desc b/jbmc/regression/jdiff/java-mod-identifier2/test.desc index 85e358df74..5f18566442 100644 --- a/jbmc/regression/jdiff/java-mod-identifier2/test.desc +++ b/jbmc/regression/jdiff/java-mod-identifier2/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \], "modifiedFunctions": \[\n \{\n "name": "java::Test\.foo:\(II\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(II\)I",\n "line": "4"\n \}\n \}\n \],\n "newFunctions": \[ \], diff --git a/jbmc/regression/jdiff/java-mod-package/test.desc b/jbmc/regression/jdiff/java-mod-package/test.desc index d64ab3bde3..40d1298f66 100644 --- a/jbmc/regression/jdiff/java-mod-package/test.desc +++ b/jbmc/regression/jdiff/java-mod-package/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[\n \{\n "name": "java::foo\.Test\.:\(\)V",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.:\(\)V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n \}\n \},\n \{\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \], "modifiedFunctions": \[ \], "newFunctions": \[\n \{\n "name": "java::com\.diffblue\.foo\.Test\.:\(\)V",\n "sourceLocation": \{\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test\.:\(\)\V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n "line": "6"\n \}\n \},\n \{\n "name": "java::com\.diffblue\.foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],\n diff --git a/jbmc/regression/jdiff/java-new-function/test.desc b/jbmc/regression/jdiff/java-new-function/test.desc index 6b11bbd326..7f38b14067 100644 --- a/jbmc/regression/jdiff/java-new-function/test.desc +++ b/jbmc/regression/jdiff/java-new-function/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \], "modifiedFunctions": \[ \], "newFunctions": \[\n \{\n "name": "java::Test\.foo:\(II\)I",\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test\.foo:\(II\)I",\n "line": "4"\n \}\n \}\n \], diff --git a/jbmc/regression/jdiff/java-no-change/test.desc b/jbmc/regression/jdiff/java-no-change/test.desc index 3a4cbfe0bc..33aa972fcb 100644 --- a/jbmc/regression/jdiff/java-no-change/test.desc +++ b/jbmc/regression/jdiff/java-no-change/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \], "modifiedFunctions": \[ \], "newFunctions": \[ \], diff --git a/jbmc/regression/jdiff/java-properties/test.desc b/jbmc/regression/jdiff/java-properties/test.desc index a79dbe66de..b865a6e4c6 100644 --- a/jbmc/regression/jdiff/java-properties/test.desc +++ b/jbmc/regression/jdiff/java-properties/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui --show-properties --cover location // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[\n \{\n "name": "java::Test.obsolete:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "18",\n "description": "block 1 \(lines Test.java:java::Test.obsolete:\(\)V:18\)",\n "expression": "false",\n "name": "java::Test.obsolete:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "0",\n "file": "Test.java",\n "function": "java::Test.obsolete:\(\)V",\n "line": "18"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.obsolete:\(\)V",\n "line": "18"\n }\n }\n ],\n "modifiedFunctions": \[\n \{\n "name": "java::Test.:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "6",\n "description": "block 2 \(lines Test.java:java::Test.:\(\)V:6\)",\n "expression": "false",\n "name": "java::Test.:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "1",\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "6"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 3 \(lines Test.java:java::Test.:\(\)V:4\)",\n "expression": "false",\n "name": "java::Test.:\(\)V.coverage.2",\n "sourceLocation": \{\n "bytecodeIndex": "3",\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 4 \(lines Test.java:java::Test.:\(\)V:4\)",\n "expression": "false",\n "name": "java::Test.:\(\)V.coverage.3",\n "sourceLocation": \{\n "bytecodeIndex": "5",\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 5 \(lines Test.java:java::Test.:\(\)V:4\)",\n "expression": "false",\n "name": "java::Test.:\(\)V.coverage.4",\n "sourceLocation": \{\n "bytecodeIndex": "6",\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "7",\n "description": "block 6 \(lines Test.java:java::Test.:\(\)V:7\)",\n "expression": "false",\n "name": "java::Test.:\(\)V.coverage.5",\n "sourceLocation": \{\n "bytecodeIndex": "7",\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "7"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "6"\n }\n },\n \{\n "name": "java::Test.:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "3",\n "description": "block 1 \(lines Test.java:java::Test.:\(\)V:3\)",\n "expression": "false",\n "name": "java::Test.:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "1",\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "3"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.:\(\)V",\n "line": "3"\n }\n }\n ],\n "newFunctions": \[\n \{\n "name": "java::Test.newfun:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "18",\n "description": "block 1 \(lines Test.java:java::Test.newfun:\(\)V:18\)",\n "expression": "false",\n "name": "java::Test.newfun:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "0",\n "file": "Test.java",\n "function": "java::Test.newfun:\(\)V",\n "line": "18"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.newfun:\(\)V",\n "line": "18"\n }\n }\n ],\n -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-scope-change/test.desc b/jbmc/regression/jdiff/java-scope-change/test.desc index 0583be7e77..cf5459bf82 100644 --- a/jbmc/regression/jdiff/java-scope-change/test.desc +++ b/jbmc/regression/jdiff/java-scope-change/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \],\n "modifiedFunctions": \[\n \{\n "name": "java::Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(I\)I",\n "line": "4"\n \}\n \},\n \{\n "name": "java::Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.bar:\(I\)I",\n "line": "12"\n \}\n \}\n \],\n "newFunctions": \[ \], -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-scope-change2/test.desc b/jbmc/regression/jdiff/java-scope-change2/test.desc index 4085770f55..1e78bb7a60 100644 --- a/jbmc/regression/jdiff/java-scope-change2/test.desc +++ b/jbmc/regression/jdiff/java-scope-change2/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \],\n "modifiedFunctions": \[\n \{\n "name": "java::Test\.:\(\)V",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.:\(\)V",\n "line": "1"\n \}\n \},\n \{\n "name": "java::Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(I\)I",\n "line": "6"\n \}\n \},\n \{\n "name": "java::Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],\n "newFunctions": \[ \], -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-scope-change3/test.desc b/jbmc/regression/jdiff/java-scope-change3/test.desc index 4085770f55..1e78bb7a60 100644 --- a/jbmc/regression/jdiff/java-scope-change3/test.desc +++ b/jbmc/regression/jdiff/java-scope-change3/test.desc @@ -3,8 +3,8 @@ new.jar old.jar --json-ui // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ "deletedFunctions": \[ \],\n "modifiedFunctions": \[\n \{\n "name": "java::Test\.:\(\)V",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.:\(\)V",\n "line": "1"\n \}\n \},\n \{\n "name": "java::Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(I\)I",\n "line": "6"\n \}\n \},\n \{\n "name": "java::Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],\n "newFunctions": \[ \], -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-tmp-vars-array/test.desc b/jbmc/regression/jdiff/java-tmp-vars-array/test.desc index 9fb8793fd1..9f3f918554 100644 --- a/jbmc/regression/jdiff/java-tmp-vars-array/test.desc +++ b/jbmc/regression/jdiff/java-tmp-vars-array/test.desc @@ -3,8 +3,8 @@ new.jar old.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\nmodified functions:\n Test\.java: java::Test\.f00:\(\[I\)\[I\ndeleted functions: -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-tmp-vars-inc/test.desc b/jbmc/regression/jdiff/java-tmp-vars-inc/test.desc index 01f06839d1..404e7ef415 100644 --- a/jbmc/regression/jdiff/java-tmp-vars-inc/test.desc +++ b/jbmc/regression/jdiff/java-tmp-vars-inc/test.desc @@ -3,8 +3,8 @@ new.jar old.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\nmodified functions:\n Test\.java: java::Test\.f00:\(I\)I\ndeleted functions: -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-tmp-vars-new/test.desc b/jbmc/regression/jdiff/java-tmp-vars-new/test.desc index 232483ea3d..50df51d0af 100644 --- a/jbmc/regression/jdiff/java-tmp-vars-new/test.desc +++ b/jbmc/regression/jdiff/java-tmp-vars-new/test.desc @@ -3,8 +3,8 @@ new.jar old.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\nmodified functions:\n Test\.java: java::Test\.f00:\(LA;\)LA;\ndeleted functions: -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-tmp-vars-string/test.desc b/jbmc/regression/jdiff/java-tmp-vars-string/test.desc index f4cf78d370..c37f2da575 100644 --- a/jbmc/regression/jdiff/java-tmp-vars-string/test.desc +++ b/jbmc/regression/jdiff/java-tmp-vars-string/test.desc @@ -3,8 +3,8 @@ new.jar old.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\nmodified functions:\n Test\.java: java::Test\.f00:\(Ljava/lang/String;\)Ljava/lang/String;\ndeleted functions: -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/java-virtual-methods/test.desc b/jbmc/regression/jdiff/java-virtual-methods/test.desc index 9e5863b5a5..0d4c9a935b 100644 --- a/jbmc/regression/jdiff/java-virtual-methods/test.desc +++ b/jbmc/regression/jdiff/java-virtual-methods/test.desc @@ -3,8 +3,8 @@ new.jar old.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\nmodified functions:\ndeleted functions: -- ^warning: ignoring diff --git a/jbmc/regression/jdiff/syntactic-diff-java1/test.desc b/jbmc/regression/jdiff/syntactic-diff-java1/test.desc index c9fd2393b0..1a898daffd 100644 --- a/jbmc/regression/jdiff/syntactic-diff-java1/test.desc +++ b/jbmc/regression/jdiff/syntactic-diff-java1/test.desc @@ -3,8 +3,8 @@ old.jar new.jar // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\n Test\.java: java::Test\.foo:\(\)V\nmodified functions:\n Test\.java: java::Test\.run:\(\)I\ndeleted functions:\n Test\.java: java::Test\.bar:\(\)V -- ^warning: ignoring diff --git a/regression/cbmc-cover/block-coverage-report1/test.desc b/regression/cbmc-cover/block-coverage-report1/test.desc index 3376924df0..c978f5fab2 100644 --- a/regression/cbmc-cover/block-coverage-report1/test.desc +++ b/regression/cbmc-cover/block-coverage-report1/test.desc @@ -6,4 +6,6 @@ block 2 \(lines main.c:main:6\): SATISFIED block 3 \(lines main.c:main:6,9\): FAILED block 4 \(lines main.c:main:8\): SATISFIED block 5 \(lines main.c:main:9\): SATISFIED +^EXIT=0$ +^SIGNAL=0$ -- diff --git a/regression/cbmc-cover/block-coverage-report2/test.desc b/regression/cbmc-cover/block-coverage-report2/test.desc index c43867e951..82ca670a35 100644 --- a/regression/cbmc-cover/block-coverage-report2/test.desc +++ b/regression/cbmc-cover/block-coverage-report2/test.desc @@ -9,4 +9,6 @@ block 5 \(lines main.c:main:20\): SATISFIED block 6 \(lines main.c:main:15,21,22\): SATISFIED block 7 \(lines main.c:main:24,25\): SATISFIED block 1 \(lines main.c:foo:6-9\): SATISFIED +^EXIT=0$ +^SIGNAL=0$ -- diff --git a/regression/cbmc-cover/block-coverage-report3/test.desc b/regression/cbmc-cover/block-coverage-report3/test.desc index 56efc33319..7a20bb7a3e 100644 --- a/regression/cbmc-cover/block-coverage-report3/test.desc +++ b/regression/cbmc-cover/block-coverage-report3/test.desc @@ -5,4 +5,6 @@ block 1 \(lines main.c:main:3\): SATISFIED block 2 \(lines main.c:main:4\): SATISFIED block 3 \(lines main.c:main:4,6\): SATISFIED block 4 \(lines main.c:main:8\): FAILED +^EXIT=0$ +^SIGNAL=0$ -- diff --git a/regression/cbmc-cover/block-coverage-report4/test.desc b/regression/cbmc-cover/block-coverage-report4/test.desc index ce8b645718..8184172af7 100644 --- a/regression/cbmc-cover/block-coverage-report4/test.desc +++ b/regression/cbmc-cover/block-coverage-report4/test.desc @@ -5,4 +5,6 @@ block 1 \(lines main.c:main:3\): SATISFIED block 2 \(lines main.c:main:4\): SATISFIED block 3 \(lines main.c:main:4,6\): SATISFIED block 4 \(lines main.c:main:8\): SATISFIED +^EXIT=0$ +^SIGNAL=0$ -- diff --git a/regression/cbmc/address_space_size_limit2/test.desc b/regression/cbmc/address_space_size_limit2/test.desc index 0cb9a06b54..7bea8c2f14 100644 --- a/regression/cbmc/address_space_size_limit2/test.desc +++ b/regression/cbmc/address_space_size_limit2/test.desc @@ -1,5 +1,7 @@ KNOWNBUG test.i --32 --object-bits 31 --unwind 11 --no-simplify +^EXIT=10$ +^SIGNAL=0$ dynamic object too large -- diff --git a/regression/cbmc/array-function-parameters/test.desc b/regression/cbmc/array-function-parameters/test.desc index b515f2c66c..73e628e5f3 100644 --- a/regression/cbmc/array-function-parameters/test.desc +++ b/regression/cbmc/array-function-parameters/test.desc @@ -1,6 +1,8 @@ CORE broken-smt-backend test.c --function test --min-null-tree-depth 2 --max-nondet-tree-depth 2 --bounds-check +^EXIT=10$ +^SIGNAL=0$ \[test.assertion.1\] line \d+ assertion Test.lists\[0\]->next: SUCCESS \[test.assertion.2\] line \d+ assertion Test.lists\[1\]->next: SUCCESS \[test.assertion.3\] line \d+ assertion Test.lists\[2\]->next: SUCCESS diff --git a/regression/cbmc/destructors/compound_literal.desc b/regression/cbmc/destructors/compound_literal.desc index 1130e72b90..46640b2c02 100644 --- a/regression/cbmc/destructors/compound_literal.desc +++ b/regression/cbmc/destructors/compound_literal.desc @@ -3,6 +3,8 @@ main.c --unwind 10 --show-goto-functions activate-multi-line-match (?P\/\/ [0-9]+ file main\.c line [0-9]+ function main)[\s]*dead newAlloc0;[\s]*(?P>comment_block)[\s]*dead pc;[\s]*(?P>comment_block)[\s]*dead literal;[\s]*(?P>comment_block)[\s]*9: END_FUNCTION +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: diff --git a/regression/cbmc/destructors/enter_lexical_block.desc b/regression/cbmc/destructors/enter_lexical_block.desc index 76f456be50..3f02325816 100644 --- a/regression/cbmc/destructors/enter_lexical_block.desc +++ b/regression/cbmc/destructors/enter_lexical_block.desc @@ -3,6 +3,8 @@ main.c --unwind 10 --show-goto-functions activate-multi-line-match (?P\/\/ [0-9]+ file main\.c line [0-9]+ function main)[\s]*6: test newAlloc4;[\s]*(?P>comment_block)[\s]*newAlloc4 = \{ \.id=4 \};[\s]*(?P>comment_block)[\s]*test newAlloc6;[\s]*(?P>comment_block)[\s]*newAlloc6 = \{ \.id=6 \};[\s]*(?P>comment_block)[\s]*test newAlloc7;[\s]*(?P>comment_block)[\s]*newAlloc7 = \{ \.id=7 \};[\s]*(?P>comment_block)[\s]*GOTO 3 +^EXIT=0$ +^SIGNAL=0$ -- -- Checks for: diff --git a/regression/cbmc/json1/test.desc b/regression/cbmc/json1/test.desc index 54927fab2b..b9eb6a3011 100644 --- a/regression/cbmc/json1/test.desc +++ b/regression/cbmc/json1/test.desc @@ -2,8 +2,8 @@ CORE main.c --json-ui --stop-on-fail activate-multi-line-match -EXIT=10 -SIGNAL=0 +^EXIT=10$ +^SIGNAL=0$ \[\n \{\n "program": "CBMC .*"\n \},\n \{\n "messageText": "CBMC .*",\n "messageType": "STATUS-MESSAGE"\n \},\n \{\n "messageText": "Parsing main\.c",\n "messageType": "STATUS-MESSAGE"\n \}, \]\n \},\n \{\n "messageText": "VERIFICATION FAILED",\n "messageType": "STATUS-MESSAGE"\n \},\n \{\n "cProverStatus": "failure"\n \}\n\] -- diff --git a/regression/cbmc/multiple-goto-traces/test.desc b/regression/cbmc/multiple-goto-traces/test.desc index 799bc99364..26037ab0f6 100644 --- a/regression/cbmc/multiple-goto-traces/test.desc +++ b/regression/cbmc/multiple-goto-traces/test.desc @@ -2,8 +2,8 @@ CORE main.c --trace activate-multi-line-match -EXIT=10 -SIGNAL=0 +^EXIT=10$ +^SIGNAL=0$ VERIFICATION FAILED Trace for main\.assertion\.1:(\n.*){16} assertion 4 \!= argc(\n.*){5}Trace for main\.assertion\.3:(\n.*){30} assertion argc != 4(\n.*){5}Trace for main\.assertion\.4:(\n.*){44} assertion argc \+ 1 != 5 \*\* 3 of 4 failed diff --git a/regression/cbmc/reachability-slice-interproc/test.desc b/regression/cbmc/reachability-slice-interproc/test.desc index d4d422fa6b..c04ff07afc 100644 --- a/regression/cbmc/reachability-slice-interproc/test.desc +++ b/regression/cbmc/reachability-slice-interproc/test.desc @@ -1,6 +1,8 @@ CORE test.c --reachability-slice-fb --show-goto-functions +^EXIT=0$ +^SIGNAL=0$ target_kept reachable_before_target_caller_1_kept reachable_after_target_caller_1_kept diff --git a/regression/cbmc/reachability-slice/test.desc b/regression/cbmc/reachability-slice/test.desc index 9d5cf620de..a8976affbe 100644 --- a/regression/cbmc/reachability-slice/test.desc +++ b/regression/cbmc/reachability-slice/test.desc @@ -1,6 +1,8 @@ CORE test.c --reachability-slice --show-goto-functions --cover location --property foo.coverage.2 +^EXIT=0$ +^SIGNAL=0$ = 1001 -- = 1004 diff --git a/regression/cbmc/reachability-slice/test2.desc b/regression/cbmc/reachability-slice/test2.desc index e7d0787aff..c20147249d 100644 --- a/regression/cbmc/reachability-slice/test2.desc +++ b/regression/cbmc/reachability-slice/test2.desc @@ -1,6 +1,8 @@ CORE test.c --reachability-slice-fb --show-goto-functions --cover location --property foo.coverage.2 +^EXIT=0$ +^SIGNAL=0$ = 1001 = 1002 = 1003 diff --git a/regression/cbmc/reachability-slice/test3.desc b/regression/cbmc/reachability-slice/test3.desc index ca3684f628..49191de1d9 100644 --- a/regression/cbmc/reachability-slice/test3.desc +++ b/regression/cbmc/reachability-slice/test3.desc @@ -1,6 +1,8 @@ CORE test.c --reachability-slice --show-goto-functions --cover location +^EXIT=0$ +^SIGNAL=0$ = 1001 = 1002 = 1003 diff --git a/regression/cbmc/typedef-anon-struct1/test.desc b/regression/cbmc/typedef-anon-struct1/test.desc index d9d9769f67..4129f0344f 100644 --- a/regression/cbmc/typedef-anon-struct1/test.desc +++ b/regression/cbmc/typedef-anon-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- warning: ignoring diff --git a/regression/cbmc/typedef-anon-struct2/test.desc b/regression/cbmc/typedef-anon-struct2/test.desc index 83af4f59a9..86e220fafc 100644 --- a/regression/cbmc/typedef-anon-struct2/test.desc +++ b/regression/cbmc/typedef-anon-struct2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT Base name\.+: another_mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/cbmc/typedef-anon-union1/test.desc b/regression/cbmc/typedef-anon-union1/test.desc index 6f74f9f557..190b89262b 100644 --- a/regression/cbmc/typedef-anon-union1/test.desc +++ b/regression/cbmc/typedef-anon-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION -- warning: ignoring diff --git a/regression/cbmc/typedef-anon-union2/test.desc b/regression/cbmc/typedef-anon-union2/test.desc index f5242dc7ac..3d5ab81722 100644 --- a/regression/cbmc/typedef-anon-union2/test.desc +++ b/regression/cbmc/typedef-anon-union2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION Base name\.+: another_myunion_var\nMode\.+: C\nType\.+: MYUNION -- diff --git a/regression/cbmc/typedef-const-struct1/test.desc b/regression/cbmc/typedef-const-struct1/test.desc index f6c2d8e4b4..4ed2abc282 100644 --- a/regression/cbmc/typedef-const-struct1/test.desc +++ b/regression/cbmc/typedef-const-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: const struct tag_struct_name Base name\.+: mystruct_var\nMode\.+: C\nType\.+: const MYSTRUCT -- diff --git a/regression/cbmc/typedef-const-type1/test.desc b/regression/cbmc/typedef-const-type1/test.desc index 0e1b67ce3d..9dfc4035aa 100644 --- a/regression/cbmc/typedef-const-type1/test.desc +++ b/regression/cbmc/typedef-const-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: const signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: const MYINT -- diff --git a/regression/cbmc/typedef-const-union1/test.desc b/regression/cbmc/typedef-const-union1/test.desc index 019a655191..96b3a3107e 100644 --- a/regression/cbmc/typedef-const-union1/test.desc +++ b/regression/cbmc/typedef-const-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_var\nMode\.+: C\nType\.+: const union tag_union_name Base name\.+: myunion_var\nMode\.+: C\nType\.+: const MYUNION -- diff --git a/regression/cbmc/typedef-param-anon-struct1/test.desc b/regression/cbmc/typedef-param-anon-struct1/test.desc index 1d7c939008..aff1030eac 100644 --- a/regression/cbmc/typedef-param-anon-struct1/test.desc +++ b/regression/cbmc/typedef-param-anon-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: mystruct_param\nMode\.+: C\nType\.+: MYSTRUCT -- warning: ignoring diff --git a/regression/cbmc/typedef-param-anon-union1/test.desc b/regression/cbmc/typedef-param-anon-union1/test.desc index 34c29cefda..be6ef9f8db 100644 --- a/regression/cbmc/typedef-param-anon-union1/test.desc +++ b/regression/cbmc/typedef-param-anon-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: myunion_param\nMode\.+: C\nType\.+: MYUNION -- warning: ignoring diff --git a/regression/cbmc/typedef-param-struct1/test.desc b/regression/cbmc/typedef-param-struct1/test.desc index ad0d23ed7a..763e2311b5 100644 --- a/regression/cbmc/typedef-param-struct1/test.desc +++ b/regression/cbmc/typedef-param-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_param\nMode\.+: C\nType\.+: struct tag_struct_name Base name\.+: mystruct_param\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/cbmc/typedef-param-type1/test.desc b/regression/cbmc/typedef-param-type1/test.desc index 14659940cd..af9864cde3 100644 --- a/regression/cbmc/typedef-param-type1/test.desc +++ b/regression/cbmc/typedef-param-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_param\nMode\.+: C\nType\.+: signed int Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT -- diff --git a/regression/cbmc/typedef-param-type2/test.desc b/regression/cbmc/typedef-param-type2/test.desc index 14e7db9d3d..f6f46e30ec 100644 --- a/regression/cbmc/typedef-param-type2/test.desc +++ b/regression/cbmc/typedef-param-type2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_param\nMode\.+: C\nType\.+: signed int Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT Base name\.+: altint_param\nMode\.+: C\nType\.+: ALTINT diff --git a/regression/cbmc/typedef-param-type3/test.desc b/regression/cbmc/typedef-param-type3/test.desc index 1f10dea255..9713651869 100644 --- a/regression/cbmc/typedef-param-type3/test.desc +++ b/regression/cbmc/typedef-param-type3/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_param\nMode\.+: C\nType\.+: signed int Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT Base name\.+: chainedint_param\nMode\.+: C\nType\.+: CHAINEDINT diff --git a/regression/cbmc/typedef-param-union1/test.desc b/regression/cbmc/typedef-param-union1/test.desc index 37ab0aee08..b97bca4db0 100644 --- a/regression/cbmc/typedef-param-union1/test.desc +++ b/regression/cbmc/typedef-param-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_param\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: myunion_param\nMode\.+: C\nType\.+: MYUNION -- diff --git a/regression/cbmc/typedef-return-anon-struct1/test.desc b/regression/cbmc/typedef-return-anon-struct1/test.desc index d7f63e586a..44a7a86adc 100644 --- a/regression/cbmc/typedef-return-anon-struct1/test.desc +++ b/regression/cbmc/typedef-return-anon-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: return'\nMode\.+: C\nType\.+: MYSTRUCT Base name\.+: fun\nMode\.+: C\nType\.+: MYSTRUCT \(\) -- diff --git a/regression/cbmc/typedef-return-anon-union1/test.desc b/regression/cbmc/typedef-return-anon-union1/test.desc index 8d8d41a4df..11048dfd12 100644 --- a/regression/cbmc/typedef-return-anon-union1/test.desc +++ b/regression/cbmc/typedef-return-anon-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: MYUNION \(\) -- warning: ignoring diff --git a/regression/cbmc/typedef-return-struct1/test.desc b/regression/cbmc/typedef-return-struct1/test.desc index c4a9dc3550..98d551440c 100644 --- a/regression/cbmc/typedef-return-struct1/test.desc +++ b/regression/cbmc/typedef-return-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: struct tag_struct_name \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: MYSTRUCT \(\) -- diff --git a/regression/cbmc/typedef-return-type1/test.desc b/regression/cbmc/typedef-return-type1/test.desc index 0ebbe5109a..594dd43515 100644 --- a/regression/cbmc/typedef-return-type1/test.desc +++ b/regression/cbmc/typedef-return-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: signed int \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: MYINT \(\) -- diff --git a/regression/cbmc/typedef-return-type2/test.desc b/regression/cbmc/typedef-return-type2/test.desc index 27b2e77902..1efe629faa 100644 --- a/regression/cbmc/typedef-return-type2/test.desc +++ b/regression/cbmc/typedef-return-type2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: MYINT \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: ALTINT \(\) -- diff --git a/regression/cbmc/typedef-return-type3/test.desc b/regression/cbmc/typedef-return-type3/test.desc index f94976bdbc..a421395b03 100644 --- a/regression/cbmc/typedef-return-type3/test.desc +++ b/regression/cbmc/typedef-return-type3/test.desc @@ -5,7 +5,7 @@ main.c activate-multi-line-match Base name\.+: fun\nMode\.+: C\nType\.+: MYINT \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: CHAINEDINT \(\) -EXIT=0\n -SIGNAL=0\n +^EXIT=0$ +^SIGNAL=0$ -- warning: ignoring diff --git a/regression/cbmc/typedef-return-union1/test.desc b/regression/cbmc/typedef-return-union1/test.desc index b1668066f0..389f3978bd 100644 --- a/regression/cbmc/typedef-return-union1/test.desc +++ b/regression/cbmc/typedef-return-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: union tag_union_name \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: MYUNION \(\) -- diff --git a/regression/cbmc/typedef-struct1/test.desc b/regression/cbmc/typedef-struct1/test.desc index 90f1c22933..a2782102e8 100644 --- a/regression/cbmc/typedef-struct1/test.desc +++ b/regression/cbmc/typedef-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: struct tag_struct_name Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/cbmc/typedef-struct2/test.desc b/regression/cbmc/typedef-struct2/test.desc index 90f1c22933..a2782102e8 100644 --- a/regression/cbmc/typedef-struct2/test.desc +++ b/regression/cbmc/typedef-struct2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: struct tag_struct_name Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/cbmc/typedef-type1/test.desc b/regression/cbmc/typedef-type1/test.desc index 08d1f5abfc..96795704d3 100644 --- a/regression/cbmc/typedef-type1/test.desc +++ b/regression/cbmc/typedef-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT -- diff --git a/regression/cbmc/typedef-type2/test.desc b/regression/cbmc/typedef-type2/test.desc index 76d1d114a1..c1dd8aa675 100644 --- a/regression/cbmc/typedef-type2/test.desc +++ b/regression/cbmc/typedef-type2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT Base name\.+: altint_var\nMode\.+: C\nType\.+: ALTINT diff --git a/regression/cbmc/typedef-type3/test.desc b/regression/cbmc/typedef-type3/test.desc index cc5ad52d95..330e4d4ca1 100644 --- a/regression/cbmc/typedef-type3/test.desc +++ b/regression/cbmc/typedef-type3/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT Base name\.+: chainedint_var\nMode\.+: C\nType\.+: CHAINEDINT diff --git a/regression/cbmc/typedef-type4/test.desc b/regression/cbmc/typedef-type4/test.desc index 1c0c063b8e..a958f3923a 100644 --- a/regression/cbmc/typedef-type4/test.desc +++ b/regression/cbmc/typedef-type4/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT Base name\.+: another_myint_var\nMode\.+: C\nType\.+: MYINT diff --git a/regression/cbmc/typedef-union1/test.desc b/regression/cbmc/typedef-union1/test.desc index e7ce9b6b45..6c392e390d 100644 --- a/regression/cbmc/typedef-union1/test.desc +++ b/regression/cbmc/typedef-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_var\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION -- diff --git a/regression/cbmc/typedef-union2/test.desc b/regression/cbmc/typedef-union2/test.desc index 33cbbff29a..99fe01a98e 100644 --- a/regression/cbmc/typedef-union2/test.desc +++ b/regression/cbmc/typedef-union2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table --function fun // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_var\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: another_tag_union_var\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION diff --git a/regression/contracts/function_check_04/test.desc b/regression/contracts/function_check_04/test.desc index 908ec83b39..047df86804 100644 --- a/regression/contracts/function_check_04/test.desc +++ b/regression/contracts/function_check_04/test.desc @@ -1,6 +1,8 @@ CORE main.c --apply-code-contracts +^EXIT=10$ +^SIGNAL=0$ ^\[main.assertion.1\] .* assertion x == 0: SUCCESS$ ^\[foo.1\] line 9 .*: FAILURE$ ^VERIFICATION FAILED$ diff --git a/regression/contracts/function_check_05/test.desc b/regression/contracts/function_check_05/test.desc index 77e210f10d..40d58545e0 100644 --- a/regression/contracts/function_check_05/test.desc +++ b/regression/contracts/function_check_05/test.desc @@ -1,6 +1,8 @@ KNOWNBUG main.c --check-code-contracts +^EXIT=0$ +^SIGNAL=0$ ^\[main.assertion.1\] assertion y == 0: FAILURE$ ^\[main.assertion.2\] assertion z == 1: SUCCESS$ ^\[foo.1\] : SUCCESS$ diff --git a/regression/contracts/invar_check_04/test.desc b/regression/contracts/invar_check_04/test.desc index f8abcf720a..2747beca08 100644 --- a/regression/contracts/invar_check_04/test.desc +++ b/regression/contracts/invar_check_04/test.desc @@ -1,6 +1,8 @@ CORE main.c --apply-code-contracts +^EXIT=10$ +^SIGNAL=0$ ^\[main.1\] .* Loop invariant violated before entry: SUCCESS$ ^\[main.2\] .* Loop invariant not preserved: SUCCESS$ ^\[main.assertion.1\] .* assertion r == 0: FAILURE$ diff --git a/regression/goto-analyzer/dependence-graph10/test.desc b/regression/goto-analyzer/dependence-graph10/test.desc index e0d118d2ac..26943fc2e6 100644 --- a/regression/goto-analyzer/dependence-graph10/test.desc +++ b/regression/goto-analyzer/dependence-graph10/test.desc @@ -2,8 +2,8 @@ CORE main.c --dependence-graph --show activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ // First assignment has a control dependency on the if \/\/ ([0-9]+).*\n.*IF.*i < 10.*THEN(.*\n)*Control dependencies: \1\n(.*\n){2,3}.*a = 1 // Second assignment has a control dependency on the if diff --git a/regression/goto-analyzer/dependence-graph11/test.desc b/regression/goto-analyzer/dependence-graph11/test.desc index d8112318ed..32969498ac 100644 --- a/regression/goto-analyzer/dependence-graph11/test.desc +++ b/regression/goto-analyzer/dependence-graph11/test.desc @@ -2,8 +2,8 @@ CORE main.c --dependence-graph --show activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ // Assignment has a control dependency on the if \/\/ ([0-9]+).*\n.*IF.*a < 10.*THEN(.*\n)*Control dependencies: \1\n(.*\n){2,3}.*a = 1 -- diff --git a/regression/goto-analyzer/dependence-graph12/test.desc b/regression/goto-analyzer/dependence-graph12/test.desc index b14ba9f7ba..419f4efc4e 100644 --- a/regression/goto-analyzer/dependence-graph12/test.desc +++ b/regression/goto-analyzer/dependence-graph12/test.desc @@ -2,8 +2,8 @@ CORE main.c --dependence-graph --show activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ // Assignment has a control dependency on the first if \/\/ ([0-9]+).*\n.*IF.*a < 7.*THEN(.*\n)*Control dependencies: (([0-9]+,\1)|(\1,[0-9]+))\n(.*\n){2,3}.*a = 2 // Assignment has a control dependency on the second if diff --git a/regression/goto-analyzer/dependence-graph4/test.desc b/regression/goto-analyzer/dependence-graph4/test.desc index ba3ca2eb1f..670220ddf9 100644 --- a/regression/goto-analyzer/dependence-graph4/test.desc +++ b/regression/goto-analyzer/dependence-graph4/test.desc @@ -2,8 +2,8 @@ CORE main.c --show --dependence-graph --text - activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ \/\/ ([0-9]+) file.*\n.*IF.*g_in1.*THEN GOTO(.*\n)*Control dependencies: \1\n\n.*\n.*g_out = 1 -- ^warning: ignoring diff --git a/regression/goto-analyzer/dependence-graph7/test.desc b/regression/goto-analyzer/dependence-graph7/test.desc index 62067ef188..80a11db5a1 100644 --- a/regression/goto-analyzer/dependence-graph7/test.desc +++ b/regression/goto-analyzer/dependence-graph7/test.desc @@ -2,8 +2,8 @@ CORE main.c --dependence-graph --show activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ // Assignment has a control dependency on the loop head \/\/ ([0-9]+).*\n.*IF.*i < 10.*THEN(.*\n)*Control dependencies: \1\n(.*\n){2,3}.*a = 1 // Backedge has a control dependency on the loop head diff --git a/regression/goto-analyzer/dependence-graph8/test.desc b/regression/goto-analyzer/dependence-graph8/test.desc index 50549bb686..50a092d6d9 100644 --- a/regression/goto-analyzer/dependence-graph8/test.desc +++ b/regression/goto-analyzer/dependence-graph8/test.desc @@ -2,8 +2,8 @@ CORE main.c --dependence-graph --show activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ // Assignment has a control dependency on the if \/\/ ([0-9]+).*\n.*IF.*i < 7.*THEN(.*\n)*Control dependencies: \1\n(.*\n){2,3}.*a = 1 // If has a control dependency on the loop head diff --git a/regression/goto-analyzer/dependence-graph9/test.desc b/regression/goto-analyzer/dependence-graph9/test.desc index 2bcae4642d..c6dd50d71c 100644 --- a/regression/goto-analyzer/dependence-graph9/test.desc +++ b/regression/goto-analyzer/dependence-graph9/test.desc @@ -2,8 +2,8 @@ CORE main.c --dependence-graph --show activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ // Second assignment has a control dependency on the outer if \/\/ ([0-9]+).*\n.*IF.*i < 10.*THEN(.*\n)*Control dependencies: \1\n(.*\n){2,3}.*a = 2 -- diff --git a/regression/goto-diff/syntactic-diff1/test.desc b/regression/goto-diff/syntactic-diff1/test.desc index c3b12e93b7..8b9a04f0bd 100644 --- a/regression/goto-diff/syntactic-diff1/test.desc +++ b/regression/goto-diff/syntactic-diff1/test.desc @@ -3,8 +3,8 @@ b.c a.c // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ new functions:\n\s+b.c: bar\nmodified functions:\n\s+b.c: main\ndeleted functions:\n\s+a.c: foo -- ^warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc index 9fe8148da9..ce2e98adbb 100644 --- a/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc b/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc index 7bc8b436b0..3962d273d4 100644 --- a/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc +++ b/regression/goto-instrument-typedef/typedef-anon-struct2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT Base name\.+: another_mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/goto-instrument-typedef/typedef-anon-union1/test.desc b/regression/goto-instrument-typedef/typedef-anon-union1/test.desc index 452ab96857..22a5cc6fb7 100644 --- a/regression/goto-instrument-typedef/typedef-anon-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-anon-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION -- warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-anon-union2/test.desc b/regression/goto-instrument-typedef/typedef-anon-union2/test.desc index 06e8834765..329b08d473 100644 --- a/regression/goto-instrument-typedef/typedef-anon-union2/test.desc +++ b/regression/goto-instrument-typedef/typedef-anon-union2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION Base name\.+: another_myunion_var\nMode\.+: C\nType\.+: MYUNION -- diff --git a/regression/goto-instrument-typedef/typedef-const-struct1/test.desc b/regression/goto-instrument-typedef/typedef-const-struct1/test.desc index 6108d3c748..b816eebd0e 100644 --- a/regression/goto-instrument-typedef/typedef-const-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-const-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: const struct tag_struct_name Base name\.+: mystruct_var\nMode\.+: C\nType\.+: const MYSTRUCT -- diff --git a/regression/goto-instrument-typedef/typedef-const-type1/test.desc b/regression/goto-instrument-typedef/typedef-const-type1/test.desc index f42e33d48b..055d755808 100644 --- a/regression/goto-instrument-typedef/typedef-const-type1/test.desc +++ b/regression/goto-instrument-typedef/typedef-const-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: const signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: const MYINT -- diff --git a/regression/goto-instrument-typedef/typedef-const-union1/test.desc b/regression/goto-instrument-typedef/typedef-const-union1/test.desc index 5509eae3f8..506dfcfc61 100644 --- a/regression/goto-instrument-typedef/typedef-const-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-const-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_var\nMode\.+: C\nType\.+: const union tag_union_name Base name\.+: myunion_var\nMode\.+: C\nType\.+: const MYUNION -- diff --git a/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc index 6e7b1a7af8..82487423cb 100644 --- a/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: mystruct_param\nMode\.+: C\nType\.+: MYSTRUCT -- warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc b/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc index eb410ddec8..75ef9519f6 100644 --- a/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-anon-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: myunion_param\nMode\.+: C\nType\.+: MYUNION -- warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-param-struct1/test.desc b/regression/goto-instrument-typedef/typedef-param-struct1/test.desc index c854c49f9d..ad9852787a 100644 --- a/regression/goto-instrument-typedef/typedef-param-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_param\nMode\.+: C\nType\.+: struct tag_struct_name Base name\.+: mystruct_param\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/goto-instrument-typedef/typedef-param-type1/test.desc b/regression/goto-instrument-typedef/typedef-param-type1/test.desc index 983f133b00..c83277c9ec 100644 --- a/regression/goto-instrument-typedef/typedef-param-type1/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_param\nMode\.+: C\nType\.+: signed int Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT -- diff --git a/regression/goto-instrument-typedef/typedef-param-type2/test.desc b/regression/goto-instrument-typedef/typedef-param-type2/test.desc index 3ab0a4c870..28999dc8cc 100644 --- a/regression/goto-instrument-typedef/typedef-param-type2/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-type2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_param\nMode\.+: C\nType\.+: signed int Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT Base name\.+: altint_param\nMode\.+: C\nType\.+: ALTINT diff --git a/regression/goto-instrument-typedef/typedef-param-type3/test.desc b/regression/goto-instrument-typedef/typedef-param-type3/test.desc index 647c157faf..1f0a82a6b6 100644 --- a/regression/goto-instrument-typedef/typedef-param-type3/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-type3/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_param\nMode\.+: C\nType\.+: signed int Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT Base name\.+: chainedint_param\nMode\.+: C\nType\.+: CHAINEDINT diff --git a/regression/goto-instrument-typedef/typedef-param-union1/test.desc b/regression/goto-instrument-typedef/typedef-param-union1/test.desc index 6bf1afdf62..a7faf6cc84 100644 --- a/regression/goto-instrument-typedef/typedef-param-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-param-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_param\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: myunion_param\nMode\.+: C\nType\.+: MYUNION -- diff --git a/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc index 15b07e2d75..e753e28022 100644 --- a/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: return'\nMode\.+: C\nType\.+: MYSTRUCT Base name\.+: fun\nMode\.+: C\nType\.+: MYSTRUCT \(\) -- diff --git a/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc b/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc index 94ce1ccc78..fbb291fe22 100644 --- a/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-anon-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: MYUNION \(\) -- warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-return-struct1/test.desc b/regression/goto-instrument-typedef/typedef-return-struct1/test.desc index fa9e7afb14..a5e0b2b64b 100644 --- a/regression/goto-instrument-typedef/typedef-return-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: struct tag_struct_name \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: MYSTRUCT \(\) -- diff --git a/regression/goto-instrument-typedef/typedef-return-type1/test.desc b/regression/goto-instrument-typedef/typedef-return-type1/test.desc index efc8f8476a..7c134ca0b3 100644 --- a/regression/goto-instrument-typedef/typedef-return-type1/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: signed int \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: MYINT \(\) -- diff --git a/regression/goto-instrument-typedef/typedef-return-type2/test.desc b/regression/goto-instrument-typedef/typedef-return-type2/test.desc index 28d7c3e170..0089685db1 100644 --- a/regression/goto-instrument-typedef/typedef-return-type2/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-type2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: MYINT \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: ALTINT \(\) -- diff --git a/regression/goto-instrument-typedef/typedef-return-type3/test.desc b/regression/goto-instrument-typedef/typedef-return-type3/test.desc index eec53efe82..3e6e4b4459 100644 --- a/regression/goto-instrument-typedef/typedef-return-type3/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-type3/test.desc @@ -5,7 +5,7 @@ main.c activate-multi-line-match Base name\.+: fun\nMode\.+: C\nType\.+: MYINT \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: CHAINEDINT \(\) -EXIT=0\n -SIGNAL=0\n +^EXIT=0$ +^SIGNAL=0$ -- warning: ignoring diff --git a/regression/goto-instrument-typedef/typedef-return-union1/test.desc b/regression/goto-instrument-typedef/typedef-return-union1/test.desc index 33b17ca0c4..8517d2a0c4 100644 --- a/regression/goto-instrument-typedef/typedef-return-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-return-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: fun\nMode\.+: C\nType\.+: union tag_union_name \(\) Base name\.+: fun2\nMode\.+: C\nType\.+: MYUNION \(\) -- diff --git a/regression/goto-instrument-typedef/typedef-struct1/test.desc b/regression/goto-instrument-typedef/typedef-struct1/test.desc index 51c5622205..de4e61f05a 100644 --- a/regression/goto-instrument-typedef/typedef-struct1/test.desc +++ b/regression/goto-instrument-typedef/typedef-struct1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: struct tag_struct_name Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/goto-instrument-typedef/typedef-struct2/test.desc b/regression/goto-instrument-typedef/typedef-struct2/test.desc index 51c5622205..de4e61f05a 100644 --- a/regression/goto-instrument-typedef/typedef-struct2/test.desc +++ b/regression/goto-instrument-typedef/typedef-struct2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: struct tag_struct_name Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT -- diff --git a/regression/goto-instrument-typedef/typedef-type1/test.desc b/regression/goto-instrument-typedef/typedef-type1/test.desc index a70bad5d3f..04036f164e 100644 --- a/regression/goto-instrument-typedef/typedef-type1/test.desc +++ b/regression/goto-instrument-typedef/typedef-type1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT -- diff --git a/regression/goto-instrument-typedef/typedef-type2/test.desc b/regression/goto-instrument-typedef/typedef-type2/test.desc index f82d00237a..8602302f33 100644 --- a/regression/goto-instrument-typedef/typedef-type2/test.desc +++ b/regression/goto-instrument-typedef/typedef-type2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT Base name\.+: altint_var\nMode\.+: C\nType\.+: ALTINT diff --git a/regression/goto-instrument-typedef/typedef-type3/test.desc b/regression/goto-instrument-typedef/typedef-type3/test.desc index 077cec9739..60c338ce9a 100644 --- a/regression/goto-instrument-typedef/typedef-type3/test.desc +++ b/regression/goto-instrument-typedef/typedef-type3/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT Base name\.+: chainedint_var\nMode\.+: C\nType\.+: CHAINEDINT diff --git a/regression/goto-instrument-typedef/typedef-type4/test.desc b/regression/goto-instrument-typedef/typedef-type4/test.desc index 5e3fd8af85..cadd0c5b34 100644 --- a/regression/goto-instrument-typedef/typedef-type4/test.desc +++ b/regression/goto-instrument-typedef/typedef-type4/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: int_var\nMode\.+: C\nType\.+: signed int Base name\.+: myint_var\nMode\.+: C\nType\.+: MYINT Base name\.+: another_myint_var\nMode\.+: C\nType\.+: MYINT diff --git a/regression/goto-instrument-typedef/typedef-union1/test.desc b/regression/goto-instrument-typedef/typedef-union1/test.desc index b4eab1b58e..458045667f 100644 --- a/regression/goto-instrument-typedef/typedef-union1/test.desc +++ b/regression/goto-instrument-typedef/typedef-union1/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_var\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION -- diff --git a/regression/goto-instrument-typedef/typedef-union2/test.desc b/regression/goto-instrument-typedef/typedef-union2/test.desc index 629a76f7bf..eabb1b6563 100644 --- a/regression/goto-instrument-typedef/typedef-union2/test.desc +++ b/regression/goto-instrument-typedef/typedef-union2/test.desc @@ -3,8 +3,8 @@ main.c --show-symbol-table // Enable multi-line checking activate-multi-line-match -EXIT=0 -SIGNAL=0 +^EXIT=0$ +^SIGNAL=0$ Base name\.+: tag_union_var\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: another_tag_union_var\nMode\.+: C\nType\.+: union tag_union_name Base name\.+: myunion_var\nMode\.+: C\nType\.+: MYUNION diff --git a/regression/goto-instrument/generate-function-body-nondet-return-const/test.desc b/regression/goto-instrument/generate-function-body-nondet-return-const/test.desc index 441ac40d68..2e747cb618 100644 --- a/regression/goto-instrument/generate-function-body-nondet-return-const/test.desc +++ b/regression/goto-instrument/generate-function-body-nondet-return-const/test.desc @@ -1,6 +1,7 @@ CORE main.c --generate-function-body func --generate-function-body-options nondet-return +^EXIT=10$ ^SIGNAL=0$ \[main.assertion.1\] line \d+ assertion func\(\) == 0: FAILURE \[main.assertion.2\] line \d+ assertion func\(\) != 0: FAILURE diff --git a/regression/goto-instrument/generate-function-body-nondet-return-double-pointer/test.desc b/regression/goto-instrument/generate-function-body-nondet-return-double-pointer/test.desc index 7a90ef1538..589b0a2896 100644 --- a/regression/goto-instrument/generate-function-body-nondet-return-double-pointer/test.desc +++ b/regression/goto-instrument/generate-function-body-nondet-return-double-pointer/test.desc @@ -1,6 +1,7 @@ CORE main.c --generate-function-body func --generate-function-body-options nondet-return --min-null-tree-depth 10 --max-nondet-tree-depth 5 +^EXIT=10$ ^SIGNAL=0$ \[main.assertion.1\] line \d+ assertion p != .*(0|(NULL))\)?: SUCCESS \[main.assertion.2\] line \d+ assertion \*p != .*(0|(NULL))\)?: SUCCESS diff --git a/regression/goto-instrument/generate-function-body-nondet-return-simple/test.desc b/regression/goto-instrument/generate-function-body-nondet-return-simple/test.desc index 441ac40d68..2e747cb618 100644 --- a/regression/goto-instrument/generate-function-body-nondet-return-simple/test.desc +++ b/regression/goto-instrument/generate-function-body-nondet-return-simple/test.desc @@ -1,6 +1,7 @@ CORE main.c --generate-function-body func --generate-function-body-options nondet-return +^EXIT=10$ ^SIGNAL=0$ \[main.assertion.1\] line \d+ assertion func\(\) == 0: FAILURE \[main.assertion.2\] line \d+ assertion func\(\) != 0: FAILURE diff --git a/regression/goto-instrument/is-threaded1/test.desc b/regression/goto-instrument/is-threaded1/test.desc index 834c8a61e9..100f508771 100644 --- a/regression/goto-instrument/is-threaded1/test.desc +++ b/regression/goto-instrument/is-threaded1/test.desc @@ -3,7 +3,7 @@ main.c --show-threaded activate-multi-line-match x = 2;\nIs threaded: True -EXIT=0\n -SIGNAL=0\n +^EXIT=0$ +^SIGNAL=0$ -- ^warning: ignoring diff --git a/regression/goto-instrument/show-call-sequences4/test.desc b/regression/goto-instrument/show-call-sequences4/test.desc index c5dec9dcb7..30e8634e6b 100644 --- a/regression/goto-instrument/show-call-sequences4/test.desc +++ b/regression/goto-instrument/show-call-sequences4/test.desc @@ -4,8 +4,8 @@ main.c activate-multi-line-match main -> moo\nmain -> foo foo -> moo\nfoo -> boo -SIGNAL=0 -EXIT=0 +^SIGNAL=0$ +^EXIT=0$ -- main -> boo boo -> foo diff --git a/regression/goto-instrument/splice_call_01/test.desc b/regression/goto-instrument/splice_call_01/test.desc index c397504aeb..3e3233e216 100644 --- a/regression/goto-instrument/splice_call_01/test.desc +++ b/regression/goto-instrument/splice_call_01/test.desc @@ -3,5 +3,5 @@ main.c --splice-call main,moo activate-multi-line-match moo\(\);\n.*function main.* -EXIT=0 -SIGNAL=0 \ No newline at end of file +^EXIT=0$ +^SIGNAL=0$ \ No newline at end of file diff --git a/regression/test-script/failing-excluded-line/test.desc b/regression/test-script/failing-excluded-line/test.desc index 3c8b8bc9f7..724a00a912 100644 --- a/regression/test-script/failing-excluded-line/test.desc +++ b/regression/test-script/failing-excluded-line/test.desc @@ -2,6 +2,8 @@ KNOWNBUG test.txt ^Hello$ +^EXIT=0$ +^SIGNAL=0$ -- ^World$ -- diff --git a/regression/test-script/failing-multi-line/test.desc b/regression/test-script/failing-multi-line/test.desc index b3b2f17184..fbd8f44b4a 100644 --- a/regression/test-script/failing-multi-line/test.desc +++ b/regression/test-script/failing-multi-line/test.desc @@ -3,6 +3,8 @@ test.txt activate-multi-line-match Hello\nAnother\nWorld +^EXIT=0$ +^SIGNAL=0$ -- -- This isn't really a known bug perse, instead this test should fail (since these diff --git a/regression/test-script/failing-single-line/test.desc b/regression/test-script/failing-single-line/test.desc index 973b5aa464..b00ed4e789 100644 --- a/regression/test-script/failing-single-line/test.desc +++ b/regression/test-script/failing-single-line/test.desc @@ -2,6 +2,8 @@ KNOWNBUG test.txt ^Goodbye$ +^EXIT=0$ +^SIGNAL=0$ -- -- This isn't really a known bug perse, instead this test should fail (since these diff --git a/regression/test-script/multi-line/test.desc b/regression/test-script/multi-line/test.desc index 3e872a0080..d63678c220 100644 --- a/regression/test-script/multi-line/test.desc +++ b/regression/test-script/multi-line/test.desc @@ -3,6 +3,6 @@ test.txt activate-multi-line-match Hello\nWorld -EXIT=0\n -SIGNAL=0\n +^EXIT=0$ +^SIGNAL=0$ --