Squashed 'cbmc/' changes from 4820601..e8b3cb9

e8b3cb9 Merge remote-tracking branch 'upstream/develop' into smowton/merge/develop_20171116
dc4a293 Merge pull request diffblue#1594 from reuk/reuk/cmake-fixup
48fc3d4 Merge pull request diffblue#1592 from antlechner/antonia/char-escape
538eef6 Merge pull request diffblue#1577 from smowton/smowton/fix/dependence_graph_inconsistency
d3d632d Use multi-argument form of FILE command
81e56cc Tidy up CMakeLists
f7141c0 Merge pull request diffblue#1582 from romainbrenguier/refactor/numerical-cast
8ed1023 Use UTF-16 conversion function in expr2java
a53f5bf Split UTF-16 conversion code into two cases
e0ad069 Merge pull request diffblue#1558 from NathanJPhillips/feature/complete-journalling_symbol_table
69d1a52 Added usages of base class symbol table
3e42a8d Add comment on has_symbol
a2b45e3 Update to journalling symbol table
7aa80ad Remove lookup_impl - it won't work for recording symbol table and adds complexity
cdbac8c Sort output of symbol_tablet::show
2ef1c94 Fix bug where move from const symbol collections
8035397 Style improvements
6dae8e8 Merge pull request diffblue#1515 from smowton/smowton/admin/codeowners
5297646 another ranged for
3d66779 Merge branch 'develop' of github.com:diffblue/cbmc into develop
4b5467c another ranged for
f5dbfd4 Merge pull request diffblue#1589 from reuk/reuk/fewer-exceptions
8e99272 use ranged for
95cf5c3 Add directories without code owners and adapt code owners
8da6a81 Replace try-catch with nullptr checks
9ff48e0 Add numeric_cast template for numeric conversion
af31813 Merge pull request diffblue#1575 from svorenova/nested_generics_tg1301
21b4e7e Extend unit tests to test for nested generics
cf47dcb Extending parsing of generics to parse nested generic types
1aefb09 Merge pull request diffblue#1547 from smowton/smowton/feature/remove_virtual_functions_single_call
2b4ed77 Merge pull request diffblue#1579 from smowton/smowton/fix/cmdline_destructor
7305506 Merge pull request diffblue#1580 from smowton/smowton/fix/cast_materialised_temporary
87b9de1 Remove pointless typecasts
a59dea6 Add unit test checking dependence graph consistency
80e66ba Remove virtual functions: expose single-call entry-point
ffe02e4 Remove useless cmdlinet::clear() call
ae34e9b Merge pull request diffblue#1578 from thk123/bugfix/specalised-classes
779d0aa Merge pull request diffblue#1574 from diffblue/taint-memcpy-develop
28a4846 Merge pull request diffblue#1568 from smowton/smowton/fix/java_div_by_zero
ffd089f Constructed class to mimic the original class in all but name of symbol
7f53f02 Merge pull request diffblue#1569 from thk123/bugfix/TG-1403/generic-field-arrays
1abc75e Dependence graph: ensure grapht representation is consistent with domain
e03b0cb Abstract interpreter: add finalize hook
fa7d62a Makefile for goto-analyzer-taint-ansi-c
758ebb3 transfer taint on memcpy and memmove
d0a844b Assert denominator non-zero when Java runtime exceptions are disabled
e5744b2 Reorder code owner definition according to change risk
0f98cb4 Removed redundant if statement
ffa104c Enforce condition that generic references must refer to generic classes
6e06fbd Extending tests to deal with specialising with arrays when array fields
a01a0f2 Extend the specialisation code to handle generic fields
1ccbf83 Correctly handle generic classes that have a array field
f60d8c8 Unit utility for symbol types
21a33fa Renaming to_java_generic_class_type to remove spurious s
94ffce3 Merge pull request diffblue#1567 from mgudemann/mgudemann/feature/support_arrays_in_generic_parameters
5be97db Create new and adapt existing unit tests for generic array param
ef6b4af Post-fix arrays as generic types with their element type
4db6fc6 Merge pull request diffblue#1553 from mgudemann/bugfix/initialize_pointer_width_in_unit_test
b17ed58 Merge pull request diffblue#1555 from thk123/feature/remove-redundant-specalisation-code
9b34cdb Merge pull request diffblue#1564 from owen-jones-diffblue/bugfix/object-numbering-references
52d4326 Merge pull request diffblue#731 from tautschnig/more-rewriting
51133db Remove test checking don't specalise unspecalised generic types
bf10b1b Manually call specalisation code
bba9f76 Remove redundant regression test
3047678 Removed old method of specalising generics
2db8c45 Merge pull request diffblue#982 from tautschnig/pointer-handling
fb532e8 Generalize ID_malloc to ID_allocate with optional zero-init
3c47ccb Use invariant annotations instead of asserts
ebd5343 More unwinding should not yield additional assertion failures
cc659c9 Use a known constant offset when dereferencing
c507ccf Update all constant offsets, not just 0
0361c2a Merge pull request diffblue#1534 from svorenova/unit-test-cleanup
f653f85 Merge pull request diffblue#263 from diffblue/owen/fix-memory-bug
ede0e8c Fix bug that can cause segfault
51cbfc9 Deleting a utility function for generics
03438bb Disabling part of unit test due to a bug
e3019f2 Extending test for derived generics
f5ec45a Adding JIRA tickets cont.
1fa8e2f Adding unit test for generic fields
398c88a Applying new utility functions for generics
cce7814 Refactoring unit test utility functions to make them easier to use
c1e1ba2 Applying new function for accessing elements of arrays
e908f0c Updating utility functions to check generic/non-generic java classes
d9d9ea1 Cleaning includes, unifying scenario names, adding JIRA references
2883bb1 Extending test for generic arrays
de97e23 Adding unit test for nested generics
c9a3716 Adding unit test for functions with generics
9db9947 Extending test for generic class
89b99ce Extending test for generic functions
3e6cf35 Extending test for signature/descriptor mismatch
80be2fd Extending and cleaning test for generic class with generic inner classes
2e2e34b Renaming unit test for generic inner classes to bounded generic inner classes
c5b06e6 Breaking the old parse_generic_class into two unit tests
d3ff11c Adding a utility for checking java generic class
707ebf6 Cleaning existing unit tests
af3efea Renaming java files
14c00dc Simplify all expressions generated by flatten_byte_operators
71e9642 Extensions to simplify_byte_extract
81943f2 Split ID_and/ID_or vs ID_xor simplification
77236cc Avoid nesting of ID_with/byte_update by rewriting byte_extract to use the root object
ddd3d03 Extended simplify for byte_update, typing
7064483 simplify_typecast: simplify more pointer arithmetic
2b18e0c Merge pull request diffblue#1562 from NathanJPhillips/feature/extend-main_function_result
599a2f9 Merge pull request diffblue#264 from diffblue/smowton/fix/slice24_include
de905e7 slice24 test: switch from malloc.h to stdlib.h
89a1132 Merge pull request diffblue#1559 from NathanJPhillips/bugfix/variable-scope
0aeb459 Tidied up get_main_symbol
af2d3dd Merge pull request diffblue#1560 from NathanJPhillips/bugfix/catch-by-const-ref
c8efb6f Fix bug that can cause segfault
b7cc0ae Merge pull request diffblue#1561 from NathanJPhillips/bugfix/erroneous-replacement
7d66469 Typo in reachable
7de4858 Added copyright notice to fix linting error
476270b catch by const ref instead of by value or non-const ref
2f32aee Fixed scope of moved symbol
5057c57 Merge pull request diffblue#1557 from janmroczkowski/janmroczkowski/further-improvements-to-unified_difft
5e067bf Merge pull request diffblue#1481 from andreast271/do-c++-regression
c9b6c42 Merge pull request diffblue#1513 from romainbrenguier/feature/input-string-printable
c4486f1 Merge pull request diffblue#1552 from thk123/feature/goto-functions-utilities
2648cbb Make unified_difft::lcss return by value
cd1258a Merge pull request diffblue#1425 from romainbrenguier/feature/java_new_array_data
6e3a0b0 Make more member function static
9efb65c Merge pull request diffblue#1556 from diffblue/revert-1554-janmroczkowski/more-static-member-functions-in-unified_difft
1c96ae5 Revert "Make more member function static in unified_difft"
9cb4569 Amend doxygen comments
4550676 Added missing utilities to the Makefile
7938bac Correcting linting errors
25d765b Use a for loop rather than chained algorithms
e67d229 Renamed find declaration method
fa14b47 Renamed utility file to require_goto_statements
a657ec1 Moved functions into a namespace and documented them
b96199f Moved and simplified the code for finding sub statements
b9914a8 Add some java testing utilities.
2c175bd Update load_java_class to construct the entry point function
3453a89 Merge pull request diffblue#1554 from janmroczkowski/janmroczkowski/more-static-member-functions-in-unified_difft
feaa85f Merge pull request diffblue#1455 from romainbrenguier/doc/string-solver-documentation
c5ab866 Merge pull request diffblue#1430 from romainbrenguier/refactor/gather_indices
fac9dea Rename "#lva_mode" to "lvsa_mode"
72c8533 Make two irep IDs
55b6ac5 Merge pull request diffblue#1502 from tautschnig/merge-failed-tests-printer
dfa2ed2 Make more member function static
d378980 Style: Disabling clang-format in get
f5991ee Refactor universal_only_in_index to use expression iterators
9d1aa99 Correct constraints added for char_set
e125e8a Refactor gather_indices to use for_each instead of visitor
4b0e2d4 Create goto-gcc symlink in cmake builds and enable goto-gcc tests
7736672 Style: use NOLINTNEXTLINE to avoid cpplint errors on long links
6016bef Improve readability of code imported from failed-tests-printer.pl
dd6e431 test.pl: Use native perl instead of "cat" to print log file
3321735 Move implementation of failed-tests-printer.pl into test.pl
ba16006 Do not use shell built-ins
96e169a Use single quotes for Windows compatibility
d2c3752 Remove string_printable option from the solver
b0de0e3 Test for string printable option on input strings
4b36fc6 Merge pull request diffblue#1533 from mgudemann/fix/support_class_bounds_generics
35096b8 Initialize architecture in `instantiate_not_contains` unit test
b25630a Merge pull request diffblue#1550 from chrisr-diffblue/cleanup/java-generics-test-helpers
542a26d Stop adding printable constraints on all strings
e65e340 Use command line option for string-printable param
8e92362 Propagate string-printable option in object_factory
ae5f32e Add a printable option to string initialization
514e6a1 Add function to call constrain_character primitive
1d92c48 Add string primitive to constrain characters
cb01526 Minor refactoring in add_default_axioms
e1280cc Add utility function add_constraint_on_characters
6b88eb8 Add unit test for class / interface bound
2ed059a Support interface and class bound parsing in generics
ccdd483 Merge pull request diffblue#1545 from chrisr-diffblue/TG-1158/unit-test-for-specialising-with-array-types
73808aa Merge pull request diffblue#1544 from smowton/smowton/feature/value_set_eq_operator
0507355 Refactored unit test helpers to be more general and extend their use-cases
93ebb84 Merge commit '356aed461b387a8ae815a9901a16d26f32f102be' into develop
db758fb Add some unit test helper functions, useful for Java generics unit tests
98de899 Add a unit test for specialising Java generic types with array types
b07fcdd Documentation improvements and readme for strings
1fa64a9 Avoid using is_valid_java_array in builin_functions
0dafac2 Add unit test for goto_trace_output in Makefile
435958f Unit test for goto_trace::output
5a0343f Doc: Summary for count_type_leaves
fc363b3 Typo in goto_trace output
42c079d Use existing function for checking object is array
465e5dc Style: improve documentation in interpreter evaluate
fe2efa7 Style: Replace assert by appropriate macros
e36d7d8 Check if object is nil before writing trace
6b519ad Add identifier and rename statement to java_new_array_data
d4f1b29 Add eq and neq operators to value_sett and related types
b03ec16 Merge pull request diffblue#239 from diffblue/bugfix/value_sets_fi_and_reaching_defs_retrievals_of_dynamic_objects
db79106 Added explanatory comment for the introduced condition.
dfc6a20 Fixing C++ code-style issues.
b0742cf Disable cbmc-cpp tests in appveyor, which runs regression on windows. All cbmc-cpp tests #include <assert.h> and cbmc cannot yet parse Microsoft C++ headers.
d55a8da Add tests to cmake regression: cbmc-cover, cbmc-cpp, goto-analyzer-taint
3a4e48c Run cbmc c++ regression as part of default regression test Set is_parameter for c++ function parameter symbol
7989831 Added regression test for the fixed bug.
00b4af2 Bugfix: Explicit retrievals of DOs from value_set amd reaching_defs.

git-subtree-dir: cbmc
git-subtree-split: e8b3cb9

Author: smowton

CMakeLists.txt

@@ -44,3 +44,49 @@ if(${enable_cbmc_tests})
 endif()
 add_subdirectory(unit)
 add_subdirectory(regression)
+
+set_target_properties(
+    analyses
+    ansi-c
+    assembler
+    big-int
+    cbmc
+    cbmc-lib
+    clobber
+    clobber-lib
+    cpp
+    driver
+    goto-analyzer
+    goto-analyzer-lib
+    goto-cc
+    goto-cc-lib
+    goto-diff
+    goto-diff-lib
+    goto-instrument
+    goto-instrument-lib
+    goto-programs
+    goto-symex
+    java_bytecode
+    jbmc
+    jbmc-lib
+    jsil
+    json
+    langapi
+    linking
+    miniBDD
+    miniz
+    mmcc
+    pointer-analysis
+    solvers
+    string_utils
+    test-bigint
+    testing-utils
+    unit
+    util
+    xml
+
+    PROPERTIES
+    CXX_STANDARD 11
+    CXX_STANDARD_REQUIRED true
+    XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Developer ID Application: Daniel Kroening"
+)

CODEOWNERS

@@ -1,36 +1,57 @@
 # These owners will be the default owners for everything in the repo.
-*       @kroening @tautschnig @peterschrammel
+*       @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue
 
-src/java_bytecode/ @smowton @mgudemann @cristina-david @jgwilson42 @pkesseli @Degiorgio @NathanJPhillips
-src/jbmc/ @smowton @mgudemann @cristina-david @jgwilson42 @pkesseli @Degiorgio @NathanJPhillips
-src/miniz/ @smowton @mgudemann @cristina-david @jgwilson42 @pkesseli
+# These files should rarely change
 
-src/ansi-c/ @marek-trtik @kroening @tautschnig
+src/big-int/ @kroening
+src/ansi-c/ @kroening @tautschnig
+src/assembler/ @kroening @tautschnig
+src/goto-cc/ @kroening @tautschnig
+src/linking/ @kroening @tautschnig
+src/memory-models/ @kroening @tautschnig
+src/goto-symex/ @kroening @tautschnig @peterschrammel
+src/json/ @kroening @tautschnig @peterschrammel
+src/langapi/ @kroening @tautschnig @peterschrammel
+src/xmllang/ @kroening @tautschnig @peterschrammel
+src/nonstd/ @smowton @peterschrammel
+src/solvers/cvc @martin-cs @kroening
+src/solvers/flattening @martin-cs @kroening @tautschnig @peterschrammel
+src/solvers/floatbv @martin-cs @kroening
+src/solvers/miniBDD @tautschnig @kroening
+src/solvers/prop @martin-cs @kroening @tautschnig @peterschrammel
+src/solvers/sat @martin-cs @kroening @tautschnig @peterschrammel
+src/solvers/smt2 @martin-cs @tautschnig @peterschrammel
+src/miniz/ @smowton @mgudemann @peterschrammel
 
-src/cpp/ @marek-trtik @kroening @tautschnig
 
-CMakeLists.txt @reuk @thk123
+# These files change frequently and changes are high-risk
 
-cmake/ @reuk @thk123
+src/cbmc/ @smowton @kroening @tautschnig @peterschrammel
+src/goto-programs/ @smowton @kroening @tautschnig @peterschrammel @pkesseli
+src/util/ @smowton @kroening @tautschnig @peterschrammel @pkesseli
+src/solvers/refinement @martin-cs @romainbrenguier @peterschrammel
+src/java_bytecode/ @smowton @mgudemann @thk123 @cristina-david @cesaro @pkesseli @NathanJPhillips @peterschrammel
+src/analyses/ @martin-cs @peterschrammel @chrisr-diffblue @thk123 @smowton
+src/pointer-analysis/ @martin-cs @peterschrammel @chrisr-diffblue @smowton
 
-src/solvers/ @martin-cs @romainbrenguier @antlechner @kroening
 
-src/analyses/ @martin-cs @peterschrammel @thk123 @marek-trtik @NathanJPhillips
+# These files change frequently and changes are medium-risk
 
-src/pointer-analysis/ @martin-cs @peterschrammel @thk123 @marek-trtik 
+src/goto-analyzer/ @martin-cs @chrisr-diffblue @peterschrammel
+src/goto-instrument/ @martin-cs @chrisr-diffblue @peterschrammel
+src/goto-diff/ @tautschnig @peterschrammel
+src/jbmc/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel
+src/cpp/ @kroening @tautschnig @peterschrammel
 
-src/goto-analyzer/ @martin-cs @peterschrammel @thk123 @marek-trtik 
 
-src/goto-instrument/ @martin-cs @peterschrammel @thk123 @marek-trtik  
-
-src/goto-programs/ @smowton @kroening @tautschnig @peterschrammel @marek-trtik  
-
-src/linking/ @smowton @kroening @tautschnig @peterschrammel @marek-trtik  
+# These files change frequently and changes are low-risk
 
 unit/ @diffblue/cbmc-developers
-
 regression/ @diffblue/cbmc-developers
 
-.travis.yml @diffblue/devops @thk123 @forejtv @jgwilson42 @rabiamarzhiya
-appveyor.yml @diffblue/devops @thk123 @forejtv @jgwilson42 @rabiamarzhiya
+CMakeLists.txt @reuk @chrisr-diffblue
+cmake/ @reuk @chrisr-diffblue
 
+scripts/ @diffblue/devops @thk123 @forejtv @peterschrammel
+.travis.yml @diffblue/devops @thk123 @forejtv @peterschrammel
+appveyor.yml @diffblue/devops @thk123 @forejtv @peterschrammel

appveyor.yml

@@ -83,6 +83,7 @@ test_script:
     rmdir /s /q cbmc\byte_update7
     rmdir /s /q cbmc\pipe1
     rmdir /s /q cbmc\unsigned___int128
+    rmdir /s /q cbmc-cpp
     rmdir /s /q cpp\Decltype1
     rmdir /s /q cpp\Decltype2
     rmdir /s /q cpp\Function_Overloading1

regression/CMakeLists.txt

@@ -1,12 +1,9 @@
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED true)
-
 set(test_pl_path "${CMAKE_CURRENT_SOURCE_DIR}/test.pl")
 
 macro(add_test_pl_profile name cmdline flag profile)
     add_test(
         NAME "${name}-${profile}"
-        COMMAND ${test_pl_path} -c ${cmdline} ${flag}
+        COMMAND ${test_pl_path} -p -c ${cmdline} ${flag}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     )
     set_tests_properties("${name}-${profile}" PROPERTIES
@@ -25,15 +22,21 @@ endmacro(add_test_pl_tests)
 
 add_subdirectory(ansi-c)
 add_subdirectory(cbmc)
+add_subdirectory(cbmc-cover)
+add_subdirectory(cbmc-cpp)
 add_subdirectory(cbmc-java)
 add_subdirectory(cbmc-java-inheritance)
 add_subdirectory(cpp)
 add_subdirectory(goto-analyzer)
+add_subdirectory(goto-analyzer-taint)
 add_subdirectory(goto-cc-cbmc)
 add_subdirectory(goto-cc-goto-analyzer)
 add_subdirectory(goto-diff)
 add_subdirectory(goto-instrument)
 add_subdirectory(goto-instrument-typedef)
+if(NOT WIN32)
+  add_subdirectory(goto-gcc)
+endif()
 add_subdirectory(invariants)
 add_subdirectory(jbmc-strings)
 add_subdirectory(strings)

regression/Makefile

@@ -1,6 +1,7 @@
 DIRS = ansi-c \
        cbmc \
        cbmc-cover \
+       cbmc-cpp \
        cbmc-java \
        cbmc-java-inheritance \
        cpp \

regression/ansi-c/Makefile

@@ -10,16 +10,10 @@ else
 endif
 
 test:
-	@if ! ../test.pl -c $(exe) ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c $(exe)
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c $(exe) ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c $(exe)
 
 show:
 	@for dir in *; do \

regression/cbmc-cover/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_test_pl_tests(
+    "$<TARGET_FILE:cbmc>"
+)

regression/cbmc-cover/Makefile

@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/cbmc/cbmc
 
 show:
 	@for dir in *; do \

regression/cbmc-cpp/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_test_pl_tests(
+    "$<TARGET_FILE:cbmc>"
+)

regression/cbmc-cpp/FunctionParam1/main.cpp

@@ -0,0 +1,12 @@
+#include <assert.h>
+int x;
+
+void g(int i){
+  x=i;
+}
+
+int main() {
+  g(3);
+  assert(x==3);
+}
+

regression/cbmc-cpp/FunctionParam1/test.desc

@@ -0,0 +1,8 @@
+CORE
+main.cpp
+
+^EXIT=0$
+^SIGNAL=0$
+^VERIFICATION SUCCESSFUL$
+--
+^warning: ignoring

regression/cbmc-cpp/MethodParam1/main.cpp

@@ -0,0 +1,18 @@
+#include <assert.h>
+unsigned x;
+
+class ct {
+  void f(int i) {
+    x=x+i;
+  }
+};
+
+int main() {
+  unsigned r;
+  x=r%3;
+  ct c;
+  c.f(2);
+  assert(x<4);
+  assert(x<5);
+}
+

regression/cbmc-cpp/MethodParam1/test.desc

@@ -0,0 +1,10 @@
+CORE
+main.cpp
+
+instance is SATISFIABLE$
+instance is UNSATISFIABLE$
+^EXIT=10$
+^SIGNAL=0$
+^VERIFICATION FAILED$
+--
+^warning: ignoring

regression/cbmc-cpp/union2/main.cpp

@@ -1,3 +1,4 @@
+#include <assert.h>
 struct A
 {
   union

regression/cbmc-java-inheritance/Makefile

@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 show:
 	@for dir in *; do \

regression/cbmc-java/Makefile

@@ -1,16 +1,10 @@
 default: tests.log
 
 test:
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 tests.log: ../test.pl
-	@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
-		../failed-tests-printer.pl ; \
-		exit 1 ; \
-	fi
+	@../test.pl -p -c ../../../src/jbmc/jbmc
 
 show:
 	@for dir in *; do \

regression/cbmc-java/classpath2/test.desc

@@ -1,6 +1,6 @@
 CORE
 jarfile3.class
---function jarfile3.f --java-cp-include-files "jarfile3\.class"
+--function jarfile3.f --java-cp-include-files 'jarfile3\.class'
 ^EXIT=10$
 ^SIGNAL=0$
 .*SUCCESS$

regression/cbmc-java/divide_by_zero/DivideByZero.class

@@ -0,0 +1,6 @@
+public class DivideByZero {
+    public static void main(String args[]) {
+        int i=0;
+        int j=10/i;
+    }
+}

regression/cbmc-java/divide_by_zero/DivideByZero.java

@@ -0,0 +1,9 @@
+CORE
+DivideByZero.class
+
+^EXIT=10$
+^SIGNAL=0$
+Denominator should be nonzero: FAILURE
+^VERIFICATION FAILED
+--
+^warning: ignoring

regression/cbmc-java/divide_by_zero/test.desc

@@ -1,6 +1,6 @@
 CORE
 Main.class
---function "Other.fail:()V"
+--function 'Other.fail:()V'
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/cbmc-java/function1/test.desc

@@ -1,6 +1,6 @@
 CORE
 Main.class
---function "D.fail:()V"
+--function 'D.fail:()V'
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/cbmc-java/function2/test.desc

@@ -1,6 +1,6 @@
 KNOWNBUG
 Main.class
---function "A.dummy:()V"
+--function 'A.dummy:()V'
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$

regression/cbmc-java/function3/test.desc

@@ -1,6 +1,6 @@
 KNOWNBUG
 Main.class
---function "Other.fail"
+--function 'Other.fail'
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$

regression/cbmc-java/function4/test.desc

@@ -0,0 +1,15 @@
+interface A{}
+interface B{}
+interface C{}
+interface L<T> extends A,B,C{}
+
+public class Gn<T extends L<? extends B>>{
+	Gn<?> ex1;
+	public void foo1(Gn<?> ex1){
+		if(ex1 != null)
+		this.ex1 = ex1;
+	}
+	public static void main(String[] args) {
+		System.out.println("ddfsdf");
+	}
+}