From d94545250d90180936ac99163a427e6baeac7e1d Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Fri, 18 May 2018 09:59:16 +0100 Subject: [PATCH 01/12] Adapt cpplint header guard check to deal with non-top-level `src` and `unit` directories --- scripts/cpplint.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/cpplint.py b/scripts/cpplint.py index d01baeb2fcf..b42395158e9 100755 --- a/scripts/cpplint.py +++ b/scripts/cpplint.py @@ -1971,8 +1971,13 @@ def GetHeaderGuardCPPVariable(filename): fileinfo = FileInfo(filename) file_path_from_root = fileinfo.RepositoryName() - # Remove first path component - offset=len(file_path_from_root.split(os.path.sep)[0])+1 + # Remove up to including `src` component + path_components = file_path_from_root.split(os.path.sep) + offset = 0 + for component in path_components: + offset += len(component) + 1 + if component == 'src' or component == 'unit': + break file_path_from_root = 'CPROVER_' + file_path_from_root[offset:] if _root: suffix = os.sep From 987106fd3c171a679f18781d051aaefb6468d49f Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Wed, 16 May 2018 21:46:38 +0100 Subject: [PATCH 02/12] Make unit test independent of java_bytecode --- unit/analyses/dependence_graph.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unit/analyses/dependence_graph.cpp b/unit/analyses/dependence_graph.cpp index 6a499be1a76..6ef65220485 100644 --- a/unit/analyses/dependence_graph.cpp +++ b/unit/analyses/dependence_graph.cpp @@ -16,7 +16,7 @@ Author: Chris Smowton, chris.smowton@diffblue.com #include #include #include -#include +#include static symbolt create_void_function_symbol( const irep_idt &name, @@ -57,7 +57,7 @@ SCENARIO("dependence_graph", "[core][analyses][dependence_graph]") // } // void b() { } - register_language(new_java_bytecode_language); + register_language(new_ansi_c_language); goto_modelt goto_model; namespacet ns(goto_model.symbol_table); From a20f2c14274d6dd4dec9c0d0a93589cde5cfe141 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Wed, 16 May 2018 09:59:49 +0100 Subject: [PATCH 03/12] Move java_bytecode, jbmc and miniz to jbmc/src --- CMakeLists.txt | 8 ++ jbmc/CMakeLists.txt | 3 + jbmc/src/CMakeLists.txt | 18 +++++ jbmc/src/Makefile | 44 +++++++++++ jbmc/src/config.inc | 1 + .../src}/java_bytecode/CMakeLists.txt | 0 {src => jbmc/src}/java_bytecode/Makefile | 5 +- {src => jbmc/src}/java_bytecode/README.md | 0 .../src}/java_bytecode/bytecode_info.cpp | 2 + .../src}/java_bytecode/bytecode_info.h | 0 .../character_refine_preprocess.cpp | 0 .../character_refine_preprocess.h | 0 .../src}/java_bytecode/ci_lazy_methods.cpp | 0 .../src}/java_bytecode/ci_lazy_methods.h | 0 .../java_bytecode/ci_lazy_methods_needed.cpp | 0 .../java_bytecode/ci_lazy_methods_needed.h | 0 .../java_bytecode/convert_java_nondet.cpp | 0 .../src}/java_bytecode/convert_java_nondet.h | 0 {src => jbmc/src}/java_bytecode/expr2java.cpp | 0 {src => jbmc/src}/java_bytecode/expr2java.h | 0 ...eric_parameter_specialization_map_keys.cpp | 0 ...eneric_parameter_specialization_map_keys.h | 0 {src => jbmc/src}/java_bytecode/jar_file.cpp | 0 {src => jbmc/src}/java_bytecode/jar_file.h | 0 .../java_bytecode_convert_class.cpp | 0 .../java_bytecode_convert_class.h | 0 .../java_bytecode_convert_method.cpp | 0 .../java_bytecode_convert_method.h | 0 .../java_bytecode_convert_method_class.h | 0 .../java_bytecode_convert_threadblock.cpp | 0 .../java_bytecode_convert_threadblock.h | 0 .../java_bytecode_instrument.cpp | 0 .../java_bytecode/java_bytecode_instrument.h | 0 .../java_bytecode_internal_additions.cpp | 0 .../java_bytecode_internal_additions.h | 0 .../java_bytecode/java_bytecode_language.cpp | 7 +- .../java_bytecode/java_bytecode_language.h | 0 .../java_bytecode_parse_tree.cpp | 0 .../java_bytecode/java_bytecode_parse_tree.h | 0 .../java_bytecode/java_bytecode_parser.cpp | 0 .../src}/java_bytecode/java_bytecode_parser.h | 0 .../java_bytecode/java_bytecode_typecheck.cpp | 0 .../java_bytecode/java_bytecode_typecheck.h | 0 .../java_bytecode_typecheck_code.cpp | 0 .../java_bytecode_typecheck_expr.cpp | 0 .../java_bytecode_typecheck_type.cpp | 0 .../src}/java_bytecode/java_class_loader.cpp | 0 .../src}/java_bytecode/java_class_loader.h | 0 .../java_bytecode/java_class_loader_limit.cpp | 0 .../java_bytecode/java_class_loader_limit.h | 0 .../src}/java_bytecode/java_entry_point.cpp | 0 .../src}/java_bytecode/java_entry_point.h | 0 .../java_enum_static_init_unwind_handler.cpp | 0 .../java_enum_static_init_unwind_handler.h | 0 .../java_local_variable_table.cpp | 0 .../java_bytecode/java_object_factory.cpp | 0 .../src}/java_bytecode/java_object_factory.h | 0 .../src}/java_bytecode/java_pointer_casts.cpp | 0 .../src}/java_bytecode/java_pointer_casts.h | 0 .../src}/java_bytecode/java_qualifiers.cpp | 0 .../src}/java_bytecode/java_qualifiers.h | 0 .../src}/java_bytecode/java_root_class.cpp | 0 .../src}/java_bytecode/java_root_class.h | 0 .../java_static_initializers.cpp | 0 .../java_bytecode/java_static_initializers.h | 0 .../java_string_library_preprocess.cpp | 0 .../java_string_library_preprocess.h | 0 .../java_bytecode/java_string_literals.cpp | 0 .../src}/java_bytecode/java_string_literals.h | 0 .../src}/java_bytecode/java_types.cpp | 0 {src => jbmc/src}/java_bytecode/java_types.h | 0 .../src}/java_bytecode/java_utils.cpp | 0 {src => jbmc/src}/java_bytecode/java_utils.h | 0 .../src}/java_bytecode/library/CMakeLists.txt | 0 .../src}/java_bytecode/library/Makefile | 3 +- .../src}/java_bytecode/library/converter.cpp | 0 .../library/src/org/cprover/CProver.java | 0 .../src}/java_bytecode/mz_zip_archive.cpp | 0 .../src}/java_bytecode/mz_zip_archive.h | 0 .../java_bytecode/object_factory_parameters.h | 0 .../src}/java_bytecode/remove_exceptions.cpp | 0 .../src}/java_bytecode/remove_exceptions.h | 0 .../src}/java_bytecode/remove_instanceof.cpp | 0 .../src}/java_bytecode/remove_instanceof.h | 0 .../src}/java_bytecode/remove_java_new.cpp | 0 .../src}/java_bytecode/remove_java_new.h | 0 .../java_bytecode/replace_java_nondet.cpp | 0 .../src}/java_bytecode/replace_java_nondet.h | 0 .../java_bytecode/select_pointer_type.cpp | 0 .../src}/java_bytecode/select_pointer_type.h | 0 .../java_bytecode/simple_method_stubbing.cpp | 0 .../java_bytecode/simple_method_stubbing.h | 0 .../java_bytecode/synthetic_methods_map.h | 0 {src => jbmc/src}/jbmc/CMakeLists.txt | 6 +- jbmc/src/jbmc/Makefile | 74 +++++++++++++++++++ {src => jbmc/src}/jbmc/README.md | 0 {src => jbmc/src}/jbmc/jbmc_main.cpp | 0 {src => jbmc/src}/jbmc/jbmc_parse_options.cpp | 0 {src => jbmc/src}/jbmc/jbmc_parse_options.h | 0 {src => jbmc/src}/miniz/CMakeLists.txt | 0 {src => jbmc/src}/miniz/Makefile | 4 +- {src => jbmc/src}/miniz/README.md | 0 {src => jbmc/src}/miniz/miniz.cpp | 0 {src => jbmc/src}/miniz/miniz.h | 0 src/CMakeLists.txt | 3 - src/Makefile | 54 ++++++++------ src/clobber/Makefile | 2 +- src/clobber/clobber_parse_options.cpp | 2 - src/clobber/clobber_parse_options.h | 3 - src/goto-analyzer/Makefile | 3 +- .../goto_analyzer_parse_options.cpp | 16 ---- .../goto_analyzer_parse_options.h | 3 - src/goto-cc/CMakeLists.txt | 1 + src/goto-cc/Makefile | 1 - src/goto-diff/Makefile | 5 +- src/goto-diff/goto_diff_languages.cpp | 3 - src/goto-diff/goto_diff_parse_options.cpp | 13 ---- src/goto-instrument/Makefile | 4 +- src/jbmc/Makefile | 74 ------------------- unit/Makefile | 1 - unit/testing-utils/load_java_class.h | 6 +- unit/testing-utils/require_goto_statements.h | 6 +- unit/testing-utils/require_parse_tree.h | 6 +- unit/testing-utils/require_type.h | 6 +- 124 files changed, 215 insertions(+), 172 deletions(-) create mode 100644 jbmc/CMakeLists.txt create mode 100644 jbmc/src/CMakeLists.txt create mode 100644 jbmc/src/Makefile create mode 100644 jbmc/src/config.inc rename {src => jbmc/src}/java_bytecode/CMakeLists.txt (100%) rename {src => jbmc/src}/java_bytecode/Makefile (93%) rename {src => jbmc/src}/java_bytecode/README.md (100%) rename {src => jbmc/src}/java_bytecode/bytecode_info.cpp (99%) rename {src => jbmc/src}/java_bytecode/bytecode_info.h (100%) rename {src => jbmc/src}/java_bytecode/character_refine_preprocess.cpp (100%) rename {src => jbmc/src}/java_bytecode/character_refine_preprocess.h (100%) rename {src => jbmc/src}/java_bytecode/ci_lazy_methods.cpp (100%) rename {src => jbmc/src}/java_bytecode/ci_lazy_methods.h (100%) rename {src => jbmc/src}/java_bytecode/ci_lazy_methods_needed.cpp (100%) rename {src => jbmc/src}/java_bytecode/ci_lazy_methods_needed.h (100%) rename {src => jbmc/src}/java_bytecode/convert_java_nondet.cpp (100%) rename {src => jbmc/src}/java_bytecode/convert_java_nondet.h (100%) rename {src => jbmc/src}/java_bytecode/expr2java.cpp (100%) rename {src => jbmc/src}/java_bytecode/expr2java.h (100%) rename {src => jbmc/src}/java_bytecode/generic_parameter_specialization_map_keys.cpp (100%) rename {src => jbmc/src}/java_bytecode/generic_parameter_specialization_map_keys.h (100%) rename {src => jbmc/src}/java_bytecode/jar_file.cpp (100%) rename {src => jbmc/src}/java_bytecode/jar_file.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_class.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_class.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_method.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_method.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_method_class.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_threadblock.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_convert_threadblock.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_instrument.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_instrument.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_internal_additions.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_internal_additions.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_language.cpp (99%) rename {src => jbmc/src}/java_bytecode/java_bytecode_language.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_parse_tree.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_parse_tree.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_parser.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_parser.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_typecheck.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_typecheck.h (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_typecheck_code.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_typecheck_expr.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_bytecode_typecheck_type.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_class_loader.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_class_loader.h (100%) rename {src => jbmc/src}/java_bytecode/java_class_loader_limit.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_class_loader_limit.h (100%) rename {src => jbmc/src}/java_bytecode/java_entry_point.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_entry_point.h (100%) rename {src => jbmc/src}/java_bytecode/java_enum_static_init_unwind_handler.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_enum_static_init_unwind_handler.h (100%) rename {src => jbmc/src}/java_bytecode/java_local_variable_table.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_object_factory.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_object_factory.h (100%) rename {src => jbmc/src}/java_bytecode/java_pointer_casts.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_pointer_casts.h (100%) rename {src => jbmc/src}/java_bytecode/java_qualifiers.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_qualifiers.h (100%) rename {src => jbmc/src}/java_bytecode/java_root_class.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_root_class.h (100%) rename {src => jbmc/src}/java_bytecode/java_static_initializers.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_static_initializers.h (100%) rename {src => jbmc/src}/java_bytecode/java_string_library_preprocess.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_string_library_preprocess.h (100%) rename {src => jbmc/src}/java_bytecode/java_string_literals.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_string_literals.h (100%) rename {src => jbmc/src}/java_bytecode/java_types.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_types.h (100%) rename {src => jbmc/src}/java_bytecode/java_utils.cpp (100%) rename {src => jbmc/src}/java_bytecode/java_utils.h (100%) rename {src => jbmc/src}/java_bytecode/library/CMakeLists.txt (100%) rename {src => jbmc/src}/java_bytecode/library/Makefile (93%) rename {src => jbmc/src}/java_bytecode/library/converter.cpp (100%) rename {src => jbmc/src}/java_bytecode/library/src/org/cprover/CProver.java (100%) rename {src => jbmc/src}/java_bytecode/mz_zip_archive.cpp (100%) rename {src => jbmc/src}/java_bytecode/mz_zip_archive.h (100%) rename {src => jbmc/src}/java_bytecode/object_factory_parameters.h (100%) rename {src => jbmc/src}/java_bytecode/remove_exceptions.cpp (100%) rename {src => jbmc/src}/java_bytecode/remove_exceptions.h (100%) rename {src => jbmc/src}/java_bytecode/remove_instanceof.cpp (100%) rename {src => jbmc/src}/java_bytecode/remove_instanceof.h (100%) rename {src => jbmc/src}/java_bytecode/remove_java_new.cpp (100%) rename {src => jbmc/src}/java_bytecode/remove_java_new.h (100%) rename {src => jbmc/src}/java_bytecode/replace_java_nondet.cpp (100%) rename {src => jbmc/src}/java_bytecode/replace_java_nondet.h (100%) rename {src => jbmc/src}/java_bytecode/select_pointer_type.cpp (100%) rename {src => jbmc/src}/java_bytecode/select_pointer_type.h (100%) rename {src => jbmc/src}/java_bytecode/simple_method_stubbing.cpp (100%) rename {src => jbmc/src}/java_bytecode/simple_method_stubbing.h (100%) rename {src => jbmc/src}/java_bytecode/synthetic_methods_map.h (100%) rename {src => jbmc/src}/jbmc/CMakeLists.txt (84%) create mode 100644 jbmc/src/jbmc/Makefile rename {src => jbmc/src}/jbmc/README.md (100%) rename {src => jbmc/src}/jbmc/jbmc_main.cpp (100%) rename {src => jbmc/src}/jbmc/jbmc_parse_options.cpp (100%) rename {src => jbmc/src}/jbmc/jbmc_parse_options.h (100%) rename {src => jbmc/src}/miniz/CMakeLists.txt (100%) rename {src => jbmc/src}/miniz/Makefile (72%) rename {src => jbmc/src}/miniz/README.md (100%) rename {src => jbmc/src}/miniz/miniz.cpp (100%) rename {src => jbmc/src}/miniz/miniz.h (100%) delete mode 100644 src/jbmc/Makefile diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ffa74b22cd..c067b70a29d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ set(sat_impl "minisat2" CACHE STRING ) add_subdirectory(src) +add_subdirectory(jbmc) if(${enable_cbmc_tests}) enable_testing() @@ -81,6 +82,13 @@ set_target_properties( util xml + java_bytecode + jbmc + jbmc-lib + java-testing-utils + java-unit + miniz + PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED true diff --git a/jbmc/CMakeLists.txt b/jbmc/CMakeLists.txt new file mode 100644 index 00000000000..45da1e50818 --- /dev/null +++ b/jbmc/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(regression) +add_subdirectory(src) +add_subdirectory(unit) diff --git a/jbmc/src/CMakeLists.txt b/jbmc/src/CMakeLists.txt new file mode 100644 index 00000000000..71cd2a66f32 --- /dev/null +++ b/jbmc/src/CMakeLists.txt @@ -0,0 +1,18 @@ +project(JBMC) + +# Set the public include locations for a target. +macro(generic_includes name) + target_include_directories(${name} + PUBLIC + ${JBMC_BINARY_DIR} + ${JBMC_SOURCE_DIR} + ${CBMC_BINARY_DIR} + ${CBMC_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ) +endmacro(generic_includes) + +add_subdirectory(miniz) +add_subdirectory(java_bytecode) +add_subdirectory(jbmc) diff --git a/jbmc/src/Makefile b/jbmc/src/Makefile new file mode 100644 index 00000000000..3b40d60b8a6 --- /dev/null +++ b/jbmc/src/Makefile @@ -0,0 +1,44 @@ +DIRS = jbmc java_bytecode miniz + +include config.inc + +.PHONY: all +all: jbmc.dir + +# building cbmc proper +.PHONY: cprover.dir +cprover.dir: + $(MAKE) $(MAKEARGS) -C $(CPROVER_DIR)/src + +.PHONY: java_bytecode.dir +java_bytecode.dir: miniz.dir + +.PHONY: jbmc.dir +jbmc.dir: java_bytecode.dir cprover.dir + +.PHONY: miniz.dir +miniz.dir: + +$(patsubst %, %.dir, $(DIRS)): + ## Entering $(basename $@) + $(MAKE) $(MAKEARGS) -C $(basename $@) + +# generate source files + +$(patsubst %, %_generated_files, $(DIRS)): + $(MAKE) $(MAKEARGS) -C $(patsubst %_generated_files, %, $@) generated_files + +.PHONY: generated_files +generated_files: $(patsubst %, %_generated_files, $(DIRS)) + +# cleaning + +.PHONY: clean +clean: $(patsubst %, %_clean, $(DIRS)) cprover_clean + +$(patsubst %, %_clean, $(DIRS)): + $(MAKE) $(MAKEARGS) -C $(patsubst %_clean, %, $@) clean ; \ + +.PHONY: cprover_clean +cprover_clean: + $(MAKE) $(MAKEARGS) -C $(CPROVER_DIR)/src clean diff --git a/jbmc/src/config.inc b/jbmc/src/config.inc new file mode 100644 index 00000000000..5873cb69869 --- /dev/null +++ b/jbmc/src/config.inc @@ -0,0 +1 @@ +CPROVER_DIR ?= ../.. diff --git a/src/java_bytecode/CMakeLists.txt b/jbmc/src/java_bytecode/CMakeLists.txt similarity index 100% rename from src/java_bytecode/CMakeLists.txt rename to jbmc/src/java_bytecode/CMakeLists.txt diff --git a/src/java_bytecode/Makefile b/jbmc/src/java_bytecode/Makefile similarity index 93% rename from src/java_bytecode/Makefile rename to jbmc/src/java_bytecode/Makefile index 6cb0f1e84b7..71c3e45b898 100644 --- a/src/java_bytecode/Makefile +++ b/jbmc/src/java_bytecode/Makefile @@ -41,10 +41,11 @@ SRC = bytecode_info.cpp \ simple_method_stubbing.cpp \ # Empty last line -INCLUDES= -I .. +INCLUDES= -I .. -I ../$(CPROVER_DIR)/src include ../config.inc -include ../common +include ../$(CPROVER_DIR)/src/config.inc +include ../$(CPROVER_DIR)/src/common CLEANFILES = java_bytecode$(LIBEXT) diff --git a/src/java_bytecode/README.md b/jbmc/src/java_bytecode/README.md similarity index 100% rename from src/java_bytecode/README.md rename to jbmc/src/java_bytecode/README.md diff --git a/src/java_bytecode/bytecode_info.cpp b/jbmc/src/java_bytecode/bytecode_info.cpp similarity index 99% rename from src/java_bytecode/bytecode_info.cpp rename to jbmc/src/java_bytecode/bytecode_info.cpp index 84e5040b9c8..b422c8e86fc 100644 --- a/src/java_bytecode/bytecode_info.cpp +++ b/jbmc/src/java_bytecode/bytecode_info.cpp @@ -12,6 +12,7 @@ Author: Daniel Kroening, kroening@kroening.com #include "bytecode_info.h" +// clang-format off struct bytecode_infot const bytecode_info[]= { { "aaload", 0x32, ' ', 2, 1, ' ' }, // arrayref, index → value; load onto the stack a reference from an array NOLINT(*) @@ -221,3 +222,4 @@ struct bytecode_infot const bytecode_info[]= { "wide", 0xc4, ' ', 0, 0, ' ' }, // modifier for others NOLINT(*) { nullptr, 0x00, '\0',0, 0, '\0'}, // zero-initialized NOLINT (*) }; +// clang-format on diff --git a/src/java_bytecode/bytecode_info.h b/jbmc/src/java_bytecode/bytecode_info.h similarity index 100% rename from src/java_bytecode/bytecode_info.h rename to jbmc/src/java_bytecode/bytecode_info.h diff --git a/src/java_bytecode/character_refine_preprocess.cpp b/jbmc/src/java_bytecode/character_refine_preprocess.cpp similarity index 100% rename from src/java_bytecode/character_refine_preprocess.cpp rename to jbmc/src/java_bytecode/character_refine_preprocess.cpp diff --git a/src/java_bytecode/character_refine_preprocess.h b/jbmc/src/java_bytecode/character_refine_preprocess.h similarity index 100% rename from src/java_bytecode/character_refine_preprocess.h rename to jbmc/src/java_bytecode/character_refine_preprocess.h diff --git a/src/java_bytecode/ci_lazy_methods.cpp b/jbmc/src/java_bytecode/ci_lazy_methods.cpp similarity index 100% rename from src/java_bytecode/ci_lazy_methods.cpp rename to jbmc/src/java_bytecode/ci_lazy_methods.cpp diff --git a/src/java_bytecode/ci_lazy_methods.h b/jbmc/src/java_bytecode/ci_lazy_methods.h similarity index 100% rename from src/java_bytecode/ci_lazy_methods.h rename to jbmc/src/java_bytecode/ci_lazy_methods.h diff --git a/src/java_bytecode/ci_lazy_methods_needed.cpp b/jbmc/src/java_bytecode/ci_lazy_methods_needed.cpp similarity index 100% rename from src/java_bytecode/ci_lazy_methods_needed.cpp rename to jbmc/src/java_bytecode/ci_lazy_methods_needed.cpp diff --git a/src/java_bytecode/ci_lazy_methods_needed.h b/jbmc/src/java_bytecode/ci_lazy_methods_needed.h similarity index 100% rename from src/java_bytecode/ci_lazy_methods_needed.h rename to jbmc/src/java_bytecode/ci_lazy_methods_needed.h diff --git a/src/java_bytecode/convert_java_nondet.cpp b/jbmc/src/java_bytecode/convert_java_nondet.cpp similarity index 100% rename from src/java_bytecode/convert_java_nondet.cpp rename to jbmc/src/java_bytecode/convert_java_nondet.cpp diff --git a/src/java_bytecode/convert_java_nondet.h b/jbmc/src/java_bytecode/convert_java_nondet.h similarity index 100% rename from src/java_bytecode/convert_java_nondet.h rename to jbmc/src/java_bytecode/convert_java_nondet.h diff --git a/src/java_bytecode/expr2java.cpp b/jbmc/src/java_bytecode/expr2java.cpp similarity index 100% rename from src/java_bytecode/expr2java.cpp rename to jbmc/src/java_bytecode/expr2java.cpp diff --git a/src/java_bytecode/expr2java.h b/jbmc/src/java_bytecode/expr2java.h similarity index 100% rename from src/java_bytecode/expr2java.h rename to jbmc/src/java_bytecode/expr2java.h diff --git a/src/java_bytecode/generic_parameter_specialization_map_keys.cpp b/jbmc/src/java_bytecode/generic_parameter_specialization_map_keys.cpp similarity index 100% rename from src/java_bytecode/generic_parameter_specialization_map_keys.cpp rename to jbmc/src/java_bytecode/generic_parameter_specialization_map_keys.cpp diff --git a/src/java_bytecode/generic_parameter_specialization_map_keys.h b/jbmc/src/java_bytecode/generic_parameter_specialization_map_keys.h similarity index 100% rename from src/java_bytecode/generic_parameter_specialization_map_keys.h rename to jbmc/src/java_bytecode/generic_parameter_specialization_map_keys.h diff --git a/src/java_bytecode/jar_file.cpp b/jbmc/src/java_bytecode/jar_file.cpp similarity index 100% rename from src/java_bytecode/jar_file.cpp rename to jbmc/src/java_bytecode/jar_file.cpp diff --git a/src/java_bytecode/jar_file.h b/jbmc/src/java_bytecode/jar_file.h similarity index 100% rename from src/java_bytecode/jar_file.h rename to jbmc/src/java_bytecode/jar_file.h diff --git a/src/java_bytecode/java_bytecode_convert_class.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_convert_class.cpp rename to jbmc/src/java_bytecode/java_bytecode_convert_class.cpp diff --git a/src/java_bytecode/java_bytecode_convert_class.h b/jbmc/src/java_bytecode/java_bytecode_convert_class.h similarity index 100% rename from src/java_bytecode/java_bytecode_convert_class.h rename to jbmc/src/java_bytecode/java_bytecode_convert_class.h diff --git a/src/java_bytecode/java_bytecode_convert_method.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_method.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_convert_method.cpp rename to jbmc/src/java_bytecode/java_bytecode_convert_method.cpp diff --git a/src/java_bytecode/java_bytecode_convert_method.h b/jbmc/src/java_bytecode/java_bytecode_convert_method.h similarity index 100% rename from src/java_bytecode/java_bytecode_convert_method.h rename to jbmc/src/java_bytecode/java_bytecode_convert_method.h diff --git a/src/java_bytecode/java_bytecode_convert_method_class.h b/jbmc/src/java_bytecode/java_bytecode_convert_method_class.h similarity index 100% rename from src/java_bytecode/java_bytecode_convert_method_class.h rename to jbmc/src/java_bytecode/java_bytecode_convert_method_class.h diff --git a/src/java_bytecode/java_bytecode_convert_threadblock.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_threadblock.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_convert_threadblock.cpp rename to jbmc/src/java_bytecode/java_bytecode_convert_threadblock.cpp diff --git a/src/java_bytecode/java_bytecode_convert_threadblock.h b/jbmc/src/java_bytecode/java_bytecode_convert_threadblock.h similarity index 100% rename from src/java_bytecode/java_bytecode_convert_threadblock.h rename to jbmc/src/java_bytecode/java_bytecode_convert_threadblock.h diff --git a/src/java_bytecode/java_bytecode_instrument.cpp b/jbmc/src/java_bytecode/java_bytecode_instrument.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_instrument.cpp rename to jbmc/src/java_bytecode/java_bytecode_instrument.cpp diff --git a/src/java_bytecode/java_bytecode_instrument.h b/jbmc/src/java_bytecode/java_bytecode_instrument.h similarity index 100% rename from src/java_bytecode/java_bytecode_instrument.h rename to jbmc/src/java_bytecode/java_bytecode_instrument.h diff --git a/src/java_bytecode/java_bytecode_internal_additions.cpp b/jbmc/src/java_bytecode/java_bytecode_internal_additions.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_internal_additions.cpp rename to jbmc/src/java_bytecode/java_bytecode_internal_additions.cpp diff --git a/src/java_bytecode/java_bytecode_internal_additions.h b/jbmc/src/java_bytecode/java_bytecode_internal_additions.h similarity index 100% rename from src/java_bytecode/java_bytecode_internal_additions.h rename to jbmc/src/java_bytecode/java_bytecode_internal_additions.h diff --git a/src/java_bytecode/java_bytecode_language.cpp b/jbmc/src/java_bytecode/java_bytecode_language.cpp similarity index 99% rename from src/java_bytecode/java_bytecode_language.cpp rename to jbmc/src/java_bytecode/java_bytecode_language.cpp index 74dc65c008c..f96b23a38ba 100644 --- a/src/java_bytecode/java_bytecode_language.cpp +++ b/jbmc/src/java_bytecode/java_bytecode_language.cpp @@ -34,7 +34,7 @@ Author: Daniel Kroening, kroening@kroening.com #include "java_string_literals.h" #include "java_static_initializers.h" #include "java_utils.h" -#include +#include "ci_lazy_methods.h" #include "expr2java.h" @@ -124,7 +124,10 @@ void java_bytecode_languaget::get_language_options(const cmdlinet &cmd) // add jars from JSON config file to classpath for(const jsont &file_entry : include_files.array) { - assert(file_entry.is_string() && has_suffix(file_entry.value, ".jar")); + DATA_INVARIANT( + file_entry.is_string() && has_suffix(file_entry.value, ".jar"), + "classpath entry must be jar filename, but '" + file_entry.value + + "' found"); config.java.classpath.push_back(file_entry.value); } } diff --git a/src/java_bytecode/java_bytecode_language.h b/jbmc/src/java_bytecode/java_bytecode_language.h similarity index 100% rename from src/java_bytecode/java_bytecode_language.h rename to jbmc/src/java_bytecode/java_bytecode_language.h diff --git a/src/java_bytecode/java_bytecode_parse_tree.cpp b/jbmc/src/java_bytecode/java_bytecode_parse_tree.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_parse_tree.cpp rename to jbmc/src/java_bytecode/java_bytecode_parse_tree.cpp diff --git a/src/java_bytecode/java_bytecode_parse_tree.h b/jbmc/src/java_bytecode/java_bytecode_parse_tree.h similarity index 100% rename from src/java_bytecode/java_bytecode_parse_tree.h rename to jbmc/src/java_bytecode/java_bytecode_parse_tree.h diff --git a/src/java_bytecode/java_bytecode_parser.cpp b/jbmc/src/java_bytecode/java_bytecode_parser.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_parser.cpp rename to jbmc/src/java_bytecode/java_bytecode_parser.cpp diff --git a/src/java_bytecode/java_bytecode_parser.h b/jbmc/src/java_bytecode/java_bytecode_parser.h similarity index 100% rename from src/java_bytecode/java_bytecode_parser.h rename to jbmc/src/java_bytecode/java_bytecode_parser.h diff --git a/src/java_bytecode/java_bytecode_typecheck.cpp b/jbmc/src/java_bytecode/java_bytecode_typecheck.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_typecheck.cpp rename to jbmc/src/java_bytecode/java_bytecode_typecheck.cpp diff --git a/src/java_bytecode/java_bytecode_typecheck.h b/jbmc/src/java_bytecode/java_bytecode_typecheck.h similarity index 100% rename from src/java_bytecode/java_bytecode_typecheck.h rename to jbmc/src/java_bytecode/java_bytecode_typecheck.h diff --git a/src/java_bytecode/java_bytecode_typecheck_code.cpp b/jbmc/src/java_bytecode/java_bytecode_typecheck_code.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_typecheck_code.cpp rename to jbmc/src/java_bytecode/java_bytecode_typecheck_code.cpp diff --git a/src/java_bytecode/java_bytecode_typecheck_expr.cpp b/jbmc/src/java_bytecode/java_bytecode_typecheck_expr.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_typecheck_expr.cpp rename to jbmc/src/java_bytecode/java_bytecode_typecheck_expr.cpp diff --git a/src/java_bytecode/java_bytecode_typecheck_type.cpp b/jbmc/src/java_bytecode/java_bytecode_typecheck_type.cpp similarity index 100% rename from src/java_bytecode/java_bytecode_typecheck_type.cpp rename to jbmc/src/java_bytecode/java_bytecode_typecheck_type.cpp diff --git a/src/java_bytecode/java_class_loader.cpp b/jbmc/src/java_bytecode/java_class_loader.cpp similarity index 100% rename from src/java_bytecode/java_class_loader.cpp rename to jbmc/src/java_bytecode/java_class_loader.cpp diff --git a/src/java_bytecode/java_class_loader.h b/jbmc/src/java_bytecode/java_class_loader.h similarity index 100% rename from src/java_bytecode/java_class_loader.h rename to jbmc/src/java_bytecode/java_class_loader.h diff --git a/src/java_bytecode/java_class_loader_limit.cpp b/jbmc/src/java_bytecode/java_class_loader_limit.cpp similarity index 100% rename from src/java_bytecode/java_class_loader_limit.cpp rename to jbmc/src/java_bytecode/java_class_loader_limit.cpp diff --git a/src/java_bytecode/java_class_loader_limit.h b/jbmc/src/java_bytecode/java_class_loader_limit.h similarity index 100% rename from src/java_bytecode/java_class_loader_limit.h rename to jbmc/src/java_bytecode/java_class_loader_limit.h diff --git a/src/java_bytecode/java_entry_point.cpp b/jbmc/src/java_bytecode/java_entry_point.cpp similarity index 100% rename from src/java_bytecode/java_entry_point.cpp rename to jbmc/src/java_bytecode/java_entry_point.cpp diff --git a/src/java_bytecode/java_entry_point.h b/jbmc/src/java_bytecode/java_entry_point.h similarity index 100% rename from src/java_bytecode/java_entry_point.h rename to jbmc/src/java_bytecode/java_entry_point.h diff --git a/src/java_bytecode/java_enum_static_init_unwind_handler.cpp b/jbmc/src/java_bytecode/java_enum_static_init_unwind_handler.cpp similarity index 100% rename from src/java_bytecode/java_enum_static_init_unwind_handler.cpp rename to jbmc/src/java_bytecode/java_enum_static_init_unwind_handler.cpp diff --git a/src/java_bytecode/java_enum_static_init_unwind_handler.h b/jbmc/src/java_bytecode/java_enum_static_init_unwind_handler.h similarity index 100% rename from src/java_bytecode/java_enum_static_init_unwind_handler.h rename to jbmc/src/java_bytecode/java_enum_static_init_unwind_handler.h diff --git a/src/java_bytecode/java_local_variable_table.cpp b/jbmc/src/java_bytecode/java_local_variable_table.cpp similarity index 100% rename from src/java_bytecode/java_local_variable_table.cpp rename to jbmc/src/java_bytecode/java_local_variable_table.cpp diff --git a/src/java_bytecode/java_object_factory.cpp b/jbmc/src/java_bytecode/java_object_factory.cpp similarity index 100% rename from src/java_bytecode/java_object_factory.cpp rename to jbmc/src/java_bytecode/java_object_factory.cpp diff --git a/src/java_bytecode/java_object_factory.h b/jbmc/src/java_bytecode/java_object_factory.h similarity index 100% rename from src/java_bytecode/java_object_factory.h rename to jbmc/src/java_bytecode/java_object_factory.h diff --git a/src/java_bytecode/java_pointer_casts.cpp b/jbmc/src/java_bytecode/java_pointer_casts.cpp similarity index 100% rename from src/java_bytecode/java_pointer_casts.cpp rename to jbmc/src/java_bytecode/java_pointer_casts.cpp diff --git a/src/java_bytecode/java_pointer_casts.h b/jbmc/src/java_bytecode/java_pointer_casts.h similarity index 100% rename from src/java_bytecode/java_pointer_casts.h rename to jbmc/src/java_bytecode/java_pointer_casts.h diff --git a/src/java_bytecode/java_qualifiers.cpp b/jbmc/src/java_bytecode/java_qualifiers.cpp similarity index 100% rename from src/java_bytecode/java_qualifiers.cpp rename to jbmc/src/java_bytecode/java_qualifiers.cpp diff --git a/src/java_bytecode/java_qualifiers.h b/jbmc/src/java_bytecode/java_qualifiers.h similarity index 100% rename from src/java_bytecode/java_qualifiers.h rename to jbmc/src/java_bytecode/java_qualifiers.h diff --git a/src/java_bytecode/java_root_class.cpp b/jbmc/src/java_bytecode/java_root_class.cpp similarity index 100% rename from src/java_bytecode/java_root_class.cpp rename to jbmc/src/java_bytecode/java_root_class.cpp diff --git a/src/java_bytecode/java_root_class.h b/jbmc/src/java_bytecode/java_root_class.h similarity index 100% rename from src/java_bytecode/java_root_class.h rename to jbmc/src/java_bytecode/java_root_class.h diff --git a/src/java_bytecode/java_static_initializers.cpp b/jbmc/src/java_bytecode/java_static_initializers.cpp similarity index 100% rename from src/java_bytecode/java_static_initializers.cpp rename to jbmc/src/java_bytecode/java_static_initializers.cpp diff --git a/src/java_bytecode/java_static_initializers.h b/jbmc/src/java_bytecode/java_static_initializers.h similarity index 100% rename from src/java_bytecode/java_static_initializers.h rename to jbmc/src/java_bytecode/java_static_initializers.h diff --git a/src/java_bytecode/java_string_library_preprocess.cpp b/jbmc/src/java_bytecode/java_string_library_preprocess.cpp similarity index 100% rename from src/java_bytecode/java_string_library_preprocess.cpp rename to jbmc/src/java_bytecode/java_string_library_preprocess.cpp diff --git a/src/java_bytecode/java_string_library_preprocess.h b/jbmc/src/java_bytecode/java_string_library_preprocess.h similarity index 100% rename from src/java_bytecode/java_string_library_preprocess.h rename to jbmc/src/java_bytecode/java_string_library_preprocess.h diff --git a/src/java_bytecode/java_string_literals.cpp b/jbmc/src/java_bytecode/java_string_literals.cpp similarity index 100% rename from src/java_bytecode/java_string_literals.cpp rename to jbmc/src/java_bytecode/java_string_literals.cpp diff --git a/src/java_bytecode/java_string_literals.h b/jbmc/src/java_bytecode/java_string_literals.h similarity index 100% rename from src/java_bytecode/java_string_literals.h rename to jbmc/src/java_bytecode/java_string_literals.h diff --git a/src/java_bytecode/java_types.cpp b/jbmc/src/java_bytecode/java_types.cpp similarity index 100% rename from src/java_bytecode/java_types.cpp rename to jbmc/src/java_bytecode/java_types.cpp diff --git a/src/java_bytecode/java_types.h b/jbmc/src/java_bytecode/java_types.h similarity index 100% rename from src/java_bytecode/java_types.h rename to jbmc/src/java_bytecode/java_types.h diff --git a/src/java_bytecode/java_utils.cpp b/jbmc/src/java_bytecode/java_utils.cpp similarity index 100% rename from src/java_bytecode/java_utils.cpp rename to jbmc/src/java_bytecode/java_utils.cpp diff --git a/src/java_bytecode/java_utils.h b/jbmc/src/java_bytecode/java_utils.h similarity index 100% rename from src/java_bytecode/java_utils.h rename to jbmc/src/java_bytecode/java_utils.h diff --git a/src/java_bytecode/library/CMakeLists.txt b/jbmc/src/java_bytecode/library/CMakeLists.txt similarity index 100% rename from src/java_bytecode/library/CMakeLists.txt rename to jbmc/src/java_bytecode/library/CMakeLists.txt diff --git a/src/java_bytecode/library/Makefile b/jbmc/src/java_bytecode/library/Makefile similarity index 93% rename from src/java_bytecode/library/Makefile rename to jbmc/src/java_bytecode/library/Makefile index a191f9fd79b..94b8ddd611e 100644 --- a/src/java_bytecode/library/Makefile +++ b/jbmc/src/java_bytecode/library/Makefile @@ -5,7 +5,8 @@ SRC = converter.cpp include ../../config.inc -include ../../common +include ../../$(CPROVER_DIR)/src/config.inc +include ../../$(CPROVER_DIR)/src/common SOURCE_DIR := src BINARY_DIR := classes diff --git a/src/java_bytecode/library/converter.cpp b/jbmc/src/java_bytecode/library/converter.cpp similarity index 100% rename from src/java_bytecode/library/converter.cpp rename to jbmc/src/java_bytecode/library/converter.cpp diff --git a/src/java_bytecode/library/src/org/cprover/CProver.java b/jbmc/src/java_bytecode/library/src/org/cprover/CProver.java similarity index 100% rename from src/java_bytecode/library/src/org/cprover/CProver.java rename to jbmc/src/java_bytecode/library/src/org/cprover/CProver.java diff --git a/src/java_bytecode/mz_zip_archive.cpp b/jbmc/src/java_bytecode/mz_zip_archive.cpp similarity index 100% rename from src/java_bytecode/mz_zip_archive.cpp rename to jbmc/src/java_bytecode/mz_zip_archive.cpp diff --git a/src/java_bytecode/mz_zip_archive.h b/jbmc/src/java_bytecode/mz_zip_archive.h similarity index 100% rename from src/java_bytecode/mz_zip_archive.h rename to jbmc/src/java_bytecode/mz_zip_archive.h diff --git a/src/java_bytecode/object_factory_parameters.h b/jbmc/src/java_bytecode/object_factory_parameters.h similarity index 100% rename from src/java_bytecode/object_factory_parameters.h rename to jbmc/src/java_bytecode/object_factory_parameters.h diff --git a/src/java_bytecode/remove_exceptions.cpp b/jbmc/src/java_bytecode/remove_exceptions.cpp similarity index 100% rename from src/java_bytecode/remove_exceptions.cpp rename to jbmc/src/java_bytecode/remove_exceptions.cpp diff --git a/src/java_bytecode/remove_exceptions.h b/jbmc/src/java_bytecode/remove_exceptions.h similarity index 100% rename from src/java_bytecode/remove_exceptions.h rename to jbmc/src/java_bytecode/remove_exceptions.h diff --git a/src/java_bytecode/remove_instanceof.cpp b/jbmc/src/java_bytecode/remove_instanceof.cpp similarity index 100% rename from src/java_bytecode/remove_instanceof.cpp rename to jbmc/src/java_bytecode/remove_instanceof.cpp diff --git a/src/java_bytecode/remove_instanceof.h b/jbmc/src/java_bytecode/remove_instanceof.h similarity index 100% rename from src/java_bytecode/remove_instanceof.h rename to jbmc/src/java_bytecode/remove_instanceof.h diff --git a/src/java_bytecode/remove_java_new.cpp b/jbmc/src/java_bytecode/remove_java_new.cpp similarity index 100% rename from src/java_bytecode/remove_java_new.cpp rename to jbmc/src/java_bytecode/remove_java_new.cpp diff --git a/src/java_bytecode/remove_java_new.h b/jbmc/src/java_bytecode/remove_java_new.h similarity index 100% rename from src/java_bytecode/remove_java_new.h rename to jbmc/src/java_bytecode/remove_java_new.h diff --git a/src/java_bytecode/replace_java_nondet.cpp b/jbmc/src/java_bytecode/replace_java_nondet.cpp similarity index 100% rename from src/java_bytecode/replace_java_nondet.cpp rename to jbmc/src/java_bytecode/replace_java_nondet.cpp diff --git a/src/java_bytecode/replace_java_nondet.h b/jbmc/src/java_bytecode/replace_java_nondet.h similarity index 100% rename from src/java_bytecode/replace_java_nondet.h rename to jbmc/src/java_bytecode/replace_java_nondet.h diff --git a/src/java_bytecode/select_pointer_type.cpp b/jbmc/src/java_bytecode/select_pointer_type.cpp similarity index 100% rename from src/java_bytecode/select_pointer_type.cpp rename to jbmc/src/java_bytecode/select_pointer_type.cpp diff --git a/src/java_bytecode/select_pointer_type.h b/jbmc/src/java_bytecode/select_pointer_type.h similarity index 100% rename from src/java_bytecode/select_pointer_type.h rename to jbmc/src/java_bytecode/select_pointer_type.h diff --git a/src/java_bytecode/simple_method_stubbing.cpp b/jbmc/src/java_bytecode/simple_method_stubbing.cpp similarity index 100% rename from src/java_bytecode/simple_method_stubbing.cpp rename to jbmc/src/java_bytecode/simple_method_stubbing.cpp diff --git a/src/java_bytecode/simple_method_stubbing.h b/jbmc/src/java_bytecode/simple_method_stubbing.h similarity index 100% rename from src/java_bytecode/simple_method_stubbing.h rename to jbmc/src/java_bytecode/simple_method_stubbing.h diff --git a/src/java_bytecode/synthetic_methods_map.h b/jbmc/src/java_bytecode/synthetic_methods_map.h similarity index 100% rename from src/java_bytecode/synthetic_methods_map.h rename to jbmc/src/java_bytecode/synthetic_methods_map.h diff --git a/src/jbmc/CMakeLists.txt b/jbmc/src/jbmc/CMakeLists.txt similarity index 84% rename from src/jbmc/CMakeLists.txt rename to jbmc/src/jbmc/CMakeLists.txt index 4d29e360ad4..7015ae0fdbe 100644 --- a/src/jbmc/CMakeLists.txt +++ b/jbmc/src/jbmc/CMakeLists.txt @@ -10,10 +10,8 @@ generic_includes(jbmc-lib) target_link_libraries(jbmc-lib analyses ansi-c - assembler big-int cbmc-lib - cpp goto-instrument-lib goto-programs goto-symex @@ -21,15 +19,13 @@ target_link_libraries(jbmc-lib json langapi linking + miniz pointer-analysis solvers util xml ) -add_if_library(jbmc-lib bv_refinement) -add_if_library(jbmc-lib jsil) - # Executable add_executable(jbmc jbmc_main.cpp) target_link_libraries(jbmc jbmc-lib) diff --git a/jbmc/src/jbmc/Makefile b/jbmc/src/jbmc/Makefile new file mode 100644 index 00000000000..ab8c2c962aa --- /dev/null +++ b/jbmc/src/jbmc/Makefile @@ -0,0 +1,74 @@ +SRC = jbmc_main.cpp \ + jbmc_parse_options.cpp \ + # Empty last line + +OBJ += ../$(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \ + ../java_bytecode/java_bytecode$(LIBEXT) \ + ../$(CPROVER_DIR)/src/linking/linking$(LIBEXT) \ + ../$(CPROVER_DIR)/src/big-int/big-int$(LIBEXT) \ + ../$(CPROVER_DIR)/src/goto-programs/goto-programs$(LIBEXT) \ + ../$(CPROVER_DIR)/src/goto-symex/goto-symex$(LIBEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/value_set$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/value_set_analysis_fi$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/value_set_domain_fi$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/value_set_fi$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/value_set_dereference$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/dereference_callback$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/add_failed_symbols$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/rewrite_index$(OBJEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/goto_program_dereference$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/full_slicer$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/reachability_slicer$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/nondet_static$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_basic_blocks$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_filter$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_branch$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_condition$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_decision$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_location$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_mcdc$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_other$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_util$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/unwindset$(OBJEXT) \ + ../$(CPROVER_DIR)/src/analyses/analyses$(LIBEXT) \ + ../$(CPROVER_DIR)/src/langapi/langapi$(LIBEXT) \ + ../$(CPROVER_DIR)/src/xmllang/xmllang$(LIBEXT) \ + ../$(CPROVER_DIR)/src/solvers/solvers$(LIBEXT) \ + ../$(CPROVER_DIR)/src/util/util$(LIBEXT) \ + ../miniz/miniz$(OBJEXT) \ + ../$(CPROVER_DIR)/src/json/json$(LIBEXT) \ + ../$(CPROVER_DIR)/src/cbmc/all_properties$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/bmc$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/bmc_cover$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/bv_cbmc$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/cbmc_dimacs$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/cbmc_solvers$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/counterexample_beautification$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/fault_localization$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/show_vcc$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/symex_bmc$(OBJEXT) \ + ../$(CPROVER_DIR)/src/cbmc/symex_coverage$(OBJEXT) \ + # Empty last line + +INCLUDES= -I .. -I ../$(CPROVER_DIR)/src + +LIBS = + +include ../config.inc +include ../$(CPROVER_DIR)/src/config.inc +include ../$(CPROVER_DIR)/src/common + +CLEANFILES = jbmc$(EXEEXT) + +all: jbmc$(EXEEXT) + +############################################################################### + +jbmc$(EXEEXT): $(OBJ) + $(LINKBIN) + +.PHONY: jbmc-mac-signed + +jbmc-mac-signed: jbmc$(EXEEXT) + strip jbmc$(EXEEXT) ; codesign -v -s $(OSX_IDENTITY) jbmc$(EXEEXT) diff --git a/src/jbmc/README.md b/jbmc/src/jbmc/README.md similarity index 100% rename from src/jbmc/README.md rename to jbmc/src/jbmc/README.md diff --git a/src/jbmc/jbmc_main.cpp b/jbmc/src/jbmc/jbmc_main.cpp similarity index 100% rename from src/jbmc/jbmc_main.cpp rename to jbmc/src/jbmc/jbmc_main.cpp diff --git a/src/jbmc/jbmc_parse_options.cpp b/jbmc/src/jbmc/jbmc_parse_options.cpp similarity index 100% rename from src/jbmc/jbmc_parse_options.cpp rename to jbmc/src/jbmc/jbmc_parse_options.cpp diff --git a/src/jbmc/jbmc_parse_options.h b/jbmc/src/jbmc/jbmc_parse_options.h similarity index 100% rename from src/jbmc/jbmc_parse_options.h rename to jbmc/src/jbmc/jbmc_parse_options.h diff --git a/src/miniz/CMakeLists.txt b/jbmc/src/miniz/CMakeLists.txt similarity index 100% rename from src/miniz/CMakeLists.txt rename to jbmc/src/miniz/CMakeLists.txt diff --git a/src/miniz/Makefile b/jbmc/src/miniz/Makefile similarity index 72% rename from src/miniz/Makefile rename to jbmc/src/miniz/Makefile index 77258d1f6bc..08e2c53460b 100644 --- a/src/miniz/Makefile +++ b/jbmc/src/miniz/Makefile @@ -1,9 +1,11 @@ SRC = miniz.cpp \ # Empty last line + INCLUDES= -I .. include ../config.inc -include ../common +include ../$(CPROVER_DIR)/src/config.inc +include ../$(CPROVER_DIR)/src/common CLEANFILES = miniz$(OBJEXT) diff --git a/src/miniz/README.md b/jbmc/src/miniz/README.md similarity index 100% rename from src/miniz/README.md rename to jbmc/src/miniz/README.md diff --git a/src/miniz/miniz.cpp b/jbmc/src/miniz/miniz.cpp similarity index 100% rename from src/miniz/miniz.cpp rename to jbmc/src/miniz/miniz.cpp diff --git a/src/miniz/miniz.h b/jbmc/src/miniz/miniz.h similarity index 100% rename from src/miniz/miniz.h rename to jbmc/src/miniz/miniz.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11e3ee8c531..8c07a24b125 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,12 +96,9 @@ add_subdirectory(pointer-analysis) add_subdirectory(solvers) add_subdirectory(util) add_subdirectory(xmllang) -add_subdirectory(java_bytecode) -add_subdirectory(miniz) add_subdirectory(clobber) add_subdirectory(cbmc) -add_subdirectory(jbmc) add_subdirectory(goto-cc) add_subdirectory(goto-instrument) add_subdirectory(goto-analyzer) diff --git a/src/Makefile b/src/Makefile index d28a2bdc976..5444dbcae7b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,11 +1,33 @@ -DIRS = ansi-c big-int cbmc jbmc cpp goto-cc goto-instrument goto-programs \ - goto-symex langapi pointer-analysis solvers util linking xmllang \ - assembler analyses java_bytecode \ - json goto-analyzer jsil goto-diff clobber \ - memory-models miniz - -all: cbmc.dir jbmc.dir goto-cc.dir goto-instrument.dir \ - goto-analyzer.dir goto-diff.dir +DIRS = analyses \ + ansi-c \ + assembler \ + big-int \ + cbmc \ + clobber \ + cpp \ + goto-analyzer \ + goto-cc \ + goto-diff \ + goto-instrument \ + goto-programs \ + goto-symex \ + jsil \ + json \ + langapi \ + linking \ + memory-models \ + pointer-analysis \ + solvers \ + util \ + xmllang \ + # Empty last line + +all: cbmc.dir \ + goto-analyzer.dir \ + goto-cc.dir \ + goto-diff.dir \ + goto-instrument.dir \ + # Empty last line ############################################################################### @@ -19,10 +41,8 @@ $(patsubst %, %.dir, $(filter-out big-int util, $(DIRS))): util.dir cpp.dir: ansi-c.dir linking.dir -java_bytecode.dir: miniz.dir - languages: util.dir langapi.dir \ - cpp.dir ansi-c.dir xmllang.dir assembler.dir java_bytecode.dir \ + cpp.dir ansi-c.dir xmllang.dir assembler.dir \ jsil.dir solvers.dir: util.dir langapi.dir @@ -35,8 +55,6 @@ cbmc.dir: languages solvers.dir goto-symex.dir analyses.dir \ pointer-analysis.dir goto-programs.dir linking.dir \ goto-instrument.dir -jbmc.dir: java_bytecode.dir cbmc.dir - goto-analyzer.dir: languages analyses.dir goto-programs.dir linking.dir \ json.dir goto-instrument.dir @@ -88,14 +106,6 @@ glucose-download: @(cd ../glucose-syrup; patch -p1 < ../scripts/glucose-syrup-patch) @rm glucose-syrup.tgz -cprover-jar-build: - @echo "Building org.cprover.jar" - @(cd java_bytecode/library/; \ - mkdir -p target; \ - javac -d target/ `find src/ -name "*.java"`; \ - cd target; jar cf org.cprover.jar `find . -name "*.class"`; \ - mv org.cprover.jar ../../../) - ipasir-download: # get the 2016 version of the ipasir package, which contains a few solvers @echo "Download ipasir 2016 package" @@ -121,4 +131,4 @@ cadical-download: doc : doxygen -.PHONY: ipasir-build minisat2-download glucose-download cprover-jar-build +.PHONY: ipasir-build minisat2-download glucose-download diff --git a/src/clobber/Makefile b/src/clobber/Makefile index 4f9562e354b..459cae23cd9 100644 --- a/src/clobber/Makefile +++ b/src/clobber/Makefile @@ -17,7 +17,7 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../pointer-analysis/dereference$(OBJEXT) \ ../goto-instrument/dump_c$(OBJEXT) \ ../goto-instrument/goto_program2code$(OBJEXT) \ - ../miniz/miniz$(OBJEXT) + # Empty last line INCLUDES= -I .. diff --git a/src/clobber/clobber_parse_options.cpp b/src/clobber/clobber_parse_options.cpp index 42693cb16cb..fa21fa905c2 100644 --- a/src/clobber/clobber_parse_options.cpp +++ b/src/clobber/clobber_parse_options.cpp @@ -415,8 +415,6 @@ void clobber_parse_optionst::help() " --round-to-minus-inf IEEE floating point rounding mode\n" " --round-to-zero IEEE floating point rounding mode\n" "\n" - JAVA_BYTECODE_LANGUAGE_OPTIONS_HELP - "\n" "Program instrumentation options:\n" HELP_GOTO_CHECK " --show-properties show the properties\n" diff --git a/src/clobber/clobber_parse_options.h b/src/clobber/clobber_parse_options.h index 2cbdd3c5523..5dd3fc12b84 100644 --- a/src/clobber/clobber_parse_options.h +++ b/src/clobber/clobber_parse_options.h @@ -21,8 +21,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include - class goto_functionst; class optionst; @@ -38,7 +36,6 @@ class optionst; "(string-abstraction)" \ "(show-locs)(show-vcc)(show-trace)" \ "(property):" \ - JAVA_BYTECODE_LANGUAGE_OPTIONS // clang-format on class clobber_parse_optionst: diff --git a/src/goto-analyzer/Makefile b/src/goto-analyzer/Makefile index 1be5be97dc7..2d4a9d99785 100644 --- a/src/goto-analyzer/Makefile +++ b/src/goto-analyzer/Makefile @@ -10,7 +10,6 @@ SRC = goto_analyzer_main.cpp \ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../cpp/cpp$(LIBEXT) \ - ../java_bytecode/java_bytecode$(LIBEXT) \ ../linking/linking$(LIBEXT) \ ../big-int/big-int$(LIBEXT) \ ../goto-programs/goto-programs$(LIBEXT) \ @@ -20,7 +19,7 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../json/json$(LIBEXT) \ ../assembler/assembler$(LIBEXT) \ ../util/util$(LIBEXT) \ - ../miniz/miniz$(OBJEXT) + # Empty last line INCLUDES= -I .. diff --git a/src/goto-analyzer/goto_analyzer_parse_options.cpp b/src/goto-analyzer/goto_analyzer_parse_options.cpp index 296d3965782..5758a5e4523 100644 --- a/src/goto-analyzer/goto_analyzer_parse_options.cpp +++ b/src/goto-analyzer/goto_analyzer_parse_options.cpp @@ -18,7 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include #include #include @@ -43,9 +42,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include -#include - #include #include @@ -77,7 +73,6 @@ void goto_analyzer_parse_optionst::register_languages() { register_language(new_ansi_c_language); register_language(new_cpp_language); - register_language(new_java_bytecode_language); register_language(new_jsil_language); } @@ -751,13 +746,6 @@ bool goto_analyzer_parse_optionst::process_goto_program( status() << "Removing function pointers and virtual functions" << eom; remove_function_pointers( get_message_handler(), goto_model, cmdline.isset("pointer-check")); - // Java virtual functions -> explicit dispatch tables: - remove_virtual_functions(goto_model); - // remove Java throw and catch - // This introduces instanceof, so order is important: - remove_exceptions(goto_model); - // remove rtti - remove_instanceof(goto_model); // do partial inlining status() << "Partial Inlining" << eom; @@ -891,10 +879,6 @@ void goto_analyzer_parse_optionst::help() #endif " --no-library disable built-in abstract C library\n" "\n" - "Java Bytecode frontend options:\n" - " --classpath dir/jar set the classpath\n" - " --main-class class-name set the name of the main class\n" - JAVA_BYTECODE_LANGUAGE_OPTIONS_HELP HELP_FUNCTIONS "\n" "Program representations:\n" diff --git a/src/goto-analyzer/goto_analyzer_parse_options.h b/src/goto-analyzer/goto_analyzer_parse_options.h index f4cc5447f12..1ec346ffa36 100644 --- a/src/goto-analyzer/goto_analyzer_parse_options.h +++ b/src/goto-analyzer/goto_analyzer_parse_options.h @@ -114,8 +114,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include - class bmct; class goto_functionst; class optionst; @@ -150,7 +148,6 @@ class optionst; "(show)(verify)(simplify):" \ "(location-sensitive)(concurrent)" \ "(no-simplify-slicing)" \ - JAVA_BYTECODE_LANGUAGE_OPTIONS // clang-format on class goto_analyzer_parse_optionst: diff --git a/src/goto-cc/CMakeLists.txt b/src/goto-cc/CMakeLists.txt index 75b8a7f860c..bd281a73c93 100644 --- a/src/goto-cc/CMakeLists.txt +++ b/src/goto-cc/CMakeLists.txt @@ -11,6 +11,7 @@ target_link_libraries(goto-cc-lib big-int goto-programs util + json linking ansi-c cpp diff --git a/src/goto-cc/Makefile b/src/goto-cc/Makefile index 6874910fbcc..7263f1b62d4 100644 --- a/src/goto-cc/Makefile +++ b/src/goto-cc/Makefile @@ -27,7 +27,6 @@ OBJ += ../big-int/big-int$(LIBEXT) \ ../xmllang/xmllang$(LIBEXT) \ ../assembler/assembler$(LIBEXT) \ ../langapi/langapi$(LIBEXT) \ - ../miniz/miniz$(OBJEXT) \ ../json/json$(LIBEXT) INCLUDES= -I .. diff --git a/src/goto-diff/Makefile b/src/goto-diff/Makefile index 648aa90b9a2..167eef00160 100644 --- a/src/goto-diff/Makefile +++ b/src/goto-diff/Makefile @@ -9,7 +9,6 @@ SRC = change_impact.cpp \ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../cpp/cpp$(LIBEXT) \ - ../java_bytecode/java_bytecode$(LIBEXT) \ ../linking/linking$(LIBEXT) \ ../big-int/big-int$(LIBEXT) \ ../goto-programs/goto-programs$(LIBEXT) \ @@ -31,8 +30,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../xmllang/xmllang$(LIBEXT) \ ../util/util$(LIBEXT) \ ../solvers/solvers$(LIBEXT) \ - ../miniz/miniz$(OBJEXT) \ - ../json/json$(LIBEXT) + ../json/json$(LIBEXT) \ + # Empty last line INCLUDES= -I .. diff --git a/src/goto-diff/goto_diff_languages.cpp b/src/goto-diff/goto_diff_languages.cpp index 814ef326488..ecec4354e12 100644 --- a/src/goto-diff/goto_diff_languages.cpp +++ b/src/goto-diff/goto_diff_languages.cpp @@ -16,11 +16,8 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include - void goto_diff_languagest::register_languages() { register_language(new_ansi_c_language); register_language(new_cpp_language); - register_language(new_java_bytecode_language); } diff --git a/src/goto-diff/goto_diff_parse_options.cpp b/src/goto-diff/goto_diff_parse_options.cpp index e32b36ae50b..e181d1f72b3 100644 --- a/src/goto-diff/goto_diff_parse_options.cpp +++ b/src/goto-diff/goto_diff_parse_options.cpp @@ -51,10 +51,6 @@ Author: Peter Schrammel #include -#include -#include -#include - #include #include @@ -420,13 +416,6 @@ bool goto_diff_parse_optionst::process_goto_program( remove_function_pointers( get_message_handler(), goto_model, cmdline.isset("pointer-check")); - // Java virtual functions -> explicit dispatch tables: - remove_virtual_functions(goto_model); - // remove catch and throw - remove_exceptions(goto_model); - // Java instanceof -> clsid comparison: - remove_instanceof(goto_model); - mm_io(goto_model); // instrument library preconditions @@ -532,8 +521,6 @@ void goto_diff_parse_optionst::help() "Program instrumentation options:\n" HELP_GOTO_CHECK " --cover CC create test-suite with coverage criterion CC\n" // NOLINT(*) - "Java Bytecode frontend options:\n" - JAVA_BYTECODE_LANGUAGE_OPTIONS_HELP "Other options:\n" " --version show version and exit\n" " --json-ui use JSON-formatted output\n" diff --git a/src/goto-instrument/Makefile b/src/goto-instrument/Makefile index 126151d9c03..eb67f14f140 100644 --- a/src/goto-instrument/Makefile +++ b/src/goto-instrument/Makefile @@ -87,8 +87,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../xmllang/xmllang$(LIBEXT) \ ../util/util$(LIBEXT) \ ../solvers/solvers$(LIBEXT) \ - ../miniz/miniz$(OBJEXT) \ - ../json/json$(LIBEXT) + ../json/json$(LIBEXT) \ + # Empty last line INCLUDES= -I .. diff --git a/src/jbmc/Makefile b/src/jbmc/Makefile deleted file mode 100644 index 6bdc5ad2685..00000000000 --- a/src/jbmc/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -SRC = jbmc_main.cpp \ - jbmc_parse_options.cpp \ - # Empty last line - -OBJ += ../ansi-c/ansi-c$(LIBEXT) \ - ../java_bytecode/java_bytecode$(LIBEXT) \ - ../linking/linking$(LIBEXT) \ - ../big-int/big-int$(LIBEXT) \ - ../goto-programs/goto-programs$(LIBEXT) \ - ../goto-symex/goto-symex$(LIBEXT) \ - ../pointer-analysis/value_set$(OBJEXT) \ - ../pointer-analysis/value_set_analysis_fi$(OBJEXT) \ - ../pointer-analysis/value_set_domain_fi$(OBJEXT) \ - ../pointer-analysis/value_set_fi$(OBJEXT) \ - ../pointer-analysis/value_set_dereference$(OBJEXT) \ - ../pointer-analysis/dereference_callback$(OBJEXT) \ - ../pointer-analysis/add_failed_symbols$(OBJEXT) \ - ../pointer-analysis/rewrite_index$(OBJEXT) \ - ../pointer-analysis/goto_program_dereference$(OBJEXT) \ - ../goto-instrument/cover$(OBJEXT) \ - ../goto-instrument/cover_basic_blocks$(OBJEXT) \ - ../goto-instrument/cover_filter$(OBJEXT) \ - ../goto-instrument/cover_instrument_branch$(OBJEXT) \ - ../goto-instrument/cover_instrument_condition$(OBJEXT) \ - ../goto-instrument/cover_instrument_decision$(OBJEXT) \ - ../goto-instrument/cover_instrument_location$(OBJEXT) \ - ../goto-instrument/cover_instrument_mcdc$(OBJEXT) \ - ../goto-instrument/cover_instrument_other$(OBJEXT) \ - ../goto-instrument/cover_util$(OBJEXT) \ - ../goto-instrument/full_slicer$(OBJEXT) \ - ../goto-instrument/nondet_static$(OBJEXT) \ - ../goto-instrument/reachability_slicer$(OBJEXT) \ - ../goto-instrument/unwindset$(OBJEXT) \ - ../analyses/analyses$(LIBEXT) \ - ../langapi/langapi$(LIBEXT) \ - ../xmllang/xmllang$(LIBEXT) \ - ../assembler/assembler$(LIBEXT) \ - ../solvers/solvers$(LIBEXT) \ - ../util/util$(LIBEXT) \ - ../miniz/miniz$(OBJEXT) \ - ../json/json$(LIBEXT) \ - ../cbmc/all_properties$(OBJEXT) \ - ../cbmc/bmc$(OBJEXT) \ - ../cbmc/bmc_cover$(OBJEXT) \ - ../cbmc/bv_cbmc$(OBJEXT) \ - ../cbmc/cbmc_dimacs$(OBJEXT) \ - ../cbmc/cbmc_solvers$(OBJEXT) \ - ../cbmc/counterexample_beautification$(OBJEXT) \ - ../cbmc/fault_localization$(OBJEXT) \ - ../cbmc/show_vcc$(OBJEXT) \ - ../cbmc/symex_bmc$(OBJEXT) \ - ../cbmc/symex_coverage$(OBJEXT) \ - # Empty last line - -INCLUDES= -I .. - -LIBS = - -include ../config.inc -include ../common - -CLEANFILES = jbmc$(EXEEXT) - -all: jbmc$(EXEEXT) - -############################################################################### - -jbmc$(EXEEXT): $(OBJ) - $(LINKBIN) - -.PHONY: jbmc-mac-signed - -jbmc-mac-signed: jbmc$(EXEEXT) - strip jbmc$(EXEEXT) ; codesign -v -s $(OSX_IDENTITY) jbmc$(EXEEXT) diff --git a/unit/Makefile b/unit/Makefile index 9f8336b036c..26419273570 100644 --- a/unit/Makefile +++ b/unit/Makefile @@ -103,7 +103,6 @@ BMC_DEPS =../src/cbmc/all_properties$(OBJEXT) \ # Empty last line # CPROVER_LIBS =../src/java_bytecode/java_bytecode$(LIBEXT) \ - ../src/miniz/miniz$(OBJEXT) \ ../src/ansi-c/ansi-c$(LIBEXT) \ ../src/cpp/cpp$(LIBEXT) \ ../src/json/json$(LIBEXT) \ diff --git a/unit/testing-utils/load_java_class.h b/unit/testing-utils/load_java_class.h index 0a29a2304aa..a8d19f3ba8f 100644 --- a/unit/testing-utils/load_java_class.h +++ b/unit/testing-utils/load_java_class.h @@ -10,8 +10,8 @@ /// Utility for loading and parsing a specified java class file, returning /// the symbol table generated by this. -#ifndef CPROVER_TESTING_UTILS_LOAD_JAVA_CLASS_H -#define CPROVER_TESTING_UTILS_LOAD_JAVA_CLASS_H +#ifndef CPROVER_JAVA_TESTING_UTILS_LOAD_JAVA_CLASS_H +#define CPROVER_JAVA_TESTING_UTILS_LOAD_JAVA_CLASS_H #include @@ -43,4 +43,4 @@ symbol_tablet load_java_class_lazy( const std::string &class_path, const std::string &main); -#endif // CPROVER_TESTING_UTILS_LOAD_JAVA_CLASS_H +#endif // CPROVER_JAVA_TESTING_UTILS_LOAD_JAVA_CLASS_H diff --git a/unit/testing-utils/require_goto_statements.h b/unit/testing-utils/require_goto_statements.h index c8bc8ca40ff..7feb210a7ff 100644 --- a/unit/testing-utils/require_goto_statements.h +++ b/unit/testing-utils/require_goto_statements.h @@ -18,8 +18,8 @@ #include -#ifndef CPROVER_TESTING_UTILS_REQUIRE_GOTO_STATEMENTS_H -#define CPROVER_TESTING_UTILS_REQUIRE_GOTO_STATEMENTS_H +#ifndef CPROVER_JAVA_TESTING_UTILS_REQUIRE_GOTO_STATEMENTS_H +#define CPROVER_JAVA_TESTING_UTILS_REQUIRE_GOTO_STATEMENTS_H // NOLINTNEXTLINE(readability/namespace) namespace require_goto_statements @@ -101,4 +101,4 @@ std::vector find_function_calls( const irep_idt &function_call_identifier); } -#endif // CPROVER_TESTING_UTILS_REQUIRE_GOTO_STATEMENTS_H +#endif // CPROVER_JAVA_TESTING_UTILS_REQUIRE_GOTO_STATEMENTS_H diff --git a/unit/testing-utils/require_parse_tree.h b/unit/testing-utils/require_parse_tree.h index adda800c122..589c8d9ad8a 100644 --- a/unit/testing-utils/require_parse_tree.h +++ b/unit/testing-utils/require_parse_tree.h @@ -9,8 +9,8 @@ /// \file /// Utilties for inspecting java_parse_treet -#ifndef CPROVER_TESTING_UTILS_REQUIRE_PARSE_TREE_H -#define CPROVER_TESTING_UTILS_REQUIRE_PARSE_TREE_H +#ifndef CPROVER_JAVA_TESTING_UTILS_REQUIRE_PARSE_TREE_H +#define CPROVER_JAVA_TESTING_UTILS_REQUIRE_PARSE_TREE_H #include #include "catch.hpp" @@ -57,4 +57,4 @@ void require_instructions_match_expectation( const java_bytecode_parse_treet::methodt::instructionst instructions); } -#endif //CPROVER_TESTING_UTILS_REQUIRE_PARSE_TREE_H +#endif // CPROVER_JAVA_TESTING_UTILS_REQUIRE_PARSE_TREE_H diff --git a/unit/testing-utils/require_type.h b/unit/testing-utils/require_type.h index 204c6f5c2fb..3e59da59e72 100644 --- a/unit/testing-utils/require_type.h +++ b/unit/testing-utils/require_type.h @@ -12,8 +12,8 @@ /// Also checks associated properties and returns a casted version of the /// expression. -#ifndef CPROVER_TESTING_UTILS_REQUIRE_TYPE_H -#define CPROVER_TESTING_UTILS_REQUIRE_TYPE_H +#ifndef CPROVER_JAVA_TESTING_UTILS_REQUIRE_TYPE_H +#define CPROVER_JAVA_TESTING_UTILS_REQUIRE_TYPE_H #include #include @@ -124,4 +124,4 @@ java_lambda_method_handlest require_lambda_method_handles( const std::vector &expected_identifiers); } -#endif // CPROVER_TESTING_UTILS_REQUIRE_TYPE_H +#endif // CPROVER_JAVA_TESTING_UTILS_REQUIRE_TYPE_H From 45887539d128a42d131c5739cd885b694a70a8d2 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Fri, 18 May 2018 10:46:49 +0100 Subject: [PATCH 04/12] Add JDIFF tool --- CMakeLists.txt | 6 +- jbmc/src/CMakeLists.txt | 1 + jbmc/src/Makefile | 7 +- jbmc/src/jdiff/CMakeLists.txt | 28 ++ jbmc/src/jdiff/Makefile | 56 +++ jbmc/src/jdiff/README.md | 7 + jbmc/src/jdiff/java_syntactic_diff.cpp | 129 +++++++ jbmc/src/jdiff/java_syntactic_diff.h | 32 ++ jbmc/src/jdiff/jdiff_languages.cpp | 21 ++ jbmc/src/jdiff/jdiff_languages.h | 33 ++ jbmc/src/jdiff/jdiff_main.cpp | 47 +++ jbmc/src/jdiff/jdiff_parse_options.cpp | 484 +++++++++++++++++++++++++ jbmc/src/jdiff/jdiff_parse_options.h | 74 ++++ 13 files changed, 919 insertions(+), 6 deletions(-) create mode 100644 jbmc/src/jdiff/CMakeLists.txt create mode 100644 jbmc/src/jdiff/Makefile create mode 100644 jbmc/src/jdiff/README.md create mode 100644 jbmc/src/jdiff/java_syntactic_diff.cpp create mode 100644 jbmc/src/jdiff/java_syntactic_diff.h create mode 100644 jbmc/src/jdiff/jdiff_languages.cpp create mode 100644 jbmc/src/jdiff/jdiff_languages.h create mode 100644 jbmc/src/jdiff/jdiff_main.cpp create mode 100644 jbmc/src/jdiff/jdiff_parse_options.cpp create mode 100644 jbmc/src/jdiff/jdiff_parse_options.h diff --git a/CMakeLists.txt b/CMakeLists.txt index c067b70a29d..b9ef7953509 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,15 +64,11 @@ set_target_properties( goto-instrument-lib goto-programs goto-symex - java_bytecode - jbmc - jbmc-lib jsil json langapi linking miniBDD - miniz mmcc pointer-analysis solvers @@ -85,6 +81,8 @@ set_target_properties( java_bytecode jbmc jbmc-lib + jdiff + jdiff-lib java-testing-utils java-unit miniz diff --git a/jbmc/src/CMakeLists.txt b/jbmc/src/CMakeLists.txt index 71cd2a66f32..a6a2310b716 100644 --- a/jbmc/src/CMakeLists.txt +++ b/jbmc/src/CMakeLists.txt @@ -16,3 +16,4 @@ endmacro(generic_includes) add_subdirectory(miniz) add_subdirectory(java_bytecode) add_subdirectory(jbmc) +add_subdirectory(jdiff) diff --git a/jbmc/src/Makefile b/jbmc/src/Makefile index 3b40d60b8a6..eef6485dc4e 100644 --- a/jbmc/src/Makefile +++ b/jbmc/src/Makefile @@ -1,9 +1,9 @@ -DIRS = jbmc java_bytecode miniz +DIRS = jbmc jdiff java_bytecode miniz include config.inc .PHONY: all -all: jbmc.dir +all: jbmc.dir jdiff.dir # building cbmc proper .PHONY: cprover.dir @@ -16,6 +16,9 @@ java_bytecode.dir: miniz.dir .PHONY: jbmc.dir jbmc.dir: java_bytecode.dir cprover.dir +.PHONY: jdiff.dir +jdiff.dir: java_bytecode.dir cprover.dir + .PHONY: miniz.dir miniz.dir: diff --git a/jbmc/src/jdiff/CMakeLists.txt b/jbmc/src/jdiff/CMakeLists.txt new file mode 100644 index 00000000000..1f1b82e6ad2 --- /dev/null +++ b/jbmc/src/jdiff/CMakeLists.txt @@ -0,0 +1,28 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/jdiff_main.cpp +) +add_library(jdiff-lib ${sources}) + +generic_includes(jdiff-lib) + +target_link_libraries(jdiff-lib + ansi-c + linking + big-int + pointer-analysis + goto-diff-lib + goto-instrument-lib + goto-programs + goto-symex + analyses + java_bytecode + langapi + xml + util +) + +# Executable +add_executable(jdiff jdiff_main.cpp) +target_link_libraries(jdiff jdiff-lib) diff --git a/jbmc/src/jdiff/Makefile b/jbmc/src/jdiff/Makefile new file mode 100644 index 00000000000..83742a846d2 --- /dev/null +++ b/jbmc/src/jdiff/Makefile @@ -0,0 +1,56 @@ +SRC = jdiff_languages.cpp \ + jdiff_main.cpp \ + jdiff_parse_options.cpp \ + java_syntactic_diff.cpp \ + # Empty last line + +OBJ += ../$(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \ + ..//java_bytecode/java_bytecode$(LIBEXT) \ + ../$(CPROVER_DIR)/src/linking/linking$(LIBEXT) \ + ../$(CPROVER_DIR)/src/big-int/big-int$(LIBEXT) \ + ../$(CPROVER_DIR)/src/goto-programs/goto-programs$(LIBEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/pointer-analysis$(LIBEXT) \ + ../$(CPROVER_DIR)/src/goto-diff/syntactic_diff$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-diff/unified_diff$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-diff/change_impact$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-diff/goto_diff_base$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_basic_blocks$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_filter$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_branch$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_condition$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_decision$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_location$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_mcdc$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_instrument_other$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-instrument/cover_util$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-symex/rewrite_union$(OBJEXT) \ + ../$(CPROVER_DIR)/src/analyses/analyses$(LIBEXT) \ + ../$(CPROVER_DIR)/src/langapi/langapi$(LIBEXT) \ + ../$(CPROVER_DIR)/src/xmllang/xmllang$(LIBEXT) \ + ../$(CPROVER_DIR)/src/util/util$(LIBEXT) \ + ../miniz/miniz$(OBJEXT) \ + ../$(CPROVER_DIR)/src/json/json$(LIBEXT) \ + # Empty last line + +INCLUDES= -I .. -I ../$(CPROVER_DIR)/src + +LIBS = + +include ../config.inc +include ../$(CPROVER_DIR)/src/config.inc +include ../$(CPROVER_DIR)/src/common + +CLEANFILES = jdiff$(EXEEXT) + +all: jdiff$(EXEEXT) + +############################################################################### + +jdiff$(EXEEXT): $(OBJ) + $(LINKBIN) + +.PHONY: jdiff-mac-signed + +jdiff-mac-signed: jdiff$(EXEEXT) + strip jdiff$(EXEEXT) ; codesign -v -s $(OSX_IDENTITY) jdiff$(EXEEXT) diff --git a/jbmc/src/jdiff/README.md b/jbmc/src/jdiff/README.md new file mode 100644 index 00000000000..8a4e1a6cabc --- /dev/null +++ b/jbmc/src/jdiff/README.md @@ -0,0 +1,7 @@ +\ingroup module_hidden +\defgroup jdiff jdiff + +# Folder jdiff + +`jdiff/` is a tool that offers functionality similar to the `diff` +tool, but for Java programs. diff --git a/jbmc/src/jdiff/java_syntactic_diff.cpp b/jbmc/src/jdiff/java_syntactic_diff.cpp new file mode 100644 index 00000000000..58af28d4036 --- /dev/null +++ b/jbmc/src/jdiff/java_syntactic_diff.cpp @@ -0,0 +1,129 @@ +/*******************************************************************\ + +Module: Syntactic GOTO-DIFF for Java + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// Syntactic GOTO-DIFF for Java + +#include "java_syntactic_diff.h" + +#include + +bool java_syntactic_difft::operator()() +{ + forall_goto_functions(it, goto_model1.goto_functions) + { + if(!it->second.body_available()) + continue; + + goto_functionst::function_mapt::const_iterator f_it = + goto_model2.goto_functions.function_map.find(it->first); + if( + f_it == goto_model2.goto_functions.function_map.end() || + !f_it->second.body_available()) + { + deleted_functions.insert(it->first); + continue; + } + + // check access qualifiers + const symbolt *fun1 = goto_model1.symbol_table.lookup(it->first); + CHECK_RETURN(fun1 != nullptr); + const symbolt *fun2 = goto_model2.symbol_table.lookup(it->first); + CHECK_RETURN(fun2 != nullptr); + const irep_idt &class_name = fun1->type.get(ID_C_class); + bool function_access_changed = + fun1->type.get(ID_access) != fun2->type.get(ID_access); + bool class_access_changed = false; + bool field_access_changed = false; + if(!class_name.empty()) + { + const symbolt *class1 = goto_model1.symbol_table.lookup(class_name); + CHECK_RETURN(class1 != nullptr); + const symbolt *class2 = goto_model2.symbol_table.lookup(class_name); + CHECK_RETURN(class2 != nullptr); + class_access_changed = + class1->type.get(ID_access) != class2->type.get(ID_access); + const class_typet &class_type1 = to_class_type(class1->type); + const class_typet &class_type2 = to_class_type(class2->type); + for(const auto &field1 : class_type1.components()) + { + for(const auto &field2 : class_type2.components()) + { + if(field1.get_name() == field2.get_name()) + { + field_access_changed = field1.get_access() != field2.get_access(); + break; + } + } + if(field_access_changed) + break; + } + } + if(function_access_changed || class_access_changed || field_access_changed) + { + modified_functions.insert(it->first); + continue; + } + + if( + it->second.body.instructions.size() != + f_it->second.body.instructions.size()) + { + modified_functions.insert(it->first); + continue; + } + + goto_programt::instructionst::const_iterator i_it1 = + it->second.body.instructions.begin(); + for(goto_programt::instructionst::const_iterator + i_it2 = f_it->second.body.instructions.begin(); + i_it1 != it->second.body.instructions.end() && + i_it2 != f_it->second.body.instructions.end(); + ++i_it1, ++i_it2) + { + long jump_difference1 = 0; + if(!i_it1->targets.empty()) + { + jump_difference1 = + i_it1->get_target()->location_number - i_it1->location_number; + } + long jump_difference2 = 0; + if(!i_it2->targets.empty()) + { + jump_difference2 = + i_it2->get_target()->location_number - i_it2->location_number; + } + if( + i_it1->code != i_it2->code || i_it1->function != i_it2->function || + i_it1->type != i_it2->type || i_it1->guard != i_it2->guard || + jump_difference1 != jump_difference2) + { + modified_functions.insert(it->first); + break; + } + } + } + forall_goto_functions(it, goto_model2.goto_functions) + { + if(!it->second.body_available()) + continue; + + total_functions_count++; + + goto_functionst::function_mapt::const_iterator f_it = + goto_model1.goto_functions.function_map.find(it->first); + if( + f_it == goto_model1.goto_functions.function_map.end() || + !f_it->second.body_available()) + new_functions.insert(it->first); + } + + return !( + new_functions.empty() && modified_functions.empty() && + deleted_functions.empty()); +} diff --git a/jbmc/src/jdiff/java_syntactic_diff.h b/jbmc/src/jdiff/java_syntactic_diff.h new file mode 100644 index 00000000000..9d886b447cc --- /dev/null +++ b/jbmc/src/jdiff/java_syntactic_diff.h @@ -0,0 +1,32 @@ +/*******************************************************************\ + +Module: Syntactic GOTO-DIFF for Java + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// Syntactic GOTO-DIFF for Java + +#ifndef CPROVER_JDIFF_JAVA_SYNTACTIC_DIFF_H +#define CPROVER_JDIFF_JAVA_SYNTACTIC_DIFF_H + +#include + +class java_syntactic_difft : public goto_difft +{ +public: + java_syntactic_difft( + const goto_modelt &_goto_model1, + const goto_modelt &_goto_model2, + const optionst &_options, + message_handlert &_message_handler) + : goto_difft(_goto_model1, _goto_model2, _options, _message_handler) + { + } + + virtual bool operator()(); +}; + +#endif // CPROVER_JDIFF_JAVA_SYNTACTIC_DIFF_H diff --git a/jbmc/src/jdiff/jdiff_languages.cpp b/jbmc/src/jdiff/jdiff_languages.cpp new file mode 100644 index 00000000000..7a77f280018 --- /dev/null +++ b/jbmc/src/jdiff/jdiff_languages.cpp @@ -0,0 +1,21 @@ +/*******************************************************************\ + +Module: Language Registration + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// Language Registration + +#include "jdiff_languages.h" + +#include + +#include + +void jdiff_languagest::register_languages() +{ + register_language(new_java_bytecode_language); +} diff --git a/jbmc/src/jdiff/jdiff_languages.h b/jbmc/src/jdiff/jdiff_languages.h new file mode 100644 index 00000000000..6cee4feabc4 --- /dev/null +++ b/jbmc/src/jdiff/jdiff_languages.h @@ -0,0 +1,33 @@ +/*******************************************************************\ + +Module: JDIFF Languages + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// JDIFF Languages + +#ifndef CPROVER_JDIFF_JDIFF_LANGUAGES_H +#define CPROVER_JDIFF_JDIFF_LANGUAGES_H + +#include +#include + +class jdiff_languagest : public language_uit +{ +public: + explicit jdiff_languagest( + const cmdlinet &cmdline, + ui_message_handlert &ui_message_handler) + : language_uit(cmdline, ui_message_handler) + { + register_languages(); + } + +protected: + virtual void register_languages(); +}; + +#endif // CPROVER_JDIFF_JDIFF_LANGUAGES_H diff --git a/jbmc/src/jdiff/jdiff_main.cpp b/jbmc/src/jdiff/jdiff_main.cpp new file mode 100644 index 00000000000..36a078b2a2e --- /dev/null +++ b/jbmc/src/jdiff/jdiff_main.cpp @@ -0,0 +1,47 @@ +/*******************************************************************\ + +Module: JDIFF Main Module + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// JDIFF Main Module + +#include "jdiff_parse_options.h" + +#include + +#ifdef IREP_HASH_STATS +#include +#endif + +#ifdef IREP_HASH_STATS +extern unsigned long long irep_hash_cnt; +extern unsigned long long irep_cmp_cnt; +extern unsigned long long irep_cmp_ne_cnt; +#endif + +#ifdef _MSC_VER +int wmain(int argc, const wchar_t **argv_wide) +{ + auto vec = narrow_argv(argc, argv_wide); + auto narrow = to_c_str_array(std::begin(vec), std::end(vec)); + auto argv = narrow.data(); +#else +int main(int argc, const char **argv) +{ +#endif + jdiff_parse_optionst parse_options(argc, argv); + + int res = parse_options.main(); + +#ifdef IREP_HASH_STATS + std::cout << "IREP_HASH_CNT=" << irep_hash_cnt << '\n'; + std::cout << "IREP_CMP_CNT=" << irep_cmp_cnt << '\n'; + std::cout << "IREP_CMP_NE_CNT=" << irep_cmp_ne_cnt << '\n'; +#endif + + return res; +} diff --git a/jbmc/src/jdiff/jdiff_parse_options.cpp b/jbmc/src/jdiff/jdiff_parse_options.cpp new file mode 100644 index 00000000000..3773dd4dce0 --- /dev/null +++ b/jbmc/src/jdiff/jdiff_parse_options.cpp @@ -0,0 +1,484 @@ +/*******************************************************************\ + +Module: JDIFF Command Line Option Processing + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// JDIFF Command Line Option Processing + +#include "jdiff_parse_options.h" + +#include // exit() +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#include + +#include +#include +#include + +#include + +#include + +#include "java_syntactic_diff.h" +#include +#include +#include + +jdiff_parse_optionst::jdiff_parse_optionst(int argc, const char **argv) + : parse_options_baset(JDIFF_OPTIONS, argc, argv), + jdiff_languagest(cmdline, ui_message_handler), + ui_message_handler(cmdline, "JDIFF " CBMC_VERSION), + languages2(cmdline, ui_message_handler) +{ +} + +::jdiff_parse_optionst::jdiff_parse_optionst( + int argc, + const char **argv, + const std::string &extra_options) + : parse_options_baset(JDIFF_OPTIONS + extra_options, argc, argv), + jdiff_languagest(cmdline, ui_message_handler), + ui_message_handler(cmdline, "JDIFF " CBMC_VERSION), + languages2(cmdline, ui_message_handler) +{ +} + +void jdiff_parse_optionst::eval_verbosity() +{ + // this is our default verbosity + unsigned int v = messaget::M_STATISTICS; + + if(cmdline.isset("verbosity")) + { + v = unsafe_string2unsigned(cmdline.get_value("verbosity")); + if(v > 10) + v = 10; + } + + ui_message_handler.set_verbosity(v); +} + +void jdiff_parse_optionst::get_command_line_options(optionst &options) +{ + if(config.set(cmdline)) + { + usage_error(); + exit(1); + } + + if(cmdline.isset("cover")) + parse_cover_options(cmdline, options); + + if(cmdline.isset("mm")) + options.set_option("mm", cmdline.get_value("mm")); + + // all checks supported by goto_check + PARSE_OPTIONS_GOTO_CHECK(cmdline, options); + + if(cmdline.isset("debug-level")) + options.set_option("debug-level", cmdline.get_value("debug-level")); + + if(cmdline.isset("slice-by-trace")) + options.set_option("slice-by-trace", cmdline.get_value("slice-by-trace")); + + if(cmdline.isset("unwindset")) + options.set_option("unwindset", cmdline.get_value("unwindset")); + + // constant propagation + if(cmdline.isset("no-propagation")) + options.set_option("propagation", false); + else + options.set_option("propagation", true); + + // check array bounds + if(cmdline.isset("bounds-check")) + options.set_option("bounds-check", true); + else + options.set_option("bounds-check", false); + + // check division by zero + if(cmdline.isset("div-by-zero-check")) + options.set_option("div-by-zero-check", true); + else + options.set_option("div-by-zero-check", false); + + // check overflow/underflow + if(cmdline.isset("signed-overflow-check")) + options.set_option("signed-overflow-check", true); + else + options.set_option("signed-overflow-check", false); + + // check overflow/underflow + if(cmdline.isset("unsigned-overflow-check")) + options.set_option("unsigned-overflow-check", true); + else + options.set_option("unsigned-overflow-check", false); + + // check overflow/underflow + if(cmdline.isset("float-overflow-check")) + options.set_option("float-overflow-check", true); + else + options.set_option("float-overflow-check", false); + + // check for NaN (not a number) + if(cmdline.isset("nan-check")) + options.set_option("nan-check", true); + else + options.set_option("nan-check", false); + + // check pointers + if(cmdline.isset("pointer-check")) + options.set_option("pointer-check", true); + else + options.set_option("pointer-check", false); + + // check for memory leaks + if(cmdline.isset("memory-leak-check")) + options.set_option("memory-leak-check", true); + else + options.set_option("memory-leak-check", false); + + // check assertions + if(cmdline.isset("no-assertions")) + options.set_option("assertions", false); + else + options.set_option("assertions", true); + + // use assumptions + if(cmdline.isset("no-assumptions")) + options.set_option("assumptions", false); + else + options.set_option("assumptions", true); + + // magic error label + if(cmdline.isset("error-label")) + options.set_option("error-label", cmdline.get_values("error-label")); + + options.set_option("show-properties", cmdline.isset("show-properties")); +} + +/// invoke main modules +int jdiff_parse_optionst::doit() +{ + if(cmdline.isset("version")) + { + std::cout << CBMC_VERSION << '\n'; + return CPROVER_EXIT_SUCCESS; + } + + // + // command line options + // + + optionst options; + get_command_line_options(options); + eval_verbosity(); + + // + // Print a banner + // + status() << "JDIFF version " CBMC_VERSION " " << sizeof(void *) * 8 << "-bit " + << config.this_architecture() << " " + << config.this_operating_system() << eom; + + if(cmdline.args.size() != 2) + { + error() << "Please provide two programs to compare" << eom; + return CPROVER_EXIT_INCORRECT_TASK; + } + + goto_modelt goto_model1, goto_model2; + + int get_goto_program_ret = get_goto_program(options, *this, goto_model1); + if(get_goto_program_ret != -1) + return get_goto_program_ret; + get_goto_program_ret = get_goto_program(options, languages2, goto_model2); + if(get_goto_program_ret != -1) + return get_goto_program_ret; + + if(cmdline.isset("show-loops")) + { + show_loop_ids(get_ui(), goto_model1); + show_loop_ids(get_ui(), goto_model2); + return CPROVER_EXIT_SUCCESS; + } + + if( + cmdline.isset("show-goto-functions") || + cmdline.isset("list-goto-functions")) + { + show_goto_functions( + goto_model1, + get_message_handler(), + ui_message_handler.get_ui(), + cmdline.isset("list-goto-functions")); + show_goto_functions( + goto_model2, + get_message_handler(), + ui_message_handler.get_ui(), + cmdline.isset("list-goto-functions")); + return CPROVER_EXIT_SUCCESS; + } + + if( + cmdline.isset("change-impact") || cmdline.isset("forward-impact") || + cmdline.isset("backward-impact")) + { + impact_modet impact_mode = + cmdline.isset("forward-impact") + ? impact_modet::FORWARD + : (cmdline.isset("backward-impact") ? impact_modet::BACKWARD + : impact_modet::BOTH); + change_impact( + goto_model1, goto_model2, impact_mode, cmdline.isset("compact-output")); + + return CPROVER_EXIT_SUCCESS; + } + + if(cmdline.isset("unified") || cmdline.isset('u')) + { + unified_difft u(goto_model1, goto_model2); + u(); + u.output(std::cout); + + return CPROVER_EXIT_SUCCESS; + } + + java_syntactic_difft sd( + goto_model1, goto_model2, options, get_message_handler()); + sd.set_ui(get_ui()); + sd(); + sd.output_functions(); + + return CPROVER_EXIT_SUCCESS; +} + +int jdiff_parse_optionst::get_goto_program( + const optionst &options, + jdiff_languagest &languages, + goto_modelt &goto_model) +{ + status() << "Reading program from `" << cmdline.args[0] << "'" << eom; + + if(is_goto_binary(cmdline.args[0])) + { + if(read_goto_binary( + cmdline.args[0], + goto_model.symbol_table, + goto_model.goto_functions, + languages.get_message_handler())) + return CPROVER_EXIT_INCORRECT_TASK; + + config.set(cmdline); + + // This one is done. + cmdline.args.erase(cmdline.args.begin()); + } + else + { + // This is a a workaround to make parse() think that there is only + // one source file. + std::string arg2(""); + if(cmdline.args.size() == 2) + { + arg2 = cmdline.args[1]; + cmdline.args.erase(--cmdline.args.end()); + } + + if(languages.parse() || languages.typecheck() || languages.final()) + return CPROVER_EXIT_INCORRECT_TASK; + + // we no longer need any parse trees or language files + languages.clear_parse(); + + status() << "Generating GOTO Program" << eom; + + goto_model.symbol_table = languages.symbol_table; + goto_convert( + goto_model.symbol_table, goto_model.goto_functions, ui_message_handler); + + if(process_goto_program(options, goto_model)) + return CPROVER_EXIT_INTERNAL_ERROR; + + // if we had a second argument then we will handle it next + if(arg2 != "") + cmdline.args[0] = arg2; + } + + return -1; // no error, continue +} + +bool jdiff_parse_optionst::process_goto_program( + const optionst &options, + goto_modelt &goto_model) +{ + try + { + // add the library + link_to_library(goto_model, get_message_handler()); + + // remove function pointers + status() << "Removal of function pointers and virtual functions" << eom; + remove_function_pointers( + get_message_handler(), goto_model, cmdline.isset("pointer-check")); + + // Java virtual functions -> explicit dispatch tables: + remove_virtual_functions(goto_model); + // remove catch and throw + remove_exceptions(goto_model); + // Java instanceof -> clsid comparison: + remove_instanceof(goto_model); + + mm_io(goto_model); + + // instrument library preconditions + instrument_preconditions(goto_model); + + // remove returns, gcc vectors, complex + remove_returns(goto_model); + remove_vector(goto_model); + remove_complex(goto_model); + rewrite_union(goto_model); + + // add generic checks + status() << "Generic Property Instrumentation" << eom; + goto_check(options, goto_model); + + // checks don't know about adjusted float expressions + adjust_float_expressions(goto_model); + + // recalculate numbers, etc. + goto_model.goto_functions.update(); + + // add loop ids + goto_model.goto_functions.compute_loop_numbers(); + + // remove skips such that trivial GOTOs are deleted and not considered + // for coverage annotation: + remove_skip(goto_model); + + // instrument cover goals + if(cmdline.isset("cover")) + { + if(instrument_cover_goals(options, goto_model, get_message_handler())) + return true; + } + + // label the assertions + // This must be done after adding assertions and + // before using the argument of the "property" option. + // Do not re-label after using the property slicer because + // this would cause the property identifiers to change. + label_properties(goto_model); + + // remove any skips introduced since coverage instrumentation + remove_skip(goto_model); + goto_model.goto_functions.update(); + } + + catch(const char *e) + { + error() << e << eom; + return true; + } + + catch(const std::string &e) + { + error() << e << eom; + return true; + } + + catch(int e) + { + error() << "Numeric exception: " << e << eom; + return true; + } + + catch(const std::bad_alloc &) + { + error() << "Out of memory" << eom; + exit(CPROVER_EXIT_INTERNAL_OUT_OF_MEMORY); + return true; + } + + return false; +} + +/// display command line help +void jdiff_parse_optionst::help() +{ + // clang-format off + std::cout << + "\n" + // NOLINTNEXTLINE(whitespace/line_length) + "* * JDIFF " CBMC_VERSION " - Copyright (C) 2016-2018 * *\n" + "* * Daniel Kroening, Peter Schrammel * *\n" + "* * kroening@kroening.com * *\n" + "\n" + "Usage: Purpose:\n" + "\n" + " jdiff [-?] [-h] [--help] show help\n" + " jdiff old new jars to be compared\n" + "\n" + "Diff options:\n" + HELP_SHOW_GOTO_FUNCTIONS + HELP_SHOW_PROPERTIES + " --syntactic do syntactic diff (default)\n" + " -u | --unified output unified diff\n" + " --change-impact | \n" + " --forward-impact |\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --backward-impact output unified diff with forward&backward/forward/backward dependencies\n" + " --compact-output output dependencies in compact mode\n" + "\n" + "Program instrumentation options:\n" + HELP_GOTO_CHECK + " --cover CC create test-suite with coverage criterion CC\n" // NOLINT(*) + "Java Bytecode frontend options:\n" + JAVA_BYTECODE_LANGUAGE_OPTIONS_HELP + "Other options:\n" + " --version show version and exit\n" + " --json-ui use JSON-formatted output\n" + HELP_TIMESTAMP + "\n"; + // clang-format on +} diff --git a/jbmc/src/jdiff/jdiff_parse_options.h b/jbmc/src/jdiff/jdiff_parse_options.h new file mode 100644 index 00000000000..9c306aa1f75 --- /dev/null +++ b/jbmc/src/jdiff/jdiff_parse_options.h @@ -0,0 +1,74 @@ +/*******************************************************************\ + +Module: JDIFF Command Line Option Processing + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// JDIFF Command Line Option Processing + +#ifndef CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H +#define CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H + +#include + +#include +#include +#include + +#include +#include +#include + +#include "jdiff_languages.h" + +class goto_modelt; +class optionst; + +// clang-format off +#define JDIFF_OPTIONS \ + "(json-ui)" \ + OPT_SHOW_GOTO_FUNCTIONS \ + OPT_SHOW_PROPERTIES \ + OPT_GOTO_CHECK \ + "(cover):" \ + "(verbosity):(version)" \ + OPT_TIMESTAMP \ + "u(unified)(change-impact)(forward-impact)(backward-impact)" \ + "(compact-output)" +// clang-format on + +class jdiff_parse_optionst : public parse_options_baset, public jdiff_languagest +{ +public: + virtual int doit(); + virtual void help(); + + jdiff_parse_optionst(int argc, const char **argv); + jdiff_parse_optionst( + int argc, + const char **argv, + const std::string &extra_options); + +protected: + ui_message_handlert ui_message_handler; + jdiff_languagest languages2; + + virtual void get_command_line_options(optionst &options); + + virtual int get_goto_program( + const optionst &options, + jdiff_languagest &languages, + goto_modelt &goto_model); + + virtual bool + process_goto_program(const optionst &options, goto_modelt &goto_model); + + void eval_verbosity(); + + void preprocessing(); +}; + +#endif // CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H From e2474583710728a324b130b25b309fd5c0088225 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Fri, 18 May 2018 10:47:38 +0100 Subject: [PATCH 05/12] Add JANALYZER tool --- CMakeLists.txt | 2 + jbmc/src/CMakeLists.txt | 1 + jbmc/src/Makefile | 7 +- jbmc/src/janalyzer/CMakeLists.txt | 26 + jbmc/src/janalyzer/Makefile | 49 ++ jbmc/src/janalyzer/README.md | 8 + jbmc/src/janalyzer/janalyzer_main.cpp | 29 + .../src/janalyzer/janalyzer_parse_options.cpp | 817 ++++++++++++++++++ jbmc/src/janalyzer/janalyzer_parse_options.h | 184 ++++ 9 files changed, 1121 insertions(+), 2 deletions(-) create mode 100644 jbmc/src/janalyzer/CMakeLists.txt create mode 100644 jbmc/src/janalyzer/Makefile create mode 100644 jbmc/src/janalyzer/README.md create mode 100644 jbmc/src/janalyzer/janalyzer_main.cpp create mode 100644 jbmc/src/janalyzer/janalyzer_parse_options.cpp create mode 100644 jbmc/src/janalyzer/janalyzer_parse_options.h diff --git a/CMakeLists.txt b/CMakeLists.txt index b9ef7953509..ed5a46d85a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,8 @@ set_target_properties( java_bytecode jbmc jbmc-lib + janalyzer + janalyzer-lib jdiff jdiff-lib java-testing-utils diff --git a/jbmc/src/CMakeLists.txt b/jbmc/src/CMakeLists.txt index a6a2310b716..791f301658a 100644 --- a/jbmc/src/CMakeLists.txt +++ b/jbmc/src/CMakeLists.txt @@ -16,4 +16,5 @@ endmacro(generic_includes) add_subdirectory(miniz) add_subdirectory(java_bytecode) add_subdirectory(jbmc) +add_subdirectory(janalyzer) add_subdirectory(jdiff) diff --git a/jbmc/src/Makefile b/jbmc/src/Makefile index eef6485dc4e..169f77b0943 100644 --- a/jbmc/src/Makefile +++ b/jbmc/src/Makefile @@ -1,9 +1,9 @@ -DIRS = jbmc jdiff java_bytecode miniz +DIRS = janalyzer jbmc jdiff java_bytecode miniz include config.inc .PHONY: all -all: jbmc.dir jdiff.dir +all: janalyzer.dir jbmc.dir jdiff.dir # building cbmc proper .PHONY: cprover.dir @@ -13,6 +13,9 @@ cprover.dir: .PHONY: java_bytecode.dir java_bytecode.dir: miniz.dir +.PHONY: janalyzer.dir +janalyzer.dir: java_bytecode.dir cprover.dir + .PHONY: jbmc.dir jbmc.dir: java_bytecode.dir cprover.dir diff --git a/jbmc/src/janalyzer/CMakeLists.txt b/jbmc/src/janalyzer/CMakeLists.txt new file mode 100644 index 00000000000..f4ff29ae0d4 --- /dev/null +++ b/jbmc/src/janalyzer/CMakeLists.txt @@ -0,0 +1,26 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/janalyzer_main.cpp +) +add_library(janalyzer-lib ${sources}) + +generic_includes(janalyzer-lib) + +target_link_libraries(janalyzer-lib + ansi-c + java_bytecode + linking + big-int + goto-analyzer-lib + goto-programs + analyses + pointer-analysis + langapi + json + util +) + +# Executable +add_executable(janalyzer janalyzer_main.cpp) +target_link_libraries(janalyzer janalyzer-lib) diff --git a/jbmc/src/janalyzer/Makefile b/jbmc/src/janalyzer/Makefile new file mode 100644 index 00000000000..879939a34d0 --- /dev/null +++ b/jbmc/src/janalyzer/Makefile @@ -0,0 +1,49 @@ +SRC = janalyzer_main.cpp \ + janalyzer_parse_options.cpp \ + # Empty last line + +OBJ += ../$(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \ + ../java_bytecode/java_bytecode$(LIBEXT) \ + ../$(CPROVER_DIR)/src/linking/linking$(LIBEXT) \ + ../$(CPROVER_DIR)/src/big-int/big-int$(LIBEXT) \ + ../$(CPROVER_DIR)/src/goto-programs/goto-programs$(LIBEXT) \ + ../$(CPROVER_DIR)/src/analyses/analyses$(LIBEXT) \ + ../$(CPROVER_DIR)/src/pointer-analysis/pointer-analysis$(LIBEXT) \ + ../$(CPROVER_DIR)/src/langapi/langapi$(LIBEXT) \ + ../$(CPROVER_DIR)/src/json/json$(LIBEXT) \ + ../$(CPROVER_DIR)/src/util/util$(LIBEXT) \ + ..//miniz/miniz$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-analyzer/static_show_domain$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-analyzer/static_simplifier$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-analyzer/static_verifier$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-analyzer/taint_analysis$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-analyzer/taint_parser$(OBJEXT) \ + ../$(CPROVER_DIR)/src/goto-analyzer/unreachable_instructions$(OBJEXT) \ + # Empty last line + +INCLUDES= -I .. -I ../$(CPROVER_DIR)/src + +LIBS = + +include ../config.inc +include ../$(CPROVER_DIR)/src/config.inc +include ../$(CPROVER_DIR)/src/common + +CLEANFILES = janalyzer$(EXEEXT) + +all: janalyzer$(EXEEXT) + +ifneq ($(wildcard ../jsil/Makefile),) + OBJ += ../jsil/jsil$(LIBEXT) + CP_CXXFLAGS += -DHAVE_JSIL +endif + +############################################################################### + +janalyzer$(EXEEXT): $(OBJ) + $(LINKBIN) + +.PHONY: janalyzer-mac-signed + +janalyzer-mac-signed: janalyzer$(EXEEXT) + strip janalyzer$(EXEEXT) ; codesign -v -s $(OSX_IDENTITY) janalyzer$(EXEEXT) diff --git a/jbmc/src/janalyzer/README.md b/jbmc/src/janalyzer/README.md new file mode 100644 index 00000000000..841c56eaabb --- /dev/null +++ b/jbmc/src/janalyzer/README.md @@ -0,0 +1,8 @@ +\ingroup module_hidden +\defgroup janalyzer janalyzer + +# Folder janalyzer + +`janalyzer/` is a tool performing static analyses on Java +programs. It provides a Java front end for many of the static analyses +in the \ref analyses directory. diff --git a/jbmc/src/janalyzer/janalyzer_main.cpp b/jbmc/src/janalyzer/janalyzer_main.cpp new file mode 100644 index 00000000000..15898e38ef3 --- /dev/null +++ b/jbmc/src/janalyzer/janalyzer_main.cpp @@ -0,0 +1,29 @@ +/*******************************************************************\ + +Module: JANALYZER Main Module + +Author: Peter Schrammel + +\*******************************************************************/ + +/// \file +/// JANALYZER Main Module + +#include "janalyzer_parse_options.h" + +#include + +#ifdef _MSC_VER +int wmain(int argc, const wchar_t **argv_wide) +{ + auto vec = narrow_argv(argc, argv_wide); + auto narrow = to_c_str_array(std::begin(vec), std::end(vec)); + auto argv = narrow.data(); +#else +int main(int argc, const char **argv) +{ +#endif + janalyzer_parse_optionst parse_options(argc, argv); + + return parse_options.main(); +} diff --git a/jbmc/src/janalyzer/janalyzer_parse_options.cpp b/jbmc/src/janalyzer/janalyzer_parse_options.cpp new file mode 100644 index 00000000000..afd8feab06c --- /dev/null +++ b/jbmc/src/janalyzer/janalyzer_parse_options.cpp @@ -0,0 +1,817 @@ +/*******************************************************************\ + +Module: JANALYZER Command Line Option Processing + +Author: Daniel Kroening, kroening@kroening.com + +\*******************************************************************/ + +/// \file +/// JANALYZER Command Line Option Processing + +#include "janalyzer_parse_options.h" + +#include // exit() +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +janalyzer_parse_optionst::janalyzer_parse_optionst(int argc, const char **argv) + : parse_options_baset(JANALYZER_OPTIONS, argc, argv), + messaget(ui_message_handler), + ui_message_handler(cmdline, "JANALYZER " CBMC_VERSION) +{ +} + +void janalyzer_parse_optionst::register_languages() +{ + register_language(new_java_bytecode_language); +} + +void janalyzer_parse_optionst::eval_verbosity() +{ + // this is our default verbosity + unsigned int v = messaget::M_STATISTICS; + + if(cmdline.isset("verbosity")) + { + v = unsafe_string2unsigned(cmdline.get_value("verbosity")); + if(v > 10) + v = 10; + } + + ui_message_handler.set_verbosity(v); +} + +void janalyzer_parse_optionst::get_command_line_options(optionst &options) +{ + if(config.set(cmdline)) + { + usage_error(); + exit(CPROVER_EXIT_USAGE_ERROR); + } + + // check assertions + if(cmdline.isset("no-assertions")) + options.set_option("assertions", false); + else + options.set_option("assertions", true); + + // use assumptions + if(cmdline.isset("no-assumptions")) + options.set_option("assumptions", false); + else + options.set_option("assumptions", true); + + // magic error label + if(cmdline.isset("error-label")) + options.set_option("error-label", cmdline.get_values("error-label")); + + // Select a specific analysis + if(cmdline.isset("taint")) + { + options.set_option("taint", true); + options.set_option("specific-analysis", true); + } + // For backwards compatibility, + // these are first recognised as specific analyses + bool reachability_task = false; + if(cmdline.isset("unreachable-instructions")) + { + options.set_option("unreachable-instructions", true); + options.set_option("specific-analysis", true); + reachability_task = true; + } + if(cmdline.isset("unreachable-functions")) + { + options.set_option("unreachable-functions", true); + options.set_option("specific-analysis", true); + reachability_task = true; + } + if(cmdline.isset("reachable-functions")) + { + options.set_option("reachable-functions", true); + options.set_option("specific-analysis", true); + reachability_task = true; + } + if(cmdline.isset("show-local-may-alias")) + { + options.set_option("show-local-may-alias", true); + options.set_option("specific-analysis", true); + } + + // Output format choice + if(cmdline.isset("text")) + { + options.set_option("text", true); + options.set_option("outfile", cmdline.get_value("text")); + } + else if(cmdline.isset("json")) + { + options.set_option("json", true); + options.set_option("outfile", cmdline.get_value("json")); + } + else if(cmdline.isset("xml")) + { + options.set_option("xml", true); + options.set_option("outfile", cmdline.get_value("xml")); + } + else if(cmdline.isset("dot")) + { + options.set_option("dot", true); + options.set_option("outfile", cmdline.get_value("dot")); + } + else + { + options.set_option("text", true); + options.set_option("outfile", "-"); + } + + // The use should either select: + // 1. a specific analysis, or + // 2. a triple of task / analyzer / domain, or + // 3. one of the general display options + + // Task options + if(cmdline.isset("show")) + { + options.set_option("show", true); + options.set_option("general-analysis", true); + } + else if(cmdline.isset("verify")) + { + options.set_option("verify", true); + options.set_option("general-analysis", true); + } + else if(cmdline.isset("simplify")) + { + options.set_option("simplify", true); + options.set_option("outfile", cmdline.get_value("simplify")); + options.set_option("general-analysis", true); + + // For development allow slicing to be disabled in the simplify task + options.set_option( + "simplify-slicing", !(cmdline.isset("no-simplify-slicing"))); + } + else if(cmdline.isset("show-intervals")) + { + // For backwards compatibility + options.set_option("show", true); + options.set_option("general-analysis", true); + options.set_option("intervals", true); + options.set_option("domain set", true); + } + else if(cmdline.isset("(show-non-null)")) + { + // For backwards compatibility + options.set_option("show", true); + options.set_option("general-analysis", true); + options.set_option("non-null", true); + options.set_option("domain set", true); + } + else if(cmdline.isset("intervals") || cmdline.isset("non-null")) + { + // For backwards compatibility either of these on their own means show + options.set_option("show", true); + options.set_option("general-analysis", true); + } + + if(options.get_bool_option("general-analysis") || reachability_task) + { + // Abstract interpreter choice + if(cmdline.isset("location-sensitive")) + options.set_option("location-sensitive", true); + else if(cmdline.isset("concurrent")) + options.set_option("concurrent", true); + else + { + // Silently default to location-sensitive as it's the "default" + // view of abstract interpretation. + options.set_option("location-sensitive", true); + } + + // Domain choice + if(cmdline.isset("constants")) + { + options.set_option("constants", true); + options.set_option("domain set", true); + } + else if(cmdline.isset("dependence-graph")) + { + options.set_option("dependence-graph", true); + options.set_option("domain set", true); + } + else if(cmdline.isset("intervals")) + { + options.set_option("intervals", true); + options.set_option("domain set", true); + } + else if(cmdline.isset("non-null")) + { + options.set_option("non-null", true); + options.set_option("domain set", true); + } + + // Reachability questions, when given with a domain swap from specific + // to general tasks so that they can use the domain & parameterisations. + if(reachability_task) + { + if(options.get_bool_option("domain set")) + { + options.set_option("specific-analysis", false); + options.set_option("general-analysis", true); + } + } + else + { + if(!options.get_bool_option("domain set")) + { + // Default to constants as it is light-weight but useful + status() << "Domain not specified, defaulting to --constants" << eom; + options.set_option("constants", true); + } + } + } +} + +/// For the task, build the appropriate kind of analyzer +/// Ideally this should be a pure function of options. +/// However at the moment some domains require the goto_model +ai_baset *janalyzer_parse_optionst::build_analyzer( + const optionst &options, + const namespacet &ns) +{ + ai_baset *domain = nullptr; + + if(options.get_bool_option("location-sensitive")) + { + if(options.get_bool_option("constants")) + { + // constant_propagator_ait derives from ait + domain = new constant_propagator_ait(goto_model.goto_functions); + } + else if(options.get_bool_option("dependence-graph")) + { + domain = new dependence_grapht(ns); + } + else if(options.get_bool_option("intervals")) + { + domain = new ait(); + } +#if 0 + // Not actually implemented, despite the option... + else if(options.get_bool_option("non-null")) + { + domain=new ait(); + } +#endif + } + else if(options.get_bool_option("concurrent")) + { +#if 0 + // Disabled until merge_shared is implemented for these + if(options.get_bool_option("constants")) + { + domain=new concurrency_aware_ait(); + } + else if(options.get_bool_option("dependence-graph")) + { + domain=new dependence_grapht(ns); + } + else if(options.get_bool_option("intervals")) + { + domain=new concurrency_aware_ait(); + } +#if 0 + // Not actually implemented, despite the option... + else if(options.get_bool_option("non-null")) + { + domain=new concurrency_aware_ait(); + } +#endif +#endif + } + + return domain; +} + +/// invoke main modules +int janalyzer_parse_optionst::doit() +{ + if(cmdline.isset("version")) + { + std::cout << CBMC_VERSION << '\n'; + return CPROVER_EXIT_SUCCESS; + } + + // + // command line options + // + + optionst options; + get_command_line_options(options); + eval_verbosity(); + + // + // Print a banner + // + status() << "JANALYZER version " CBMC_VERSION " " << sizeof(void *) * 8 + << "-bit " << config.this_architecture() << " " + << config.this_operating_system() << eom; + + register_languages(); + + try + { + goto_model = initialize_goto_model(cmdline, get_message_handler()); + } + + catch(const char *e) + { + error() << e << eom; + return CPROVER_EXIT_EXCEPTION; + } + + catch(const std::string &e) + { + error() << e << eom; + return CPROVER_EXIT_EXCEPTION; + } + + catch(int e) + { + error() << "Numeric exception: " << e << eom; + return CPROVER_EXIT_EXCEPTION; + } + + if(process_goto_program(options)) + return CPROVER_EXIT_INTERNAL_ERROR; + + // show it? + if(cmdline.isset("show-symbol-table")) + { + ::show_symbol_table(goto_model.symbol_table, get_ui()); + return CPROVER_EXIT_SUCCESS; + } + + // show it? + if( + cmdline.isset("show-goto-functions") || + cmdline.isset("list-goto-functions")) + { + show_goto_functions( + goto_model, + get_message_handler(), + get_ui(), + cmdline.isset("list-goto-functions")); + return CPROVER_EXIT_SUCCESS; + } + + try + { + return perform_analysis(options); + } + + catch(const char *e) + { + error() << e << eom; + return CPROVER_EXIT_EXCEPTION; + } + + catch(const std::string &e) + { + error() << e << eom; + return CPROVER_EXIT_EXCEPTION; + } + + catch(int e) + { + error() << "Numeric exception: " << e << eom; + return CPROVER_EXIT_EXCEPTION; + } + + catch(const std::bad_alloc &) + { + error() << "Out of memory" << eom; + return CPROVER_EXIT_INTERNAL_OUT_OF_MEMORY; + } +} + +/// Depending on the command line mode, run one of the analysis tasks +int janalyzer_parse_optionst::perform_analysis(const optionst &options) +{ + if(options.get_bool_option("taint")) + { + std::string taint_file = cmdline.get_value("taint"); + + if(cmdline.isset("show-taint")) + { + taint_analysis(goto_model, taint_file, get_message_handler(), true, ""); + return CPROVER_EXIT_SUCCESS; + } + else + { + std::string json_file = cmdline.get_value("json"); + bool result = taint_analysis( + goto_model, taint_file, get_message_handler(), false, json_file); + return result ? CPROVER_EXIT_VERIFICATION_UNSAFE : CPROVER_EXIT_SUCCESS; + } + } + + // If no domain is given, this lightweight version of the analysis is used. + if( + options.get_bool_option("unreachable-instructions") && + options.get_bool_option("specific-analysis")) + { + const std::string json_file = cmdline.get_value("json"); + + if(json_file.empty()) + unreachable_instructions(goto_model, false, std::cout); + else if(json_file == "-") + unreachable_instructions(goto_model, true, std::cout); + else + { + std::ofstream ofs(json_file); + if(!ofs) + { + error() << "Failed to open json output `" << json_file << "'" << eom; + return CPROVER_EXIT_INTERNAL_ERROR; + } + + unreachable_instructions(goto_model, true, ofs); + } + + return CPROVER_EXIT_SUCCESS; + } + + if( + options.get_bool_option("unreachable-functions") && + options.get_bool_option("specific-analysis")) + { + const std::string json_file = cmdline.get_value("json"); + + if(json_file.empty()) + unreachable_functions(goto_model, false, std::cout); + else if(json_file == "-") + unreachable_functions(goto_model, true, std::cout); + else + { + std::ofstream ofs(json_file); + if(!ofs) + { + error() << "Failed to open json output `" << json_file << "'" << eom; + return CPROVER_EXIT_INTERNAL_ERROR; + } + + unreachable_functions(goto_model, true, ofs); + } + + return CPROVER_EXIT_SUCCESS; + } + + if( + options.get_bool_option("reachable-functions") && + options.get_bool_option("specific-analysis")) + { + const std::string json_file = cmdline.get_value("json"); + + if(json_file.empty()) + reachable_functions(goto_model, false, std::cout); + else if(json_file == "-") + reachable_functions(goto_model, true, std::cout); + else + { + std::ofstream ofs(json_file); + if(!ofs) + { + error() << "Failed to open json output `" << json_file << "'" << eom; + return CPROVER_EXIT_INTERNAL_ERROR; + } + + reachable_functions(goto_model, true, ofs); + } + + return CPROVER_EXIT_SUCCESS; + } + + if(options.get_bool_option("show-local-may-alias")) + { + namespacet ns(goto_model.symbol_table); + + forall_goto_functions(it, goto_model.goto_functions) + { + std::cout << ">>>>\n"; + std::cout << ">>>> " << it->first << '\n'; + std::cout << ">>>>\n"; + local_may_aliast local_may_alias(it->second); + local_may_alias.output(std::cout, it->second, ns); + std::cout << '\n'; + } + + return CPROVER_EXIT_SUCCESS; + } + + label_properties(goto_model); + + if(cmdline.isset("show-properties")) + { + show_properties(goto_model, get_message_handler(), get_ui()); + return CPROVER_EXIT_SUCCESS; + } + + if(set_properties()) + return CPROVER_EXIT_SET_PROPERTIES_FAILED; + + if(options.get_bool_option("general-analysis")) + { + // Output file factory + const std::string outfile = options.get_option("outfile"); + std::ofstream output_stream; + if(!(outfile == "-")) + output_stream.open(outfile); + + std::ostream &out((outfile == "-") ? std::cout : output_stream); + + if(!out) + { + error() << "Failed to open output file `" << outfile << "'" << eom; + return CPROVER_EXIT_INTERNAL_ERROR; + } + + // Build analyzer + status() << "Selecting abstract domain" << eom; + namespacet ns(goto_model.symbol_table); // Must live as long as the domain. + std::unique_ptr analyzer(build_analyzer(options, ns)); + + if(analyzer == nullptr) + { + status() << "Task / Interpreter / Domain combination not supported" + << messaget::eom; + return CPROVER_EXIT_INTERNAL_ERROR; + } + + // Run + status() << "Computing abstract states" << eom; + (*analyzer)(goto_model); + + // Perform the task + status() << "Performing task" << eom; + bool result = true; + if(options.get_bool_option("show")) + { + result = static_show_domain( + goto_model, *analyzer, options, get_message_handler(), out); + } + else if(options.get_bool_option("verify")) + { + result = static_verifier( + goto_model, *analyzer, options, get_message_handler(), out); + } + else if(options.get_bool_option("simplify")) + { + result = static_simplifier( + goto_model, *analyzer, options, get_message_handler(), out); + } + else if(options.get_bool_option("unreachable-instructions")) + { + result = static_unreachable_instructions( + goto_model, *analyzer, options, get_message_handler(), out); + } + else if(options.get_bool_option("unreachable-functions")) + { + result = static_unreachable_functions( + goto_model, *analyzer, options, get_message_handler(), out); + } + else if(options.get_bool_option("reachable-functions")) + { + result = static_reachable_functions( + goto_model, *analyzer, options, get_message_handler(), out); + } + else + { + error() << "Unhandled task" << eom; + return CPROVER_EXIT_INTERNAL_ERROR; + } + + return result ? CPROVER_EXIT_VERIFICATION_UNSAFE + : CPROVER_EXIT_VERIFICATION_SAFE; + } + + // Final defensive error case + error() << "no analysis option given -- consider reading --help" << eom; + return CPROVER_EXIT_USAGE_ERROR; +} + +bool janalyzer_parse_optionst::set_properties() +{ + try + { + if(cmdline.isset("property")) + ::set_properties(goto_model, cmdline.get_values("property")); + } + + catch(const char *e) + { + error() << e << eom; + return true; + } + + catch(const std::string &e) + { + error() << e << eom; + return true; + } + + catch(int) + { + return true; + } + + return false; +} + +bool janalyzer_parse_optionst::process_goto_program(const optionst &options) +{ + try + { + // remove function pointers + status() << "Removing function pointers and virtual functions" << eom; + remove_function_pointers( + get_message_handler(), goto_model, cmdline.isset("pointer-check")); + // Java virtual functions -> explicit dispatch tables: + remove_virtual_functions(goto_model); + // remove Java throw and catch + // This introduces instanceof, so order is important: + remove_exceptions(goto_model); + // remove rtti + remove_instanceof(goto_model); + + // do partial inlining + status() << "Partial Inlining" << eom; + goto_partial_inline(goto_model, ui_message_handler); + + // remove returns, gcc vectors, complex + remove_returns(goto_model); + remove_vector(goto_model); + remove_complex(goto_model); + + // add generic checks + status() << "Generic Property Instrumentation" << eom; + goto_check(options, goto_model); + + // recalculate numbers, etc. + goto_model.goto_functions.update(); + + // add loop ids + goto_model.goto_functions.compute_loop_numbers(); + } + + catch(const char *e) + { + error() << e << eom; + return true; + } + + catch(const std::string &e) + { + error() << e << eom; + return true; + } + + catch(int) + { + return true; + } + + catch(const std::bad_alloc &) + { + error() << "Out of memory" << eom; + return true; + } + + return false; +} + +/// display command line help +void janalyzer_parse_optionst::help() +{ + std::cout << "\n" + "* * JANALYZER " CBMC_VERSION " - Copyright (C) 2017-2018 "; + + std::cout << "(" << (sizeof(void *) * 8) << "-bit version)"; + + std::cout << " * *\n"; + + // clang-format off + std::cout << + /* NOLINTNEXTLINE(whitespace/line_length) */ + "* * JANALYZER " CBMC_VERSION " - Copyright (C) 2016-2018 * *\n" + "* * Daniel Kroening, Diffblue * *\n" + "* * kroening@kroening.com * *\n" + "\n" + "Usage: Purpose:\n" + "\n" + " janalyzer [-?] [-h] [--help] show help\n" + " janalyzer class name of class to be checked\n" + "\n" + "Task options:\n" + " --show display the abstract domains\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --verify use the abstract domains to check assertions\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --simplify file_name use the abstract domains to simplify the program\n" + " --unreachable-instructions list dead code\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --unreachable-functions list functions unreachable from the entry point\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --reachable-functions list functions reachable from the entry point\n" + "\n" + "Abstract interpreter options:\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --location-sensitive use location-sensitive abstract interpreter\n" + " --concurrent use concurrency-aware abstract interpreter\n" + "\n" + "Domain options:\n" + " --constants constant domain\n" + " --intervals interval domain\n" + " --non-null non-null domain\n" + " --dependence-graph data and control dependencies between instructions\n" // NOLINT(*) + "\n" + "Output options:\n" + " --text file_name output results in plain text to given file\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --json file_name output results in JSON format to given file\n" + " --xml file_name output results in XML format to given file\n" + " --dot file_name output results in DOT format to given file\n" + "\n" + "Specific analyses:\n" + // NOLINTNEXTLINE(whitespace/line_length) + " --taint file_name perform taint analysis using rules in given file\n" + "\n" + "Java Bytecode frontend options:\n" + " --classpath dir/jar set the classpath\n" + " --main-class class-name set the name of the main class\n" + JAVA_BYTECODE_LANGUAGE_OPTIONS_HELP + HELP_FUNCTIONS + "\n" + "Program representations:\n" + " --show-parse-tree show parse tree\n" + " --show-symbol-table show loaded symbol table\n" + HELP_SHOW_GOTO_FUNCTIONS + HELP_SHOW_PROPERTIES + "\n" + "Program instrumentation options:\n" + HELP_GOTO_CHECK + "\n" + "Other options:\n" + " --version show version and exit\n" + HELP_TIMESTAMP + "\n"; + // clang-format on +} diff --git a/jbmc/src/janalyzer/janalyzer_parse_options.h b/jbmc/src/janalyzer/janalyzer_parse_options.h new file mode 100644 index 00000000000..cfe867cd329 --- /dev/null +++ b/jbmc/src/janalyzer/janalyzer_parse_options.h @@ -0,0 +1,184 @@ +/*******************************************************************\ + +Module: JANALYZER Command Line Option Processing + +Author: Daniel Kroening, kroening@kroening.com + +\*******************************************************************/ + +/// \file +/// JANALYZER Command Line Option Processing +/// +/// Goto-analyze is the tool front-end for CPROVER's classic style abstract +/// interpretation analyses. By "classic style" I mean, domains are C++ +/// objects, transformers are computed using C++ functions and the +/// fix-points are computed by iteration. This is in contrast to 2LS's +/// approach where everything is computed using quantifier-elimination. +/// +/// The analyses are mostly in analyses/ and although they are used in other +/// places in the code, the goal is that goto-analyze should eventually +/// provide an executable front-end for all of them. +/// +/// There are a lot of different analyses and a lot of ways they can be +/// used. Goto-analyze has five, largely independent, sets of options: +/// +/// 1. Task : What you do once you've computed the domains. +/// 2. Abstract interpreter : What kind of abstract interpretation you do. +/// 3. Domain : What domain you use. +/// 4. Sensitivity : How that domain handles things like arrays, pointers, etc. +/// (see variable_sensitivity_domain.h) +/// 5. Output : What you do with the results. +/// +/// Formally speaking, 2, 3 and 4 are an artificial distinction as they are +/// all really parts of the "what domain" question. However they correspond +/// to parts of our code architecture, so ... they should stay. +/// +/// Ideally, the cross product of options should be supported but ... in +/// practice there will always be ones that are not meaningful. Those +/// should give errors. In addition there are some analyses which are +/// currently stand alone as they don't fit directly in to this model. For +/// example the unwind bounds analysis, which is both the task, the abstract +/// interpreter and the output. Where possible these should be integrated / +/// support the other options. In the case of the unwind analysis this +/// means the domain and it's sensitivity should be configurable. +/// +/// +/// Task +/// ---- +/// +/// Tasks are implemented by the relevant file in goto-analyze/static_*. At +/// the moment they are each responsible for building the domain / using the +/// other options. As much as possible of this code should be shared. Some +/// of these inherit from messaget. They all probably should. +/// +/// Show : Prints out the domains for inspection or further use. +/// +/// Verify : Uses the domain to check all assertions in the code, marking +/// each one "SUCCESS" (the assertion always holds), "FAILURE if +/// reachable" (the assertion never holds), "UNKNOWN" (the assertion may or +/// may not hold). This is implemented using domain_simplify(). +/// +/// Simplify : Generates a new goto program with branch conditions, +/// assertions, assumptions and assignments simplified using the information +/// in the domain (again using domain_simplify()). This task is intended to +/// be used as a preprocessing step for other analysis. +/// +/// Instrument : (Not implemented yet) Use the domains to add assume() +/// statements to the code giving invariants generated from the domain. +/// These assumes don't reduce the space of possible executions; they make +/// existing invariants explicit. Again, intended as a preprocessing step. +/// +/// +/// Abstract Interpreter +/// -------------------- +/// +/// This option is effectively about how we compute the fix-point(s) / +/// which child class of ai_baset we use. I.E. ait or +/// concurrency_aware_ait, etc. For migrating / refactor / +/// unifying with the pointer analysis code we might want a +/// location_insensitive_ait or something but this is not urgent. +/// We will need a context_aware_ait. +/// +/// +/// Domain +/// ------ +/// +/// Which child of ai_domain_baset we use to represent the abstract state at +/// each location / implement the transformers. I expect most of these will +/// be non-relational (i.e. an abstract object for each variable) due to the +/// cost of implementing effective non-relational domains in this style vs. +/// using 2LS. The exception might be equalities, which we could implement +/// here. +/// +/// +/// Output +/// ------ +/// +/// Text, XML, JSON plus some others for specific domains such as dependence +/// graphs in DOT format. + +#ifndef CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H +#define CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H + +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include + +#include + +class bmct; +class goto_functionst; +class optionst; + +// clang-format off +#define JANALYZER_OPTIONS \ + OPT_FUNCTIONS \ + "(classpath):(cp):(main-class):" \ + "(16)(32)(64)(LP64)(ILP64)(LLP64)(ILP32)(LP32)" \ + "(little-endian)(big-endian)" \ + OPT_SHOW_GOTO_FUNCTIONS \ + OPT_SHOW_PROPERTIES \ + OPT_GOTO_CHECK \ + "(show-loops)" \ + "(show-symbol-table)(show-parse-tree)" \ + "(show-reachable-properties)(property):" \ + "(verbosity):(version)" \ + "(arch):" \ + "(taint):(show-taint)" \ + "(show-local-may-alias)" \ + "(json):(xml):" \ + "(text):(dot):" \ + OPT_TIMESTAMP \ + "(unreachable-instructions)(unreachable-functions)" \ + "(reachable-functions)" \ + "(intervals)(show-intervals)" \ + "(non-null)(show-non-null)" \ + "(constants)" \ + "(dependence-graph)" \ + "(show)(verify)(simplify):" \ + "(location-sensitive)(concurrent)" \ + "(no-simplify-slicing)" \ + JAVA_BYTECODE_LANGUAGE_OPTIONS +// clang-format on + +class janalyzer_parse_optionst : public parse_options_baset, public messaget +{ +public: + virtual int doit() override; + virtual void help() override; + + janalyzer_parse_optionst(int argc, const char **argv); + +protected: + ui_message_handlert ui_message_handler; + goto_modelt goto_model; + + virtual void register_languages(); + + virtual void get_command_line_options(optionst &options); + + virtual bool process_goto_program(const optionst &options); + bool set_properties(); + + virtual int perform_analysis(const optionst &options); + + ai_baset *build_analyzer(const optionst &, const namespacet &ns); + + void eval_verbosity(); + + ui_message_handlert::uit get_ui() + { + return ui_message_handler.get_ui(); + } +}; + +#endif // CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H From b6742ca41ea6973d61f5841bcf5f2d766c9dfd0e Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 15 May 2018 17:07:15 +0100 Subject: [PATCH 06/12] Move Java unit tests --- jbmc/unit/CMakeLists.txt | 52 ++++++++ jbmc/unit/Makefile | 119 ++++++++++++++++++ jbmc/unit/java-testing-utils/CMakeLists.txt | 11 ++ jbmc/unit/java-testing-utils/Makefile | 20 +++ .../java-testing-utils}/load_java_class.cpp | 3 +- .../java-testing-utils}/load_java_class.h | 0 .../require_goto_statements.cpp | 3 +- .../require_goto_statements.h | 0 .../require_parse_tree.cpp | 0 .../java-testing-utils}/require_parse_tree.h | 3 +- .../unit/java-testing-utils}/require_type.cpp | 0 .../unit/java-testing-utils}/require_type.h | 0 .../ci_lazy_methods/lazy_load_lambdas.cpp | 2 +- .../unit}/java_bytecode/expr2java.cpp | 0 .../goto-programs/HierarchyTest.class | Bin .../goto-programs/HierarchyTest.java | 0 .../goto-programs/HierarchyTestChild1.class | Bin .../goto-programs/HierarchyTestChild2.class | Bin .../HierarchyTestGrandchild.class | Bin .../HierarchyTestInterface1.class | Bin .../HierarchyTestInterface1.java | 0 .../HierarchyTestInterface2.class | Bin .../HierarchyTestInterface2.java | 0 .../VirtualFunctionsTestChild1.class | Bin .../VirtualFunctionsTestChild2.class | Bin .../VirtualFunctionsTestGrandchild.class | Bin .../VirtualFunctionsTestParent.class | Bin .../VirtualFunctionsTestParent.java | 0 .../goto-programs/class_hierarchy_graph.cpp | 4 +- .../goto-programs/class_hierarchy_output.cpp | 4 +- ...ove_virtual_functions_without_fallback.cpp | 6 +- .../goto_program_generics/GenericBases.java | 0 .../GenericFieldOpaque.class | Bin .../GenericFieldUnsupported.class | Bin ...s$GenericInnerOuter$Outer$InnerClass.class | Bin ...enericFields$GenericInnerOuter$Outer.class | Bin .../GenericFields$GenericInnerOuter.class | Bin ...GenericFields$GenericMethodParameter.class | Bin ...GenericMethodUninstantiatedParameter.class | Bin ...ericFields$GenericRewriteParameter$A.class | Bin ...enericFields$GenericRewriteParameter.class | Bin .../GenericFields$MultipleGenericFields.class | Bin .../GenericFields$NestedGenericFields.class | Bin .../GenericFields$PairGenericField.class | Bin .../GenericFields$SimpleGenericField.class | Bin .../goto_program_generics/GenericFields.class | Bin .../goto_program_generics/GenericFields.java | 0 .../goto_program_generics/GenericHelper.java | 0 .../goto_program_generics/IWrapper.class | Bin .../InterfacePairWrapper.class | Bin .../InterfaceWrapper.class | Bin .../InterfacesImplementation.class | Bin .../goto_program_generics/PairWrapper.class | Bin .../SuperclassInnerInst$Inner.class | Bin .../SuperclassInnerInst$InnerGen.class | Bin .../SuperclassInnerInst.class | Bin .../SuperclassInnerUninst$Inner.class | Bin .../SuperclassInnerUninst$InnerGen.class | Bin .../SuperclassInnerUninst$InnerThree.class | Bin .../SuperclassInnerUninst.class | Bin .../SuperclassInnerUninstTest.class | Bin .../SuperclassInst.class | Bin .../SuperclassInst2.class | Bin .../SuperclassInst3.class | Bin .../SuperclassMixed.class | Bin .../SuperclassMixedTest.class | Bin .../SuperclassOpaque.class | Bin .../SuperclassUninst.class | Bin .../SuperclassUninstTest.class | Bin .../SuperclassUnsupported.class | Bin .../UnsupportedWrapper1.class | Bin .../UnsupportedWrapper2.class | Bin .../goto_program_generics/Wrapper.class | Bin .../generic_bases_test.cpp | 24 ++-- .../generic_parameters_test.cpp | 26 ++-- .../inherited_static_fields/Parent1.class | Bin .../inherited_static_fields/Parent6.class | Bin .../inherited_static_fields/Parent8.class | Bin .../inherited_static_fields/Parent9.class | Bin .../StaticInterface2.class | Bin .../StaticInterface7.class | Bin .../StaticInterface9.class | Bin .../inherited_static_fields/Test1.class | Bin .../inherited_static_fields/Test1.java | 0 .../inherited_static_fields/Test2.class | Bin .../inherited_static_fields/Test2.java | 0 .../inherited_static_fields/Test3.class | Bin .../inherited_static_fields/Test3.java | 0 .../inherited_static_fields/Test4.class | Bin .../inherited_static_fields/Test4.java | 0 .../inherited_static_fields/Test5.class | Bin .../inherited_static_fields/Test5.java | 0 .../inherited_static_fields/Test6.class | Bin .../inherited_static_fields/Test6.java | 0 .../inherited_static_fields/Test7.class | Bin .../inherited_static_fields/Test7.java | 0 .../inherited_static_fields/Test8.class | Bin .../inherited_static_fields/Test8.java | 0 .../inherited_static_fields/Test9.class | Bin .../inherited_static_fields/Test9.java | 0 .../inherited_static_fields.cpp | 2 +- .../otherpackage/Parent7.class | Bin .../otherpackage/Parent7.java | 0 .../java_bytecode_convert_class/A.class | Bin .../java_bytecode_convert_class/C.class | Bin .../ExampleClasses.java | 0 .../Extender.class | Bin .../java_bytecode_convert_class/I.class | Bin .../Implementor.class | Bin .../convert_abstract_class.cpp | 2 +- .../ClassUsingOpaqueStaticConstructor.class | Bin .../ClassWithConstructors.class | Bin .../ClassWithStaticConstructor.class | Bin .../ClassWithoutConstructors.class | Bin .../DummyClassLoadingOpaqueClass.class | Bin .../ExampleConstructors.java | 0 ...ticClassUsingOpaqueStaticConstructor.class | Bin .../convert_initalizers.cpp | 4 +- .../convert_invoke_dynamic.cpp | 6 +- .../AbstractGeneric.class | Bin .../AbstractGeneric.java | 0 .../BoundedGenericClasses.java | 0 ...ndedGenericInnerClasses$BoundedInner.class | Bin ...nericInnerClasses$DoubleBoundedInner.class | Bin .../BoundedGenericInnerClasses$Inner.class | Bin ...dGenericInnerClasses$TwoElementInner.class | Bin .../BoundedGenericInnerClasses.class | Bin .../BoundedGenericInnerClasses.java | 0 .../java_bytecode_parse_generics/C.class | Bin .../ContainsInnerClass$InnerClass.class | Bin ...ContainsInnerClass$InnerClassGeneric.class | Bin .../ContainsInnerClass.class | Bin ...ContainsInnerClassGeneric$InnerClass.class | Bin .../ContainsInnerClassGeneric.class | Bin .../DerivedGenericInst.class | Bin .../DerivedGenericInst2.class | Bin .../DerivedGenericMixed1.class | Bin .../DerivedGenericMixed2.class | Bin .../DerivedGenericUninst.class | Bin .../DerivedGenerics.class | Bin .../DerivedGenerics.java | 0 .../ExtendsAndImplements.class | Bin .../ExtendsAndImplementsGeneric.class | Bin .../ExtendsAndImplementsSameInterface.class | Bin .../ExtendsAndImplementsSameInterface2.class | Bin ...ndsAndImplementsSameInterfaceGeneric.class | Bin .../FunctionsWithGenerics$Inner.class | Bin .../FunctionsWithGenerics.class | Bin .../FunctionsWithGenerics.java | 0 .../Generic.class | Bin .../java_bytecode_parse_generics/Generic.java | 0 .../GenericArray.class | Bin .../GenericArray.java | 0 .../GenericBase$ExtendImplicit.class | Bin ...enericBase$ExtendImplicitAndExplicit.class | Bin ...nericBase$ImplicitAndExplicitGeneric.class | Bin .../GenericBase$ImplicitGeneric.class | Bin .../GenericBase.class | Bin ...nericBase2$ExtendImplicitAndExplicit.class | Bin ...ericBase2$ImplicitAndExplicitGeneric.class | Bin .../GenericBase2.class | Bin .../GenericBounds.class | Bin .../GenericBoundsLower.class | Bin .../GenericBoundsUpper.class | Bin ...ricInnerClass$DoublyNestedInnerClass.class | Bin ...rClass$DoublyNestedInnerGenericClass.class | Bin ...enericInnerClasses$GenericInnerClass.class | Bin ...ssWithGenericInnerClasses$InnerClass.class | Bin ...erClasses$SameGenericParamInnerClass.class | Bin ...nericInnerClasses$TwoParamInnerClass.class | Bin .../GenericClassWithGenericInnerClasses.class | Bin .../GenericClassWithGenericInnerClasses.java | 0 ...asses$GenericInner$GenericInnerInner.class | Bin ...icClassWithInnerClasses$GenericInner.class | Bin ...assWithInnerClasses$Inner$InnerInner.class | Bin .../GenericClassWithInnerClasses$Inner.class | Bin ...ricClassWithInnerClasses$StaticInner.class | Bin .../GenericClassWithInnerClasses.class | Bin .../GenericClassWithInnerClasses.java | 0 .../GenericFields.class | Bin .../GenericFields.java | 0 .../GenericFunctions.class | Bin .../GenericFunctions.java | 0 .../GenericInterface.class | Bin .../GenericTwoParam.class | Bin .../GenericTwoParam.java | 0 .../java_bytecode_parse_generics/I.class | Bin ...mplementsInterfaceGenericSpecialised.class | Bin .../ImplementsInterfaceGenericUnspec.class | Bin .../ImplementsMultipleInterfaces.class | Bin .../java_bytecode_parse_generics/Int.class | Bin .../Interface.class | Bin .../Interface.java | 0 .../InterfaceGeneric.class | Bin .../InterfaceGeneric.java | 0 .../Interface_Copy.class | Bin .../Interface_Copy.java | 0 .../Interface_Implementation.class | Bin .../Interface_Implementation.java | 0 .../Interface_Implementation_Derived.class | Bin .../Interface_Implementation_Derived.java | 0 .../NestedGenerics.class | Bin .../NestedGenerics.java | 0 .../NotGeneric.class | Bin .../RecursiveGeneric.class | Bin .../RecursiveGeneric.java | 0 .../RecursiveGeneric_Derived.class | Bin .../RecursiveGeneric_Derived.java | 0 .../SignatureDescriptorMismatch$Inner.class | Bin ...ignatureDescriptorMismatch$InnerEnum.class | Bin .../SignatureDescriptorMismatch.class | Bin .../SignatureDescriptorMismatch.java | 0 .../ThreeHierarchy.class | Bin .../WildcardGenericFunctions.class | Bin .../WildcardGenericFunctions.java | 0 .../class_bound.class | Bin .../interface_bound.class | Bin .../parse_bounded_generic_inner_classes.cpp | 4 +- .../parse_derived_generic_class.cpp | 4 +- .../parse_functions_with_generics.cpp | 4 +- .../parse_generic_array_class.cpp | 4 +- .../parse_generic_class.cpp | 4 +- ...neric_class_with_generic_inner_classes.cpp | 4 +- ...parse_generic_class_with_inner_classes.cpp | 4 +- .../parse_generic_fields.cpp | 4 +- .../parse_generic_functions.cpp | 4 +- .../parse_generic_superclasses.cpp | 4 +- .../parse_generic_wildcard_function.cpp | 2 +- .../parse_nested_generics.cpp | 4 +- .../parse_recursive_generic_class.cpp | 2 +- .../parse_signature_descriptor_mismatch.cpp | 4 +- ...de_convert_class_lambda_method_handles.cpp | 4 +- ...ava_bytecode_parse_lambda_method_table.cpp | 2 +- .../ExternalLambdaAccessor.class | Bin .../ExternalLambdaAccessor.java | 0 .../lambda_examples/ExternalLambdas.class | Bin .../lambda_examples/LambdaInterfaces.java | 0 .../lambda_examples/LocalLambdas.java | 0 .../lambda_examples/MemberLambdas.java | 0 .../lambda_examples/OuterMemberLambdas.java | 0 .../lambda_examples/StaticLambdas.java | 0 .../ArrayParameterLambda.class | Bin .../eclipse_classes/DummyGeneric.class | Bin .../eclipse_classes/LocalLambdas.class | Bin .../eclipse_classes/MemberLambdas.class | Bin .../OuterMemberLambdas$Inner.class | Bin .../eclipse_classes/OuterMemberLambdas.class | Bin .../eclipse_classes/ParameterLambda.class | Bin .../ReturningLambdaPrimitive.class | Bin .../ReturningLambdaPrimitiveArray.class | Bin .../ReturningLambdaReference.class | Bin .../ReturningLambdaReferenceArray.class | Bin .../ReturningLambdaSpecalisedGeneric.class | Bin ...eturningLambdaSpecalisedGenericArray.class | Bin .../eclipse_classes/SimpleLambda.class | Bin .../eclipse_classes/StaticLambdas.class | Bin .../ArrayParameterLambda.class | Bin .../openjdk_8_classes/DummyGeneric.class | Bin .../openjdk_8_classes/LocalLambdas.class | Bin .../openjdk_8_classes/MemberLambdas.class | Bin .../OuterMemberLambdas$Inner.class | Bin .../OuterMemberLambdas.class | Bin .../openjdk_8_classes/ParameterLambda.class | Bin .../ReturningLambdaPrimitive.class | Bin .../ReturningLambdaPrimitiveArray.class | Bin .../ReturningLambdaReference.class | Bin .../ReturningLambdaReferenceArray.class | Bin .../ReturningLambdaSpecalisedGeneric.class | Bin ...eturningLambdaSpecalisedGenericArray.class | Bin .../openjdk_8_classes/SimpleLambda.class | Bin .../openjdk_8_classes/StaticLambdas.class | Bin .../ArrayParameterLambda.class | Bin .../oracle_8_classes/DummyGeneric.class | Bin .../oracle_8_classes/LocalLambdas.class | Bin .../oracle_8_classes/MemberLambdas.class | Bin .../OuterMemberLambdas$Inner.class | Bin .../oracle_8_classes/OuterMemberLambdas.class | Bin .../oracle_8_classes/ParameterLambda.class | Bin .../ReturningLambdaPrimitive.class | Bin .../ReturningLambdaPrimitiveArray.class | Bin .../ReturningLambdaReference.class | Bin .../ReturningLambdaReferenceArray.class | Bin .../ReturningLambdaSpecalisedGeneric.class | Bin ...eturningLambdaSpecalisedGenericArray.class | Bin .../oracle_8_classes/SimpleLambda.class | Bin .../oracle_8_classes/StaticLambdas.class | Bin .../ArrayParameterLambda.class | Bin .../oracle_9_classes/DummyGeneric.class | Bin .../oracle_9_classes/LocalLambdas.class | Bin .../oracle_9_classes/MemberLambdas.class | Bin .../OuterMemberLambdas$Inner.class | Bin .../oracle_9_classes/OuterMemberLambdas.class | Bin .../oracle_9_classes/ParameterLambda.class | Bin .../ReturningLambdaPrimitive.class | Bin .../ReturningLambdaPrimitiveArray.class | Bin .../ReturningLambdaReference.class | Bin .../ReturningLambdaReferenceArray.class | Bin .../ReturningLambdaSpecalisedGeneric.class | Bin ...eturningLambdaSpecalisedGenericArray.class | Bin .../oracle_9_classes/SimpleLambda.class | Bin .../oracle_9_classes/StaticLambdas.class | Bin .../lambda_examples/readme.md | 0 .../gen_nondet_string_init.cpp | 0 .../java_replace_nondet/Main.class | Bin .../java_replace_nondet/replace_nondet.cpp | 2 +- .../java_replace_nondet/test.java | 0 .../convert_exprt_to_string_exprt.cpp | 0 .../java_types/erase_type_arguments.cpp | 0 .../java_types/generic_type_index.cpp | 0 .../java_types/java_generic_symbol_type.cpp | 0 .../java_types/java_type_from_string.cpp | 0 .../unit}/java_bytecode/java_utils_test.cpp | 0 .../java_virtual_functions/A.class | Bin .../java_virtual_functions/B.class | Bin .../java_virtual_functions/C.class | Bin .../java_virtual_functions/D.class | Bin .../java_virtual_functions/E.class | Bin .../java_virtual_functions/O.class | Bin .../java_virtual_functions/test.java | 0 .../virtual_functions.cpp | 2 +- .../unit}/pointer-analysis/CustomVSATest.jar | Bin .../unit}/pointer-analysis/CustomVSATest.java | 0 .../custom_value_set_analysis.cpp | 0 .../instantiate_not_contains.cpp | 0 .../string_refinement/dependency_graph.cpp | 0 .../string_symbol_resolution.cpp | 0 .../unit}/util/ParameterIndicesTest.class | Bin .../unit}/util/ParameterIndicesTest.java | 0 {unit => jbmc/unit}/util/expr_iterator.cpp | 0 {unit => jbmc/unit}/util/has_subtype.cpp | 0 .../unit}/util/parameter_indices.cpp | 2 +- {unit => jbmc/unit}/util/simplify_expr.cpp | 0 unit/CMakeLists.txt | 1 - unit/Makefile | 31 +---- unit/testing-utils/CMakeLists.txt | 1 - unit/testing-utils/Makefile | 4 - 336 files changed, 281 insertions(+), 111 deletions(-) create mode 100644 jbmc/unit/CMakeLists.txt create mode 100644 jbmc/unit/Makefile create mode 100644 jbmc/unit/java-testing-utils/CMakeLists.txt create mode 100644 jbmc/unit/java-testing-utils/Makefile rename {unit/testing-utils => jbmc/unit/java-testing-utils}/load_java_class.cpp (99%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/load_java_class.h (100%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/require_goto_statements.cpp (99%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/require_goto_statements.h (100%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/require_parse_tree.cpp (100%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/require_parse_tree.h (97%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/require_type.cpp (100%) rename {unit/testing-utils => jbmc/unit/java-testing-utils}/require_type.h (100%) rename {unit => jbmc/unit}/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/expr2java.cpp (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTest.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTest.java (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestChild1.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestChild2.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestGrandchild.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestInterface1.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestInterface1.java (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestInterface2.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/HierarchyTestInterface2.java (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/VirtualFunctionsTestChild1.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/VirtualFunctionsTestChild2.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/VirtualFunctionsTestGrandchild.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/VirtualFunctionsTestParent.class (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/VirtualFunctionsTestParent.java (100%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/class_hierarchy_graph.cpp (92%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/class_hierarchy_output.cpp (94%) rename {unit => jbmc/unit/java_bytecode}/goto-programs/remove_virtual_functions_without_fallback.cpp (98%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericBases.java (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFieldOpaque.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFieldUnsupported.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericInnerOuter$Outer$InnerClass.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericInnerOuter$Outer.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericInnerOuter.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericMethodParameter.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericMethodUninstantiatedParameter.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericRewriteParameter$A.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$GenericRewriteParameter.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$MultipleGenericFields.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$NestedGenericFields.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$PairGenericField.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields$SimpleGenericField.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericFields.java (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/GenericHelper.java (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/IWrapper.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/InterfacePairWrapper.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/InterfaceWrapper.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/InterfacesImplementation.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/PairWrapper.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerInst$Inner.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerInst$InnerGen.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerInst.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerUninst$Inner.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerUninst$InnerGen.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerUninst$InnerThree.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerUninst.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInnerUninstTest.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInst.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInst2.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassInst3.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassMixed.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassMixedTest.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassOpaque.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassUninst.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassUninstTest.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/SuperclassUnsupported.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/UnsupportedWrapper1.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/UnsupportedWrapper2.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/Wrapper.class (100%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/generic_bases_test.cpp (96%) rename {unit/goto-programs => jbmc/unit/java_bytecode}/goto_program_generics/generic_parameters_test.cpp (97%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Parent1.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Parent6.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Parent8.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Parent9.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/StaticInterface2.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/StaticInterface7.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/StaticInterface9.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test1.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test1.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test2.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test2.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test3.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test3.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test4.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test4.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test5.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test5.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test6.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test6.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test7.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test7.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test8.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test8.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test9.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/Test9.java (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/inherited_static_fields.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/otherpackage/Parent7.class (100%) rename {unit => jbmc/unit}/java_bytecode/inherited_static_fields/otherpackage/Parent7.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/A.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/C.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/ExampleClasses.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/Extender.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/I.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/Implementor.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp (98%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/ClassUsingOpaqueStaticConstructor.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/ClassWithConstructors.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/ClassWithStaticConstructor.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/ClassWithoutConstructors.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/DummyClassLoadingOpaqueClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/ExampleConstructors.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/StaticClassUsingOpaqueStaticConstructor.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp (98%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericClasses.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$BoundedInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$DoubleBoundedInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$TwoElementInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/C.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClassGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric$InnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst2.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed1.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed2.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenericUninst.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplements.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface2.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterfaceGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Generic.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Generic.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericArray.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicit.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicitAndExplicit.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitAndExplicitGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase2$ExtendImplicitAndExplicit.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase2$ImplicitAndExplicitGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBase2.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBounds.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBoundsLower.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericBoundsUpper.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerGenericClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$InnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$SameGenericParamInnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$TwoParamInnerClass.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner$GenericInnerInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner$InnerInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$StaticInner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericFields.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericFields.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericFunctions.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericInterface.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/I.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericSpecialised.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericUnspec.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ImplementsMultipleInterfaces.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Int.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface_Copy.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface_Copy.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/NestedGenerics.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/NestedGenerics.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/NotGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$InnerEnum.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/ThreeHierarchy.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/class_bound.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/interface_bound.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp (98%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp (97%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp (97%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp (98%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp (98%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp (96%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp (97%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp (93%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp (97%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp (99%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LambdaInterfaces.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LocalLambdas.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/MemberLambdas.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/OuterMemberLambdas.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/StaticLambdas.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ArrayParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/DummyGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/LocalLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/MemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitive.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitiveArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReference.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReferenceArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGenericArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/SimpleLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/StaticLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ArrayParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/DummyGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/LocalLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/MemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitive.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitiveArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReference.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReferenceArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGenericArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/SimpleLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/StaticLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ArrayParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/DummyGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/LocalLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/MemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitive.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitiveArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReference.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReferenceArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGenericArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/SimpleLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/StaticLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ArrayParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/DummyGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/LocalLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/MemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas$Inner.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ParameterLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitive.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitiveArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReference.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReferenceArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGeneric.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGenericArray.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/SimpleLambda.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/StaticLambdas.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/readme.md (100%) rename {unit => jbmc/unit}/java_bytecode/java_object_factory/gen_nondet_string_init.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_replace_nondet/Main.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_replace_nondet/replace_nondet.cpp (98%) rename {unit => jbmc/unit}/java_bytecode/java_replace_nondet/test.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_types/erase_type_arguments.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_types/generic_type_index.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_types/java_generic_symbol_type.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_types/java_type_from_string.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_utils_test.cpp (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/A.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/B.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/C.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/D.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/E.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/O.class (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/test.java (100%) rename {unit => jbmc/unit}/java_bytecode/java_virtual_functions/virtual_functions.cpp (99%) rename {unit => jbmc/unit}/pointer-analysis/CustomVSATest.jar (100%) rename {unit => jbmc/unit}/pointer-analysis/CustomVSATest.java (100%) rename {unit => jbmc/unit}/pointer-analysis/custom_value_set_analysis.cpp (100%) rename {unit => jbmc/unit}/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp (100%) rename {unit => jbmc/unit}/solvers/refinement/string_refinement/dependency_graph.cpp (100%) rename {unit => jbmc/unit}/solvers/refinement/string_refinement/string_symbol_resolution.cpp (100%) rename {unit => jbmc/unit}/util/ParameterIndicesTest.class (100%) rename {unit => jbmc/unit}/util/ParameterIndicesTest.java (100%) rename {unit => jbmc/unit}/util/expr_iterator.cpp (100%) rename {unit => jbmc/unit}/util/has_subtype.cpp (100%) rename {unit => jbmc/unit}/util/parameter_indices.cpp (95%) rename {unit => jbmc/unit}/util/simplify_expr.cpp (100%) diff --git a/jbmc/unit/CMakeLists.txt b/jbmc/unit/CMakeLists.txt new file mode 100644 index 00000000000..afbe1c7f766 --- /dev/null +++ b/jbmc/unit/CMakeLists.txt @@ -0,0 +1,52 @@ +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(APPEND sources ${CBMC_SOURCE_DIR}/../unit/unit_tests.cpp) + +file(GLOB_RECURSE java-testing_utils "java-testing-utils/*.cpp" "java-testing-utils/*.h") + +list(REMOVE_ITEM sources + # Don't build + ${CMAKE_CURRENT_SOURCE_DIR}/sharing_map.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/elf_reader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/smt2_parser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/json.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cpp_parser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/osx_fat_reader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/unicode.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cpp_scanner.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/float_utils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ieee_float.cpp + + # Will be built into a separate library and linked + ${java-testing_utils} + + # Intended to fail to compile + ${CMAKE_CURRENT_SOURCE_DIR}/util/expr_cast/expr_undefined_casts.cpp +) + +add_subdirectory(java-testing-utils) + +add_executable(java-unit ${sources}) +target_include_directories(java-unit + PUBLIC + ${CBMC_BINARY_DIR} + ${CBMC_SOURCE_DIR} + ${CBMC_SOURCE_DIR}/../unit + ${CMAKE_CURRENT_SOURCE_DIR} +) +target_link_libraries(java-unit + java-testing-utils + testing-utils + ansi-c + solvers + goto-programs + goto-instrument-lib + cbmc-lib +) + +add_test( + NAME java-unit + COMMAND $ + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) +set_tests_properties(java-unit PROPERTIES LABELS "CORE;CBMC") diff --git a/jbmc/unit/Makefile b/jbmc/unit/Makefile new file mode 100644 index 00000000000..4614a36e024 --- /dev/null +++ b/jbmc/unit/Makefile @@ -0,0 +1,119 @@ +.PHONY: all cprover.dir jprover.dir testing-utils.dir java-testing-utils.dir test + +# Source files for test utilities +SRC = $(CPROVER_DIR)/unit/unit_tests.cpp \ + # Empty last line + +# Test source files +SRC += java_bytecode/goto-programs/class_hierarchy_output.cpp \ + java_bytecode/goto-programs/class_hierarchy_graph.cpp \ + java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp \ + java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp \ + java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp \ + java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp \ + java_bytecode/java_object_factory/gen_nondet_string_init.cpp \ + java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp \ + java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp \ + java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp \ + java_bytecode/java_types/erase_type_arguments.cpp \ + java_bytecode/java_types/generic_type_index.cpp \ + java_bytecode/java_types/java_generic_symbol_type.cpp \ + java_bytecode/java_types/java_type_from_string.cpp \ + java_bytecode/java_utils_test.cpp \ + java_bytecode/inherited_static_fields/inherited_static_fields.cpp \ + pointer-analysis/custom_value_set_analysis.cpp \ + solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp \ + solvers/refinement/string_refinement/dependency_graph.cpp \ + solvers/refinement/string_refinement/string_symbol_resolution.cpp \ + util/expr_iterator.cpp \ + util/has_subtype.cpp \ + util/parameter_indices.cpp \ + util/simplify_expr.cpp \ + java_bytecode/java_virtual_functions/virtual_functions.cpp \ + java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp \ + # Empty last line + +INCLUDES= -I ../src/ -I. -I $(CPROVER_DIR)/src -I $(CPROVER_DIR)/unit + +include ../src/config.inc +include $(CPROVER_DIR)/src/config.inc +include $(CPROVER_DIR)/src/common + +cprover.dir: + $(MAKE) $(MAKEARGS) -C $(CPROVER_DIR)/src + +jprover.dir: + $(MAKE) $(MAKEARGS) -C ../src + +cprover-testing-utils.dir: + $(MAKE) $(MAKEARGS) -C $(CPROVER_DIR)/unit/testing-utils + +java-testing-utils.dir: + $(MAKE) $(MAKEARGS) -C java-testing-utils + +# We need to link bmc.o to the unit test, so here's everything it depends on... +BMC_DEPS =$(CPROVER_DIR)/src/cbmc/all_properties$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/bmc$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/bmc_cover$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/bv_cbmc$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/cbmc_dimacs$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/cbmc_languages$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/cbmc_parse_options$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/cbmc_solvers$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/counterexample_beautification$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/fault_localization$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/show_vcc$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/symex_bmc$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/symex_coverage$(OBJEXT) \ + $(CPROVER_DIR)/src/cbmc/xml_interface$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/expr2jsil$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_convert$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_entry_point$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_internal_additions$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_language$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_lex.yy$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_parser$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_parse_tree$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_typecheck$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_types$(OBJEXT) \ + $(CPROVER_DIR)/src/jsil/jsil_y.tab$(OBJEXT) \ + # Empty last line + +CPROVER_LIBS =../src/java_bytecode/java_bytecode$(LIBEXT) \ + ../src/miniz/miniz$(OBJEXT) \ + $(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \ + $(CPROVER_DIR)/src/cpp/cpp$(LIBEXT) \ + $(CPROVER_DIR)/src/json/json$(LIBEXT) \ + $(CPROVER_DIR)/src/linking/linking$(LIBEXT) \ + $(CPROVER_DIR)/src/util/util$(LIBEXT) \ + $(CPROVER_DIR)/src/big-int/big-int$(LIBEXT) \ + $(CPROVER_DIR)/src/goto-programs/goto-programs$(LIBEXT) \ + $(CPROVER_DIR)/src/goto-instrument/goto-instrument$(LIBEXT) \ + $(CPROVER_DIR)/src/pointer-analysis/pointer-analysis$(LIBEXT) \ + $(CPROVER_DIR)/src/langapi/langapi$(LIBEXT) \ + $(CPROVER_DIR)/src/assembler/assembler$(LIBEXT) \ + $(CPROVER_DIR)/src/analyses/analyses$(LIBEXT) \ + $(CPROVER_DIR)/src/solvers/solvers$(LIBEXT) \ + $(BMC_DEPS) \ + # Empty last line + +OBJ += $(CPROVER_LIBS) \ + $(CPROVER_DIR)/unit/testing-utils/testing-utils$(LIBEXT) \ + java-testing-utils/java-testing-utils$(LIBEXT) + +TESTS = unit_tests$(EXEEXT) \ + # Empty last line + +CLEANFILES = $(TESTS) + +all: cprover.dir cprover-testing-utils.dir jprover.dir java-testing-utils.dir + $(MAKE) $(MAKEARGS) $(TESTS) + +test: all + $(foreach test,$(TESTS), (echo Running: $(test); ./$(test)) &&) true + + +############################################################################### + +unit_tests$(EXEEXT): $(OBJ) + $(LINKBIN) diff --git a/jbmc/unit/java-testing-utils/CMakeLists.txt b/jbmc/unit/java-testing-utils/CMakeLists.txt new file mode 100644 index 00000000000..0dcba22e1a1 --- /dev/null +++ b/jbmc/unit/java-testing-utils/CMakeLists.txt @@ -0,0 +1,11 @@ +file(GLOB_RECURSE sources "*.cpp" "*.h") +add_library(java-testing-utils ${sources}) +target_link_libraries(java-testing-utils + util + java_bytecode +) +target_include_directories(java-testing-utils + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CBMC_SOURCE_DIR}/../unit +) diff --git a/jbmc/unit/java-testing-utils/Makefile b/jbmc/unit/java-testing-utils/Makefile new file mode 100644 index 00000000000..b564c11ad13 --- /dev/null +++ b/jbmc/unit/java-testing-utils/Makefile @@ -0,0 +1,20 @@ +SRC = \ + load_java_class.cpp \ + require_goto_statements.cpp \ + require_parse_tree.cpp \ + require_type.cpp \ + # Empty last line (please keep above list sorted!) + +INCLUDES = -I .. -I . -I ../../src -I ../$(CPROVER_DIR)/src -I ../$(CPROVER_DIR)/unit + +include ../../src/config.inc +include ../$(CPROVER_DIR)/src/config.inc +include ../$(CPROVER_DIR)/src/common + +CLEANFILES = java-testing-utils$(LIBEXT) + +.PHONY: all +all: java-testing-utils$(LIBEXT) + +java-testing-utils$(LIBEXT): $(OBJ) + $(LINKLIB) diff --git a/unit/testing-utils/load_java_class.cpp b/jbmc/unit/java-testing-utils/load_java_class.cpp similarity index 99% rename from unit/testing-utils/load_java_class.cpp rename to jbmc/unit/java-testing-utils/load_java_class.cpp index 7beda3ec61e..c6d9c1553fb 100644 --- a/unit/testing-utils/load_java_class.cpp +++ b/jbmc/unit/java-testing-utils/load_java_class.cpp @@ -7,7 +7,8 @@ \*******************************************************************/ #include "load_java_class.h" -#include "free_form_cmdline.h" + +#include #include #include diff --git a/unit/testing-utils/load_java_class.h b/jbmc/unit/java-testing-utils/load_java_class.h similarity index 100% rename from unit/testing-utils/load_java_class.h rename to jbmc/unit/java-testing-utils/load_java_class.h diff --git a/unit/testing-utils/require_goto_statements.cpp b/jbmc/unit/java-testing-utils/require_goto_statements.cpp similarity index 99% rename from unit/testing-utils/require_goto_statements.cpp rename to jbmc/unit/java-testing-utils/require_goto_statements.cpp index 2b265c99736..77a91721713 100644 --- a/unit/testing-utils/require_goto_statements.cpp +++ b/jbmc/unit/java-testing-utils/require_goto_statements.cpp @@ -7,7 +7,8 @@ \*******************************************************************/ #include "require_goto_statements.h" -#include "catch.hpp" + +#include #include #include diff --git a/unit/testing-utils/require_goto_statements.h b/jbmc/unit/java-testing-utils/require_goto_statements.h similarity index 100% rename from unit/testing-utils/require_goto_statements.h rename to jbmc/unit/java-testing-utils/require_goto_statements.h diff --git a/unit/testing-utils/require_parse_tree.cpp b/jbmc/unit/java-testing-utils/require_parse_tree.cpp similarity index 100% rename from unit/testing-utils/require_parse_tree.cpp rename to jbmc/unit/java-testing-utils/require_parse_tree.cpp diff --git a/unit/testing-utils/require_parse_tree.h b/jbmc/unit/java-testing-utils/require_parse_tree.h similarity index 97% rename from unit/testing-utils/require_parse_tree.h rename to jbmc/unit/java-testing-utils/require_parse_tree.h index 589c8d9ad8a..526a5da919f 100644 --- a/unit/testing-utils/require_parse_tree.h +++ b/jbmc/unit/java-testing-utils/require_parse_tree.h @@ -13,7 +13,8 @@ #define CPROVER_JAVA_TESTING_UTILS_REQUIRE_PARSE_TREE_H #include -#include "catch.hpp" + +#include // NOLINTNEXTLINE(readability/namespace) namespace require_parse_tree diff --git a/unit/testing-utils/require_type.cpp b/jbmc/unit/java-testing-utils/require_type.cpp similarity index 100% rename from unit/testing-utils/require_type.cpp rename to jbmc/unit/java-testing-utils/require_type.cpp diff --git a/unit/testing-utils/require_type.h b/jbmc/unit/java-testing-utils/require_type.h similarity index 100% rename from unit/testing-utils/require_type.h rename to jbmc/unit/java-testing-utils/require_type.h diff --git a/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp b/jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp similarity index 99% rename from unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp rename to jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp index 3c44a323eee..a96f50fc7b0 100644 --- a/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp +++ b/jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include #include SCENARIO( diff --git a/unit/java_bytecode/expr2java.cpp b/jbmc/unit/java_bytecode/expr2java.cpp similarity index 100% rename from unit/java_bytecode/expr2java.cpp rename to jbmc/unit/java_bytecode/expr2java.cpp diff --git a/unit/goto-programs/HierarchyTest.class b/jbmc/unit/java_bytecode/goto-programs/HierarchyTest.class similarity index 100% rename from unit/goto-programs/HierarchyTest.class rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTest.class diff --git a/unit/goto-programs/HierarchyTest.java b/jbmc/unit/java_bytecode/goto-programs/HierarchyTest.java similarity index 100% rename from unit/goto-programs/HierarchyTest.java rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTest.java diff --git a/unit/goto-programs/HierarchyTestChild1.class b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestChild1.class similarity index 100% rename from unit/goto-programs/HierarchyTestChild1.class rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestChild1.class diff --git a/unit/goto-programs/HierarchyTestChild2.class b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestChild2.class similarity index 100% rename from unit/goto-programs/HierarchyTestChild2.class rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestChild2.class diff --git a/unit/goto-programs/HierarchyTestGrandchild.class b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestGrandchild.class similarity index 100% rename from unit/goto-programs/HierarchyTestGrandchild.class rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestGrandchild.class diff --git a/unit/goto-programs/HierarchyTestInterface1.class b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface1.class similarity index 100% rename from unit/goto-programs/HierarchyTestInterface1.class rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface1.class diff --git a/unit/goto-programs/HierarchyTestInterface1.java b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface1.java similarity index 100% rename from unit/goto-programs/HierarchyTestInterface1.java rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface1.java diff --git a/unit/goto-programs/HierarchyTestInterface2.class b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface2.class similarity index 100% rename from unit/goto-programs/HierarchyTestInterface2.class rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface2.class diff --git a/unit/goto-programs/HierarchyTestInterface2.java b/jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface2.java similarity index 100% rename from unit/goto-programs/HierarchyTestInterface2.java rename to jbmc/unit/java_bytecode/goto-programs/HierarchyTestInterface2.java diff --git a/unit/goto-programs/VirtualFunctionsTestChild1.class b/jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestChild1.class similarity index 100% rename from unit/goto-programs/VirtualFunctionsTestChild1.class rename to jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestChild1.class diff --git a/unit/goto-programs/VirtualFunctionsTestChild2.class b/jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestChild2.class similarity index 100% rename from unit/goto-programs/VirtualFunctionsTestChild2.class rename to jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestChild2.class diff --git a/unit/goto-programs/VirtualFunctionsTestGrandchild.class b/jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestGrandchild.class similarity index 100% rename from unit/goto-programs/VirtualFunctionsTestGrandchild.class rename to jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestGrandchild.class diff --git a/unit/goto-programs/VirtualFunctionsTestParent.class b/jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestParent.class similarity index 100% rename from unit/goto-programs/VirtualFunctionsTestParent.class rename to jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestParent.class diff --git a/unit/goto-programs/VirtualFunctionsTestParent.java b/jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestParent.java similarity index 100% rename from unit/goto-programs/VirtualFunctionsTestParent.java rename to jbmc/unit/java_bytecode/goto-programs/VirtualFunctionsTestParent.java diff --git a/unit/goto-programs/class_hierarchy_graph.cpp b/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_graph.cpp similarity index 92% rename from unit/goto-programs/class_hierarchy_graph.cpp rename to jbmc/unit/java_bytecode/goto-programs/class_hierarchy_graph.cpp index db3f06699db..ec41314eb92 100644 --- a/unit/goto-programs/class_hierarchy_graph.cpp +++ b/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_graph.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include #include @@ -31,7 +31,7 @@ SCENARIO( "[core][goto-programs][class_hierarchy_graph]") { symbol_tablet symbol_table = - load_java_class("HierarchyTest", "goto-programs/"); + load_java_class("HierarchyTest", "./java_bytecode/goto-programs/"); class_hierarchy_grapht hierarchy; hierarchy.populate(symbol_table); diff --git a/unit/goto-programs/class_hierarchy_output.cpp b/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_output.cpp similarity index 94% rename from unit/goto-programs/class_hierarchy_output.cpp rename to jbmc/unit/java_bytecode/goto-programs/class_hierarchy_output.cpp index 3cd6c751a14..75970716f91 100644 --- a/unit/goto-programs/class_hierarchy_output.cpp +++ b/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_output.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include #include @@ -40,7 +40,7 @@ SCENARIO( "[core][goto-programs][class_hierarchy]") { symbol_tablet symbol_table = - load_java_class("HierarchyTest", "goto-programs/"); + load_java_class("HierarchyTest", "./java_bytecode/goto-programs/"); class_hierarchyt hierarchy; std::stringstream output_stream; diff --git a/unit/goto-programs/remove_virtual_functions_without_fallback.cpp b/jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp similarity index 98% rename from unit/goto-programs/remove_virtual_functions_without_fallback.cpp rename to jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp index fae1b3dbc6a..fb294c1d148 100644 --- a/unit/goto-programs/remove_virtual_functions_without_fallback.cpp +++ b/jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp @@ -8,7 +8,7 @@ \*******************************************************************/ #include -#include +#include #include #include @@ -114,8 +114,8 @@ SCENARIO( "Remove virtual functions without a fallback function", "[core][goto-programs][remove_virtual_functions]") { - symbol_tablet symbol_table = - load_java_class("VirtualFunctionsTestParent", "goto-programs/"); + symbol_tablet symbol_table = load_java_class( + "VirtualFunctionsTestParent", "./java_bytecode/goto-programs/"); namespacet ns(symbol_table); goto_programt test_program; diff --git a/unit/goto-programs/goto_program_generics/GenericBases.java b/jbmc/unit/java_bytecode/goto_program_generics/GenericBases.java similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericBases.java rename to jbmc/unit/java_bytecode/goto_program_generics/GenericBases.java diff --git a/unit/goto-programs/goto_program_generics/GenericFieldOpaque.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFieldOpaque.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFieldOpaque.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFieldOpaque.class diff --git a/unit/goto-programs/goto_program_generics/GenericFieldUnsupported.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFieldUnsupported.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFieldUnsupported.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFieldUnsupported.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter$Outer$InnerClass.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericInnerOuter$Outer$InnerClass.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter$Outer$InnerClass.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericInnerOuter$Outer$InnerClass.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter$Outer.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericInnerOuter$Outer.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter$Outer.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericInnerOuter$Outer.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericInnerOuter.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericInnerOuter.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericMethodParameter.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericMethodParameter.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericMethodParameter.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericMethodParameter.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericMethodUninstantiatedParameter.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericMethodUninstantiatedParameter.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericMethodUninstantiatedParameter.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericMethodUninstantiatedParameter.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericRewriteParameter$A.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericRewriteParameter$A.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericRewriteParameter$A.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericRewriteParameter$A.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$GenericRewriteParameter.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericRewriteParameter.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$GenericRewriteParameter.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$GenericRewriteParameter.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$MultipleGenericFields.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$MultipleGenericFields.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$MultipleGenericFields.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$MultipleGenericFields.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$NestedGenericFields.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$NestedGenericFields.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$NestedGenericFields.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$NestedGenericFields.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$PairGenericField.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$PairGenericField.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$PairGenericField.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$PairGenericField.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields$SimpleGenericField.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields$SimpleGenericField.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields$SimpleGenericField.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields$SimpleGenericField.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields.class b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields.class similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields.class rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields.class diff --git a/unit/goto-programs/goto_program_generics/GenericFields.java b/jbmc/unit/java_bytecode/goto_program_generics/GenericFields.java similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericFields.java rename to jbmc/unit/java_bytecode/goto_program_generics/GenericFields.java diff --git a/unit/goto-programs/goto_program_generics/GenericHelper.java b/jbmc/unit/java_bytecode/goto_program_generics/GenericHelper.java similarity index 100% rename from unit/goto-programs/goto_program_generics/GenericHelper.java rename to jbmc/unit/java_bytecode/goto_program_generics/GenericHelper.java diff --git a/unit/goto-programs/goto_program_generics/IWrapper.class b/jbmc/unit/java_bytecode/goto_program_generics/IWrapper.class similarity index 100% rename from unit/goto-programs/goto_program_generics/IWrapper.class rename to jbmc/unit/java_bytecode/goto_program_generics/IWrapper.class diff --git a/unit/goto-programs/goto_program_generics/InterfacePairWrapper.class b/jbmc/unit/java_bytecode/goto_program_generics/InterfacePairWrapper.class similarity index 100% rename from unit/goto-programs/goto_program_generics/InterfacePairWrapper.class rename to jbmc/unit/java_bytecode/goto_program_generics/InterfacePairWrapper.class diff --git a/unit/goto-programs/goto_program_generics/InterfaceWrapper.class b/jbmc/unit/java_bytecode/goto_program_generics/InterfaceWrapper.class similarity index 100% rename from unit/goto-programs/goto_program_generics/InterfaceWrapper.class rename to jbmc/unit/java_bytecode/goto_program_generics/InterfaceWrapper.class diff --git a/unit/goto-programs/goto_program_generics/InterfacesImplementation.class b/jbmc/unit/java_bytecode/goto_program_generics/InterfacesImplementation.class similarity index 100% rename from unit/goto-programs/goto_program_generics/InterfacesImplementation.class rename to jbmc/unit/java_bytecode/goto_program_generics/InterfacesImplementation.class diff --git a/unit/goto-programs/goto_program_generics/PairWrapper.class b/jbmc/unit/java_bytecode/goto_program_generics/PairWrapper.class similarity index 100% rename from unit/goto-programs/goto_program_generics/PairWrapper.class rename to jbmc/unit/java_bytecode/goto_program_generics/PairWrapper.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerInst$Inner.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerInst$Inner.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerInst$Inner.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerInst$Inner.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerInst$InnerGen.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerInst$InnerGen.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerInst$InnerGen.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerInst$InnerGen.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerInst.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerInst.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerInst.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerInst.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerUninst$Inner.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst$Inner.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerUninst$Inner.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst$Inner.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerUninst$InnerGen.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst$InnerGen.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerUninst$InnerGen.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst$InnerGen.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerUninst$InnerThree.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst$InnerThree.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerUninst$InnerThree.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst$InnerThree.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerUninst.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerUninst.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninst.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInnerUninstTest.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninstTest.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInnerUninstTest.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInnerUninstTest.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInst.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInst.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInst.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInst.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInst2.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInst2.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInst2.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInst2.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassInst3.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassInst3.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassInst3.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassInst3.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassMixed.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassMixed.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassMixed.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassMixed.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassMixedTest.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassMixedTest.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassMixedTest.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassMixedTest.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassOpaque.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassOpaque.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassOpaque.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassOpaque.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassUninst.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassUninst.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassUninst.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassUninst.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassUninstTest.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassUninstTest.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassUninstTest.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassUninstTest.class diff --git a/unit/goto-programs/goto_program_generics/SuperclassUnsupported.class b/jbmc/unit/java_bytecode/goto_program_generics/SuperclassUnsupported.class similarity index 100% rename from unit/goto-programs/goto_program_generics/SuperclassUnsupported.class rename to jbmc/unit/java_bytecode/goto_program_generics/SuperclassUnsupported.class diff --git a/unit/goto-programs/goto_program_generics/UnsupportedWrapper1.class b/jbmc/unit/java_bytecode/goto_program_generics/UnsupportedWrapper1.class similarity index 100% rename from unit/goto-programs/goto_program_generics/UnsupportedWrapper1.class rename to jbmc/unit/java_bytecode/goto_program_generics/UnsupportedWrapper1.class diff --git a/unit/goto-programs/goto_program_generics/UnsupportedWrapper2.class b/jbmc/unit/java_bytecode/goto_program_generics/UnsupportedWrapper2.class similarity index 100% rename from unit/goto-programs/goto_program_generics/UnsupportedWrapper2.class rename to jbmc/unit/java_bytecode/goto_program_generics/UnsupportedWrapper2.class diff --git a/unit/goto-programs/goto_program_generics/Wrapper.class b/jbmc/unit/java_bytecode/goto_program_generics/Wrapper.class similarity index 100% rename from unit/goto-programs/goto_program_generics/Wrapper.class rename to jbmc/unit/java_bytecode/goto_program_generics/Wrapper.class diff --git a/unit/goto-programs/goto_program_generics/generic_bases_test.cpp b/jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp similarity index 96% rename from unit/goto-programs/goto_program_generics/generic_bases_test.cpp rename to jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp index e29fe0d9223..389e1f43056 100644 --- a/unit/goto-programs/goto_program_generics/generic_bases_test.cpp +++ b/jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp @@ -6,10 +6,10 @@ \*******************************************************************/ #include -#include -#include +#include +#include #include -#include +#include #include // NOTE: To inspect these tests at any point, use expr2java. @@ -27,7 +27,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassInst", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassInst.foo"); WHEN("The method input argument is created in the entry point function") @@ -68,7 +68,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassInst2", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassInst2.foo"); WHEN("The method input argument is created in the entry point function") @@ -99,7 +99,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassInst3", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassInst3.foo"); WHEN("The method input argument is created in the entry point function") @@ -142,7 +142,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassUninstTest", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassUninstTest.foo"); WHEN("The method input argument is created in the entry point function") @@ -187,7 +187,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassMixedTest", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassMixedTest.foo"); WHEN("The method input argument is created in the entry point function") @@ -240,7 +240,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassInnerInst", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassInnerInst.foo"); WHEN("The method input argument is created in the entry point function") @@ -309,7 +309,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassInnerUninstTest", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassInnerUninstTest.foo"); WHEN("The method input argument is created in the entry point function") @@ -425,7 +425,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassUnsupported", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassUnsupported.foo"); THEN("The struct for UnsupportedWrapper1 is complete and non-generic") @@ -474,7 +474,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "SuperclassOpaque", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "SuperclassOpaque.foo"); THEN("The struct for OpaqueWrapper is incomplete and not-generic") diff --git a/unit/goto-programs/goto_program_generics/generic_parameters_test.cpp b/jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp similarity index 97% rename from unit/goto-programs/goto_program_generics/generic_parameters_test.cpp rename to jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp index 731b577423c..14b61f44c01 100644 --- a/unit/goto-programs/goto_program_generics/generic_parameters_test.cpp +++ b/jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp @@ -6,10 +6,10 @@ \*******************************************************************/ #include -#include -#include +#include +#include #include -#include +#include #include // NOTE: To inspect these tests at any point, use expr2java. @@ -25,7 +25,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$SimpleGenericField", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$SimpleGenericField.foo"); WHEN("The method input argument is created in the entry point function") @@ -80,7 +80,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$MultipleGenericFields", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$MultipleGenericFields.foo"); WHEN("The method input argument is created in the entry point function") @@ -154,7 +154,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$NestedGenericFields", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$NestedGenericFields.foo"); WHEN("The method input argument is created in the entry point function") @@ -205,7 +205,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$PairGenericField", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$PairGenericField.foo"); WHEN("The method input argument is created in the entry point function") @@ -259,7 +259,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$GenericMethodParameter", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$GenericMethodParameter.foo"); WHEN("The method input argument is created in the entry point function") @@ -308,7 +308,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$GenericMethodUninstantiatedParameter", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$GenericMethodUninstantiatedParameter.foo_unspec"); WHEN("The method input argument is created in the entry point function") @@ -357,7 +357,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$GenericInnerOuter", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$GenericInnerOuter.foo"); WHEN("The method input argument is created in the entry point function") @@ -420,7 +420,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFields$GenericRewriteParameter", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFields$GenericRewriteParameter.foo"); WHEN("The method input argument is created in the entry point function") @@ -500,7 +500,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFieldUnsupported", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFieldUnsupported.foo"); THEN("The struct for UnsupportedWrapper2 is complete and non-generic") @@ -564,7 +564,7 @@ SCENARIO( { const symbol_tablet &symbol_table = load_java_class( "GenericFieldOpaque", - "./goto-programs/goto_program_generics", + "./java_bytecode/goto_program_generics", "GenericFieldOpaque.foo"); THEN("The struct for OpaqueWrapper is incomplete and not-generic") diff --git a/unit/java_bytecode/inherited_static_fields/Parent1.class b/jbmc/unit/java_bytecode/inherited_static_fields/Parent1.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Parent1.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Parent1.class diff --git a/unit/java_bytecode/inherited_static_fields/Parent6.class b/jbmc/unit/java_bytecode/inherited_static_fields/Parent6.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Parent6.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Parent6.class diff --git a/unit/java_bytecode/inherited_static_fields/Parent8.class b/jbmc/unit/java_bytecode/inherited_static_fields/Parent8.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Parent8.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Parent8.class diff --git a/unit/java_bytecode/inherited_static_fields/Parent9.class b/jbmc/unit/java_bytecode/inherited_static_fields/Parent9.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Parent9.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Parent9.class diff --git a/unit/java_bytecode/inherited_static_fields/StaticInterface2.class b/jbmc/unit/java_bytecode/inherited_static_fields/StaticInterface2.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/StaticInterface2.class rename to jbmc/unit/java_bytecode/inherited_static_fields/StaticInterface2.class diff --git a/unit/java_bytecode/inherited_static_fields/StaticInterface7.class b/jbmc/unit/java_bytecode/inherited_static_fields/StaticInterface7.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/StaticInterface7.class rename to jbmc/unit/java_bytecode/inherited_static_fields/StaticInterface7.class diff --git a/unit/java_bytecode/inherited_static_fields/StaticInterface9.class b/jbmc/unit/java_bytecode/inherited_static_fields/StaticInterface9.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/StaticInterface9.class rename to jbmc/unit/java_bytecode/inherited_static_fields/StaticInterface9.class diff --git a/unit/java_bytecode/inherited_static_fields/Test1.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test1.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test1.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test1.class diff --git a/unit/java_bytecode/inherited_static_fields/Test1.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test1.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test1.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test1.java diff --git a/unit/java_bytecode/inherited_static_fields/Test2.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test2.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test2.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test2.class diff --git a/unit/java_bytecode/inherited_static_fields/Test2.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test2.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test2.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test2.java diff --git a/unit/java_bytecode/inherited_static_fields/Test3.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test3.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test3.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test3.class diff --git a/unit/java_bytecode/inherited_static_fields/Test3.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test3.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test3.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test3.java diff --git a/unit/java_bytecode/inherited_static_fields/Test4.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test4.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test4.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test4.class diff --git a/unit/java_bytecode/inherited_static_fields/Test4.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test4.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test4.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test4.java diff --git a/unit/java_bytecode/inherited_static_fields/Test5.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test5.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test5.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test5.class diff --git a/unit/java_bytecode/inherited_static_fields/Test5.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test5.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test5.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test5.java diff --git a/unit/java_bytecode/inherited_static_fields/Test6.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test6.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test6.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test6.class diff --git a/unit/java_bytecode/inherited_static_fields/Test6.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test6.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test6.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test6.java diff --git a/unit/java_bytecode/inherited_static_fields/Test7.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test7.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test7.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test7.class diff --git a/unit/java_bytecode/inherited_static_fields/Test7.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test7.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test7.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test7.java diff --git a/unit/java_bytecode/inherited_static_fields/Test8.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test8.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test8.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test8.class diff --git a/unit/java_bytecode/inherited_static_fields/Test8.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test8.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test8.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test8.java diff --git a/unit/java_bytecode/inherited_static_fields/Test9.class b/jbmc/unit/java_bytecode/inherited_static_fields/Test9.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test9.class rename to jbmc/unit/java_bytecode/inherited_static_fields/Test9.class diff --git a/unit/java_bytecode/inherited_static_fields/Test9.java b/jbmc/unit/java_bytecode/inherited_static_fields/Test9.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/Test9.java rename to jbmc/unit/java_bytecode/inherited_static_fields/Test9.java diff --git a/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp b/jbmc/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp similarity index 99% rename from unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp rename to jbmc/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp index 16fb06aec81..0d3aff891b3 100644 --- a/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp +++ b/jbmc/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include #include diff --git a/unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.class b/jbmc/unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.class similarity index 100% rename from unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.class rename to jbmc/unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.class diff --git a/unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.java b/jbmc/unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.java similarity index 100% rename from unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.java rename to jbmc/unit/java_bytecode/inherited_static_fields/otherpackage/Parent7.java diff --git a/unit/java_bytecode/java_bytecode_convert_class/A.class b/jbmc/unit/java_bytecode/java_bytecode_convert_class/A.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_class/A.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/A.class diff --git a/unit/java_bytecode/java_bytecode_convert_class/C.class b/jbmc/unit/java_bytecode/java_bytecode_convert_class/C.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_class/C.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/C.class diff --git a/unit/java_bytecode/java_bytecode_convert_class/ExampleClasses.java b/jbmc/unit/java_bytecode/java_bytecode_convert_class/ExampleClasses.java similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_class/ExampleClasses.java rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/ExampleClasses.java diff --git a/unit/java_bytecode/java_bytecode_convert_class/Extender.class b/jbmc/unit/java_bytecode/java_bytecode_convert_class/Extender.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_class/Extender.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/Extender.class diff --git a/unit/java_bytecode/java_bytecode_convert_class/I.class b/jbmc/unit/java_bytecode/java_bytecode_convert_class/I.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_class/I.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/I.class diff --git a/unit/java_bytecode/java_bytecode_convert_class/Implementor.class b/jbmc/unit/java_bytecode/java_bytecode_convert_class/Implementor.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_class/Implementor.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/Implementor.class diff --git a/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp similarity index 98% rename from unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp rename to jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp index 9f6aec433d1..59fe8de9e23 100644 --- a/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp @@ -16,7 +16,7 @@ #include -#include +#include SCENARIO("java_bytecode_convert_abstract_class", "[core][java_bytecode][java_bytecode_convert_class]") diff --git a/unit/java_bytecode/java_bytecode_convert_method/ClassUsingOpaqueStaticConstructor.class b/jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassUsingOpaqueStaticConstructor.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/ClassUsingOpaqueStaticConstructor.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassUsingOpaqueStaticConstructor.class diff --git a/unit/java_bytecode/java_bytecode_convert_method/ClassWithConstructors.class b/jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassWithConstructors.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/ClassWithConstructors.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassWithConstructors.class diff --git a/unit/java_bytecode/java_bytecode_convert_method/ClassWithStaticConstructor.class b/jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassWithStaticConstructor.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/ClassWithStaticConstructor.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassWithStaticConstructor.class diff --git a/unit/java_bytecode/java_bytecode_convert_method/ClassWithoutConstructors.class b/jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassWithoutConstructors.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/ClassWithoutConstructors.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/ClassWithoutConstructors.class diff --git a/unit/java_bytecode/java_bytecode_convert_method/DummyClassLoadingOpaqueClass.class b/jbmc/unit/java_bytecode/java_bytecode_convert_method/DummyClassLoadingOpaqueClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/DummyClassLoadingOpaqueClass.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/DummyClassLoadingOpaqueClass.class diff --git a/unit/java_bytecode/java_bytecode_convert_method/ExampleConstructors.java b/jbmc/unit/java_bytecode/java_bytecode_convert_method/ExampleConstructors.java similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/ExampleConstructors.java rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/ExampleConstructors.java diff --git a/unit/java_bytecode/java_bytecode_convert_method/StaticClassUsingOpaqueStaticConstructor.class b/jbmc/unit/java_bytecode/java_bytecode_convert_method/StaticClassUsingOpaqueStaticConstructor.class similarity index 100% rename from unit/java_bytecode/java_bytecode_convert_method/StaticClassUsingOpaqueStaticConstructor.class rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/StaticClassUsingOpaqueStaticConstructor.class diff --git a/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp similarity index 98% rename from unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp index 57be6d8a250..8583977a748 100644 --- a/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp @@ -15,8 +15,8 @@ #include -#include -#include +#include +#include struct test_datat { diff --git a/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp rename to jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp index 57233930ac7..3a5d42918d0 100644 --- a/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp @@ -7,10 +7,10 @@ \*******************************************************************/ #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericClasses.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericClasses.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericClasses.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericClasses.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$BoundedInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$BoundedInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$BoundedInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$BoundedInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$DoubleBoundedInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$DoubleBoundedInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$DoubleBoundedInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$DoubleBoundedInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$TwoElementInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$TwoElementInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$TwoElementInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses$TwoElementInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/BoundedGenericInnerClasses.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/C.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/C.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/C.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/C.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClassGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClassGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClassGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass$InnerClassGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric$InnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric$InnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric$InnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric$InnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ContainsInnerClassGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst2.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst2.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst2.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst2.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed1.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed1.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed1.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed1.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed2.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed2.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed2.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericMixed2.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericUninst.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericUninst.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericUninst.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericUninst.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/DerivedGenerics.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplements.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplements.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplements.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplements.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface2.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface2.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface2.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterface2.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterfaceGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterfaceGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterfaceGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ExtendsAndImplementsSameInterfaceGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/FunctionsWithGenerics.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Generic.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Generic.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Generic.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Generic.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Generic.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Generic.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Generic.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Generic.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericArray.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericArray.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericArray.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericArray.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicit.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicit.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicit.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicit.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicitAndExplicit.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicitAndExplicit.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicitAndExplicit.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ExtendImplicitAndExplicit.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitAndExplicitGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitAndExplicitGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitAndExplicitGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitAndExplicitGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase$ImplicitGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ExtendImplicitAndExplicit.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ExtendImplicitAndExplicit.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ExtendImplicitAndExplicit.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ExtendImplicitAndExplicit.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ImplicitAndExplicitGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ImplicitAndExplicitGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ImplicitAndExplicitGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2$ImplicitAndExplicitGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBase2.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBase2.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBounds.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBounds.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBounds.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBounds.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsLower.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsLower.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsLower.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsLower.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsUpper.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsUpper.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsUpper.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericBoundsUpper.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerGenericClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerGenericClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerGenericClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass$DoublyNestedInnerGenericClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$GenericInnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$InnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$InnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$InnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$InnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$SameGenericParamInnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$SameGenericParamInnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$SameGenericParamInnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$SameGenericParamInnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$TwoParamInnerClass.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$TwoParamInnerClass.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$TwoParamInnerClass.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses$TwoParamInnerClass.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithGenericInnerClasses.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner$GenericInnerInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner$GenericInnerInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner$GenericInnerInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner$GenericInnerInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$GenericInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner$InnerInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner$InnerInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner$InnerInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner$InnerInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$StaticInner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$StaticInner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$StaticInner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses$StaticInner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericClassWithInnerClasses.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericFields.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFields.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericFields.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFields.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericFields.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFields.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericFields.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFields.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericInterface.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericInterface.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericInterface.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericInterface.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/GenericTwoParam.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/I.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/I.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/I.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/I.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericSpecialised.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericSpecialised.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericSpecialised.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericSpecialised.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericUnspec.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericUnspec.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericUnspec.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ImplementsInterfaceGenericUnspec.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ImplementsMultipleInterfaces.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ImplementsMultipleInterfaces.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ImplementsMultipleInterfaces.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ImplementsMultipleInterfaces.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Int.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Int.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Int.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Int.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/InterfaceGeneric.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Copy.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/Interface_Implementation_Derived.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/NestedGenerics.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/NotGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/NotGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/NotGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/NotGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/RecursiveGeneric_Derived.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$InnerEnum.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$InnerEnum.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$InnerEnum.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$InnerEnum.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/ThreeHierarchy.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/ThreeHierarchy.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/ThreeHierarchy.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/ThreeHierarchy.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.java b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/WildcardGenericFunctions.java diff --git a/unit/java_bytecode/java_bytecode_parse_generics/class_bound.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/class_bound.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/class_bound.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/class_bound.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/interface_bound.class b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/interface_bound.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_generics/interface_bound.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/interface_bound.class diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp similarity index 98% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp index 7c8eb84bc38..f8d740b82e6 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_bounded_generic_inner_classes", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp index 471c896281d..4322a741845 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_derived_generic_class", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp index 777b0d78d3d..7a2845c648a 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_functions_with_generics", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp similarity index 97% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp index 2290733637e..fec2749f2e5 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_generic_array_class", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp similarity index 97% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp index cc5e540b7e0..9587507ebec 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_generic_class_one_param", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp index 666952b242a..47de0300e5b 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_generic_class_with_generic_inner_classes_fields", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp similarity index 98% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp index b90ad2b3c68..1c213fe788c 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_generic_class_with_inner_classes", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp similarity index 98% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp index d0c7916ad0b..817ebb40a07 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_generic_fields", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp index ed3d7554b9a..22a8d1f6b26 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_generic_functions", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp similarity index 96% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp index fc2c645e440..9d9ac6a6068 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp @@ -9,8 +9,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse generic superclass signature", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp similarity index 97% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp index cf49e8a9ba6..982b9c8bc74 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include SCENARIO( "parse_generic_wildcard", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp index 26201973561..e3e5cf657ce 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_nested_generics_fields", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp similarity index 93% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp index c4ae15fbb22..de4b66b5e1c 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include SCENARIO( "parse_recursive_generic_class", diff --git a/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp similarity index 97% rename from unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp index ae5d70318f5..7cbdd2f55ac 100644 --- a/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp @@ -7,8 +7,8 @@ \*******************************************************************/ #include -#include -#include +#include +#include SCENARIO( "parse_signature_descriptor_mismatch", diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp index f83dfc4341f..efbd4db1583 100644 --- a/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp @@ -9,9 +9,9 @@ #include #include -#include +#include #include -#include +#include SCENARIO( "Static lambdas in class symbol", diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp similarity index 99% rename from unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp index 5b6eb8a8ddf..c738dfdf6b5 100644 --- a/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp +++ b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.java b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdaAccessor.java diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/ExternalLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LambdaInterfaces.java b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LambdaInterfaces.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LambdaInterfaces.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LambdaInterfaces.java diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LocalLambdas.java b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LocalLambdas.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LocalLambdas.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/LocalLambdas.java diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/MemberLambdas.java b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/MemberLambdas.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/MemberLambdas.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/MemberLambdas.java diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/OuterMemberLambdas.java b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/OuterMemberLambdas.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/OuterMemberLambdas.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/OuterMemberLambdas.java diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/StaticLambdas.java b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/StaticLambdas.java similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/StaticLambdas.java rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/StaticLambdas.java diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ArrayParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ArrayParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ArrayParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ArrayParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/DummyGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/DummyGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/DummyGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/DummyGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/LocalLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/LocalLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/LocalLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/LocalLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/MemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/MemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/MemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/MemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/OuterMemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitive.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitive.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitive.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitive.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitiveArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitiveArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitiveArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaPrimitiveArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReference.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReference.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReference.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReference.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReferenceArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReferenceArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReferenceArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaReferenceArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGenericArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGenericArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGenericArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/ReturningLambdaSpecalisedGenericArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/SimpleLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/SimpleLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/SimpleLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/SimpleLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/StaticLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/StaticLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/StaticLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/eclipse_classes/StaticLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ArrayParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ArrayParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ArrayParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ArrayParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/DummyGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/DummyGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/DummyGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/DummyGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/LocalLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/LocalLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/LocalLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/LocalLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/MemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/MemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/MemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/MemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/OuterMemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitive.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitive.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitive.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitive.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitiveArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitiveArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitiveArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaPrimitiveArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReference.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReference.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReference.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReference.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReferenceArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReferenceArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReferenceArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaReferenceArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGenericArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGenericArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGenericArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/ReturningLambdaSpecalisedGenericArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/SimpleLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/SimpleLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/SimpleLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/SimpleLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/StaticLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/StaticLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/StaticLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/openjdk_8_classes/StaticLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ArrayParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ArrayParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ArrayParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ArrayParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/DummyGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/DummyGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/DummyGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/DummyGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/LocalLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/LocalLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/LocalLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/LocalLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/MemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/MemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/MemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/MemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/OuterMemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitive.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitive.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitive.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitive.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitiveArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitiveArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitiveArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaPrimitiveArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReference.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReference.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReference.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReference.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReferenceArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReferenceArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReferenceArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaReferenceArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGenericArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGenericArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGenericArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/ReturningLambdaSpecalisedGenericArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/SimpleLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/SimpleLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/SimpleLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/SimpleLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/StaticLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/StaticLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/StaticLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_8_classes/StaticLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ArrayParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ArrayParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ArrayParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ArrayParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/DummyGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/DummyGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/DummyGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/DummyGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/LocalLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/LocalLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/LocalLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/LocalLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/MemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/MemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/MemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/MemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas$Inner.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas$Inner.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas$Inner.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas$Inner.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/OuterMemberLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ParameterLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ParameterLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ParameterLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ParameterLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitive.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitive.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitive.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitive.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitiveArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitiveArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitiveArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaPrimitiveArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReference.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReference.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReference.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReference.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReferenceArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReferenceArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReferenceArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaReferenceArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGeneric.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGeneric.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGeneric.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGeneric.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGenericArray.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGenericArray.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGenericArray.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/ReturningLambdaSpecalisedGenericArray.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/SimpleLambda.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/SimpleLambda.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/SimpleLambda.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/SimpleLambda.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/StaticLambdas.class b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/StaticLambdas.class similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/StaticLambdas.class rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/oracle_9_classes/StaticLambdas.class diff --git a/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/readme.md b/jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/readme.md similarity index 100% rename from unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/readme.md rename to jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/lambda_examples/readme.md diff --git a/unit/java_bytecode/java_object_factory/gen_nondet_string_init.cpp b/jbmc/unit/java_bytecode/java_object_factory/gen_nondet_string_init.cpp similarity index 100% rename from unit/java_bytecode/java_object_factory/gen_nondet_string_init.cpp rename to jbmc/unit/java_bytecode/java_object_factory/gen_nondet_string_init.cpp diff --git a/unit/java_bytecode/java_replace_nondet/Main.class b/jbmc/unit/java_bytecode/java_replace_nondet/Main.class similarity index 100% rename from unit/java_bytecode/java_replace_nondet/Main.class rename to jbmc/unit/java_bytecode/java_replace_nondet/Main.class diff --git a/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp b/jbmc/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp similarity index 98% rename from unit/java_bytecode/java_replace_nondet/replace_nondet.cpp rename to jbmc/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp index 7c5ec5860c5..deea0406337 100644 --- a/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp +++ b/jbmc/unit/java_bytecode/java_replace_nondet/replace_nondet.cpp @@ -8,7 +8,7 @@ \*******************************************************************/ #include -#include +#include #include #include diff --git a/unit/java_bytecode/java_replace_nondet/test.java b/jbmc/unit/java_bytecode/java_replace_nondet/test.java similarity index 100% rename from unit/java_bytecode/java_replace_nondet/test.java rename to jbmc/unit/java_bytecode/java_replace_nondet/test.java diff --git a/unit/java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp b/jbmc/unit/java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp similarity index 100% rename from unit/java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp rename to jbmc/unit/java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp diff --git a/unit/java_bytecode/java_types/erase_type_arguments.cpp b/jbmc/unit/java_bytecode/java_types/erase_type_arguments.cpp similarity index 100% rename from unit/java_bytecode/java_types/erase_type_arguments.cpp rename to jbmc/unit/java_bytecode/java_types/erase_type_arguments.cpp diff --git a/unit/java_bytecode/java_types/generic_type_index.cpp b/jbmc/unit/java_bytecode/java_types/generic_type_index.cpp similarity index 100% rename from unit/java_bytecode/java_types/generic_type_index.cpp rename to jbmc/unit/java_bytecode/java_types/generic_type_index.cpp diff --git a/unit/java_bytecode/java_types/java_generic_symbol_type.cpp b/jbmc/unit/java_bytecode/java_types/java_generic_symbol_type.cpp similarity index 100% rename from unit/java_bytecode/java_types/java_generic_symbol_type.cpp rename to jbmc/unit/java_bytecode/java_types/java_generic_symbol_type.cpp diff --git a/unit/java_bytecode/java_types/java_type_from_string.cpp b/jbmc/unit/java_bytecode/java_types/java_type_from_string.cpp similarity index 100% rename from unit/java_bytecode/java_types/java_type_from_string.cpp rename to jbmc/unit/java_bytecode/java_types/java_type_from_string.cpp diff --git a/unit/java_bytecode/java_utils_test.cpp b/jbmc/unit/java_bytecode/java_utils_test.cpp similarity index 100% rename from unit/java_bytecode/java_utils_test.cpp rename to jbmc/unit/java_bytecode/java_utils_test.cpp diff --git a/unit/java_bytecode/java_virtual_functions/A.class b/jbmc/unit/java_bytecode/java_virtual_functions/A.class similarity index 100% rename from unit/java_bytecode/java_virtual_functions/A.class rename to jbmc/unit/java_bytecode/java_virtual_functions/A.class diff --git a/unit/java_bytecode/java_virtual_functions/B.class b/jbmc/unit/java_bytecode/java_virtual_functions/B.class similarity index 100% rename from unit/java_bytecode/java_virtual_functions/B.class rename to jbmc/unit/java_bytecode/java_virtual_functions/B.class diff --git a/unit/java_bytecode/java_virtual_functions/C.class b/jbmc/unit/java_bytecode/java_virtual_functions/C.class similarity index 100% rename from unit/java_bytecode/java_virtual_functions/C.class rename to jbmc/unit/java_bytecode/java_virtual_functions/C.class diff --git a/unit/java_bytecode/java_virtual_functions/D.class b/jbmc/unit/java_bytecode/java_virtual_functions/D.class similarity index 100% rename from unit/java_bytecode/java_virtual_functions/D.class rename to jbmc/unit/java_bytecode/java_virtual_functions/D.class diff --git a/unit/java_bytecode/java_virtual_functions/E.class b/jbmc/unit/java_bytecode/java_virtual_functions/E.class similarity index 100% rename from unit/java_bytecode/java_virtual_functions/E.class rename to jbmc/unit/java_bytecode/java_virtual_functions/E.class diff --git a/unit/java_bytecode/java_virtual_functions/O.class b/jbmc/unit/java_bytecode/java_virtual_functions/O.class similarity index 100% rename from unit/java_bytecode/java_virtual_functions/O.class rename to jbmc/unit/java_bytecode/java_virtual_functions/O.class diff --git a/unit/java_bytecode/java_virtual_functions/test.java b/jbmc/unit/java_bytecode/java_virtual_functions/test.java similarity index 100% rename from unit/java_bytecode/java_virtual_functions/test.java rename to jbmc/unit/java_bytecode/java_virtual_functions/test.java diff --git a/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp b/jbmc/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp similarity index 99% rename from unit/java_bytecode/java_virtual_functions/virtual_functions.cpp rename to jbmc/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp index c0565c31202..8a2760c96e7 100644 --- a/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp +++ b/jbmc/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include #include #include diff --git a/unit/pointer-analysis/CustomVSATest.jar b/jbmc/unit/pointer-analysis/CustomVSATest.jar similarity index 100% rename from unit/pointer-analysis/CustomVSATest.jar rename to jbmc/unit/pointer-analysis/CustomVSATest.jar diff --git a/unit/pointer-analysis/CustomVSATest.java b/jbmc/unit/pointer-analysis/CustomVSATest.java similarity index 100% rename from unit/pointer-analysis/CustomVSATest.java rename to jbmc/unit/pointer-analysis/CustomVSATest.java diff --git a/unit/pointer-analysis/custom_value_set_analysis.cpp b/jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp similarity index 100% rename from unit/pointer-analysis/custom_value_set_analysis.cpp rename to jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp diff --git a/unit/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp b/jbmc/unit/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp similarity index 100% rename from unit/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp rename to jbmc/unit/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp diff --git a/unit/solvers/refinement/string_refinement/dependency_graph.cpp b/jbmc/unit/solvers/refinement/string_refinement/dependency_graph.cpp similarity index 100% rename from unit/solvers/refinement/string_refinement/dependency_graph.cpp rename to jbmc/unit/solvers/refinement/string_refinement/dependency_graph.cpp diff --git a/unit/solvers/refinement/string_refinement/string_symbol_resolution.cpp b/jbmc/unit/solvers/refinement/string_refinement/string_symbol_resolution.cpp similarity index 100% rename from unit/solvers/refinement/string_refinement/string_symbol_resolution.cpp rename to jbmc/unit/solvers/refinement/string_refinement/string_symbol_resolution.cpp diff --git a/unit/util/ParameterIndicesTest.class b/jbmc/unit/util/ParameterIndicesTest.class similarity index 100% rename from unit/util/ParameterIndicesTest.class rename to jbmc/unit/util/ParameterIndicesTest.class diff --git a/unit/util/ParameterIndicesTest.java b/jbmc/unit/util/ParameterIndicesTest.java similarity index 100% rename from unit/util/ParameterIndicesTest.java rename to jbmc/unit/util/ParameterIndicesTest.java diff --git a/unit/util/expr_iterator.cpp b/jbmc/unit/util/expr_iterator.cpp similarity index 100% rename from unit/util/expr_iterator.cpp rename to jbmc/unit/util/expr_iterator.cpp diff --git a/unit/util/has_subtype.cpp b/jbmc/unit/util/has_subtype.cpp similarity index 100% rename from unit/util/has_subtype.cpp rename to jbmc/unit/util/has_subtype.cpp diff --git a/unit/util/parameter_indices.cpp b/jbmc/unit/util/parameter_indices.cpp similarity index 95% rename from unit/util/parameter_indices.cpp rename to jbmc/unit/util/parameter_indices.cpp index b2230a66dd7..f29f76f1c27 100644 --- a/unit/util/parameter_indices.cpp +++ b/jbmc/unit/util/parameter_indices.cpp @@ -7,7 +7,7 @@ \*******************************************************************/ #include -#include +#include #include void check_consistency(const symbolt &symbol) diff --git a/unit/util/simplify_expr.cpp b/jbmc/unit/util/simplify_expr.cpp similarity index 100% rename from unit/util/simplify_expr.cpp rename to jbmc/unit/util/simplify_expr.cpp diff --git a/unit/CMakeLists.txt b/unit/CMakeLists.txt index 300f6c08fef..9f57805af26 100644 --- a/unit/CMakeLists.txt +++ b/unit/CMakeLists.txt @@ -40,7 +40,6 @@ target_link_libraries( testing-utils ansi-c solvers - java_bytecode goto-programs goto-instrument-lib cbmc-lib diff --git a/unit/Makefile b/unit/Makefile index 26419273570..407f29f812a 100644 --- a/unit/Makefile +++ b/unit/Makefile @@ -13,54 +13,26 @@ SRC += unit_tests.cpp \ analyses/does_remove_const/does_type_preserve_const_correctness.cpp \ analyses/does_remove_const/is_type_at_least_as_const_as.cpp \ goto-programs/goto_trace_output.cpp \ - goto-programs/class_hierarchy_output.cpp \ - goto-programs/class_hierarchy_graph.cpp \ - goto-programs/remove_virtual_functions_without_fallback.cpp \ - java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp \ - java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp \ - java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp \ - java_bytecode/java_object_factory/gen_nondet_string_init.cpp \ - java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp \ - java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp \ - miniBDD_new.cpp \ - java_bytecode/java_string_library_preprocess/convert_exprt_to_string_exprt.cpp \ - java_bytecode/java_types/erase_type_arguments.cpp \ - java_bytecode/java_types/generic_type_index.cpp \ - java_bytecode/java_types/java_generic_symbol_type.cpp \ - java_bytecode/java_types/java_type_from_string.cpp \ - java_bytecode/java_utils_test.cpp \ - java_bytecode/inherited_static_fields/inherited_static_fields.cpp \ path_strategies.cpp \ - pointer-analysis/custom_value_set_analysis.cpp \ solvers/refinement/string_constraint_generator_valueof/calculate_max_string_length.cpp \ solvers/refinement/string_constraint_generator_valueof/get_numeric_value_from_character.cpp \ solvers/refinement/string_constraint_generator_valueof/is_digit_with_radix.cpp \ - solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp \ solvers/refinement/string_refinement/concretize_array.cpp \ - solvers/refinement/string_refinement/dependency_graph.cpp \ solvers/refinement/string_refinement/substitute_array_list.cpp \ - solvers/refinement/string_refinement/string_symbol_resolution.cpp \ solvers/refinement/string_refinement/sparse_array.cpp \ solvers/refinement/string_refinement/union_find_replace.cpp \ util/expr_cast/expr_cast.cpp \ - util/expr_iterator.cpp \ - util/has_subtype.cpp \ util/irep.cpp \ util/irep_sharing.cpp \ util/message.cpp \ util/optional.cpp \ - util/parameter_indices.cpp \ util/sharing_node.cpp \ - util/sharing_map.cpp \ - util/simplify_expr.cpp \ util/small_map.cpp \ util/small_shared_two_way_ptr.cpp \ util/string_utils/split_string.cpp \ util/string_utils/strip_string.cpp \ util/symbol_table.cpp \ catch_example.cpp \ - java_bytecode/java_virtual_functions/virtual_functions.cpp \ - java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp \ # Empty last line INCLUDES= -I ../src/ -I. @@ -102,8 +74,7 @@ BMC_DEPS =../src/cbmc/all_properties$(OBJEXT) \ ../src/jsil/jsil_y.tab$(OBJEXT) \ # Empty last line # -CPROVER_LIBS =../src/java_bytecode/java_bytecode$(LIBEXT) \ - ../src/ansi-c/ansi-c$(LIBEXT) \ +CPROVER_LIBS =../src/ansi-c/ansi-c$(LIBEXT) \ ../src/cpp/cpp$(LIBEXT) \ ../src/json/json$(LIBEXT) \ ../src/linking/linking$(LIBEXT) \ diff --git a/unit/testing-utils/CMakeLists.txt b/unit/testing-utils/CMakeLists.txt index db62ded5cea..d385ef87937 100644 --- a/unit/testing-utils/CMakeLists.txt +++ b/unit/testing-utils/CMakeLists.txt @@ -2,7 +2,6 @@ file(GLOB_RECURSE sources "*.cpp" "*.h") add_library(testing-utils ${sources}) target_link_libraries(testing-utils util - java_bytecode ) target_include_directories(testing-utils PUBLIC diff --git a/unit/testing-utils/Makefile b/unit/testing-utils/Makefile index 1c873d58084..37519706952 100644 --- a/unit/testing-utils/Makefile +++ b/unit/testing-utils/Makefile @@ -1,12 +1,8 @@ SRC = \ c_to_expr.cpp \ free_form_cmdline.cpp \ - load_java_class.cpp \ require_expr.cpp \ - require_goto_statements.cpp \ - require_parse_tree.cpp \ require_symbol.cpp \ - require_type.cpp \ run_test_with_compilers.cpp \ # Empty last line (please keep above list sorted!) From f36da08acf146401d272c2386ca4a1663aa92d81 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Wed, 16 May 2018 09:52:17 +0100 Subject: [PATCH 07/12] Move Java regression tests --- jbmc/regression/CMakeLists.txt | 33 +++++++++++ jbmc/regression/Makefile | 53 ++++++++++++++++++ .../regression/janalyzer-taint/CMakeLists.txt | 3 + jbmc/regression/janalyzer-taint/Makefile | 21 +++++++ .../taint-aliasing1/aliasing1.class | Bin .../taint-aliasing1/aliasing1.java | 0 .../taint-aliasing1/taint.json | 0 .../taint-aliasing1/test.desc | 0 .../taint-basic1/basic1.class | Bin .../janalyzer-taint}/taint-basic1/basic1.java | 0 .../janalyzer-taint}/taint-basic1/taint.json | 0 .../janalyzer-taint}/taint-basic1/test.desc | 0 .../taint-basic2/basic2.class | Bin .../janalyzer-taint}/taint-basic2/basic2.java | 0 .../janalyzer-taint}/taint-basic2/taint.json | 0 .../janalyzer-taint}/taint-basic2/test.desc | 0 .../taint-interface1/interface1.class | Bin .../taint-interface1/interface1.java | 0 .../taint-interface1/my_I.class | Bin .../taint-interface1/some_class.class | Bin .../taint-interface1/taint.json | 0 .../taint-interface1/test.desc | 0 .../taint-interproc1/interproc1.class | Bin .../taint-interproc1/interproc1.java | 0 .../taint-interproc1/taint.json | 0 .../taint-interproc1/test.desc | 0 .../janalyzer-taint}/taint-map1/map1.class | Bin .../janalyzer-taint}/taint-map1/map1.java | 0 .../janalyzer-taint}/taint-map1/taint.json | 0 .../janalyzer-taint}/taint-map1/test.desc | 0 .../jbmc-concurrency}/CMakeLists.txt | 0 .../regression/jbmc-concurrency}/Makefile | 8 ++- .../explicit_thread_blocks/A.class | Bin .../explicit_thread_blocks/A.java | 0 .../explicit_thread_blocks/test.desc | 0 .../explicit_thread_blocks/test2.desc | 0 .../regression/jbmc-cover}/CMakeLists.txt | 0 .../regression/jbmc-cover}/Makefile | 8 ++- .../jbmc-cover/generics/AbstractImpl.class | Bin .../jbmc-cover/generics/AbstractInt.class | Bin .../generics/AbstractTest$ClassA.class | Bin .../generics/AbstractTest$ClassB.class | Bin .../generics/AbstractTest$Dummy.class | Bin .../jbmc-cover/generics/AbstractTest.class | Bin .../jbmc-cover/generics/AbstractTest.java | 0 .../regression}/jbmc-cover/generics/test.desc | 0 .../jbmc-cover/unique-bytecode1/Test.class | Bin .../jbmc-cover/unique-bytecode1/Test.java | 0 .../jbmc-cover/unique-bytecode1/test.desc | 0 .../jbmc-cover/unique-bytecode2/Test.class | Bin .../jbmc-cover/unique-bytecode2/Test.java | 0 .../jbmc-cover/unique-bytecode2/test.desc | 0 .../jbmc-cover/unique-bytecode3/Test.class | Bin .../jbmc-cover/unique-bytecode3/Test.java | 0 .../jbmc-cover/unique-bytecode3/test.desc | 0 .../jbmc-inheritance}/CMakeLists.txt | 0 .../regression/jbmc-inheritance}/Makefile | 10 ++-- .../jbmc-inheritance}/inheritance01/A.class | Bin .../jbmc-inheritance}/inheritance01/B.class | Bin .../inheritance01/test.class | Bin .../jbmc-inheritance}/inheritance01/test.desc | 0 .../jbmc-inheritance}/inheritance01/test.java | 0 .../jbmc-inheritance}/inheritance02/A.class | Bin .../jbmc-inheritance}/inheritance02/B.class | Bin .../inheritance02/test.class | Bin .../jbmc-inheritance}/inheritance02/test.desc | 0 .../jbmc-inheritance}/inheritance02/test.java | 0 .../jbmc-inheritance}/inheritance03/A.class | Bin .../jbmc-inheritance}/inheritance03/B.class | Bin .../jbmc-inheritance}/inheritance03/Z.class | Bin .../inheritance03/test.class | Bin .../jbmc-inheritance}/inheritance03/test.desc | 0 .../jbmc-inheritance}/inheritance03/test.java | 0 .../jbmc-inheritance}/inheritance04/A.class | Bin .../jbmc-inheritance}/inheritance04/B.class | Bin .../jbmc-inheritance}/inheritance04/Z.class | Bin .../inheritance04/test.class | Bin .../jbmc-inheritance}/inheritance04/test.desc | 0 .../jbmc-inheritance}/inheritance04/test.java | 0 .../jbmc-inheritance}/inheritance05/A.class | Bin .../jbmc-inheritance}/inheritance05/B.class | Bin .../inheritance05/test.class | Bin .../jbmc-inheritance}/inheritance05/test.desc | 0 .../jbmc-inheritance}/inheritance05/test.java | 0 .../jbmc-inheritance}/inheritance06/A.java | 0 .../jbmc-inheritance}/inheritance06/B.java | 0 .../inheritance06/temp/A.class | Bin .../inheritance06/temp/B.class | Bin .../inheritance06/test.class | Bin .../jbmc-inheritance}/inheritance06/test.desc | 0 .../jbmc-inheritance}/inheritance06/test.java | 0 .../regression}/jbmc-strings/CMakeLists.txt | 0 .../CharacterGetNumericValue/test.class | Bin .../CharacterGetNumericValue/test.desc | 0 .../CharacterGetNumericValue/test.java | 0 jbmc/regression/jbmc-strings/Makefile | 32 +++++++++++ .../RegexMatches01/RegexMatches01.class | Bin .../RegexMatches01/RegexMatches01.java | 0 .../jbmc-strings/RegexMatches01/test.desc | 0 .../RegexMatches02/RegexMatches02.class | Bin .../RegexMatches02/RegexMatches02.java | 0 .../jbmc-strings/RegexMatches02/test.desc | 0 .../RegexSubstitution01.class | Bin .../RegexSubstitution01.java | 0 .../RegexSubstitution01/test.desc | 0 .../RegexSubstitution02.class | Bin .../RegexSubstitution02.java | 0 .../RegexSubstitution02/test.desc | 0 .../RegexSubstitution03.class | Bin .../RegexSubstitution03.java | 0 .../RegexSubstitution03/test.desc | 0 .../StaticCharMethods01.class | Bin .../StaticCharMethods01.java | 0 .../StaticCharMethods01/test.desc | 0 .../StaticCharMethods02.class | Bin .../StaticCharMethods02.java | 0 .../StaticCharMethods02/test.desc | 0 .../StaticCharMethods03.class | Bin .../StaticCharMethods03.java | 0 .../StaticCharMethods03/test.desc | 0 .../StaticCharMethods04.class | Bin .../StaticCharMethods04.java | 0 .../StaticCharMethods04/test.desc | 0 .../StaticCharMethods05.class | Bin .../StaticCharMethods05.java | 0 .../StaticCharMethods05/test.desc | 0 .../StaticCharMethods06.class | Bin .../StaticCharMethods06.java | 0 .../StaticCharMethods06/test.desc | 0 .../jbmc-strings/StringArray/Test.class | Bin .../jbmc-strings/StringArray/Test.java | 0 .../jbmc-strings/StringArray/test.desc | 0 .../StringBuilderAppend01.class | Bin .../StringBuilderAppend01.java | 0 .../StringBuilderAppend01/test.desc | 0 .../StringBuilderAppend02.class | Bin .../StringBuilderAppend02.java | 0 .../StringBuilderAppend02/test.desc | 0 .../StringBuilderCapLen01.class | Bin .../StringBuilderCapLen01.java | 0 .../StringBuilderCapLen01/test.desc | 0 .../StringBuilderCapLen02.class | Bin .../StringBuilderCapLen02.java | 0 .../StringBuilderCapLen02/test.desc | 0 .../StringBuilderCapLen03.class | Bin .../StringBuilderCapLen03.java | 0 .../StringBuilderCapLen03/test.desc | 0 .../StringBuilderCapLen04.class | Bin .../StringBuilderCapLen04.java | 0 .../StringBuilderCapLen04/test.desc | 0 .../StringBuilderChars01.class | Bin .../StringBuilderChars01.java | 0 .../StringBuilderChars01/test.desc | 0 .../StringBuilderChars02.class | Bin .../StringBuilderChars02.java | 0 .../StringBuilderChars02/test.desc | 0 .../StringBuilderChars03.class | Bin .../StringBuilderChars03.java | 0 .../StringBuilderChars03/test.desc | 0 .../StringBuilderChars04.class | Bin .../StringBuilderChars04.java | 0 .../StringBuilderChars04/test.desc | 0 .../StringBuilderChars05.class | Bin .../StringBuilderChars05.java | 0 .../StringBuilderChars05/test.desc | 0 .../StringBuilderChars06.class | Bin .../StringBuilderChars06.java | 0 .../StringBuilderChars06/test.desc | 0 .../StringBuilderConstructors01.class | Bin .../StringBuilderConstructors01.java | 0 .../StringBuilderConstructors01/test.desc | 0 .../StringBuilderConstructors02.class | Bin .../StringBuilderConstructors02.java | 0 .../StringBuilderConstructors02/test.desc | 0 .../StringBuilderInsert/Test.class | Bin .../StringBuilderInsert/Test.java | 0 .../StringBuilderInsert/test.desc | 0 .../StringBuilderInsertDelete01.class | Bin .../StringBuilderInsertDelete01.java | 0 .../StringBuilderInsertDelete01/test.desc | 0 .../StringBuilderInsertDelete02.class | Bin .../StringBuilderInsertDelete02.java | 0 .../StringBuilderInsertDelete02/test.desc | 0 .../StringBuilderInsertDelete03.class | Bin .../StringBuilderInsertDelete03.java | 0 .../StringBuilderInsertDelete03/test.desc | 0 .../StringCompare01/StringCompare01.class | Bin .../StringCompare01/StringCompare01.java | 0 .../jbmc-strings/StringCompare01/test.desc | 0 .../StringCompare02/StringCompare02.class | Bin .../StringCompare02/StringCompare02.java | 0 .../jbmc-strings/StringCompare02/test.desc | 0 .../StringCompare03/StringCompare03.class | Bin .../StringCompare03/StringCompare03.java | 0 .../jbmc-strings/StringCompare03/test.desc | 0 .../StringCompare04/StringCompare04.class | Bin .../StringCompare04/StringCompare04.java | 0 .../jbmc-strings/StringCompare04/test.desc | 0 .../StringCompare05/StringCompare05.class | Bin .../StringCompare05/StringCompare05.java | 0 .../jbmc-strings/StringCompare05/test.desc | 0 .../jbmc-strings/StringConcat/Test.class | Bin .../jbmc-strings/StringConcat/Test.java | 0 .../StringConcat/test_buffer_det.desc | 0 .../StringConcat/test_buffer_nondet_loop.desc | 0 .../test_buffer_nondet_loop2.desc | 0 .../test_buffer_nondet_loop3.desc | 0 .../test_buffer_nondet_loop4.desc | 0 .../test_buffer_nondet_loop5.desc | 0 .../StringConcat/test_char_buffer_det.desc | 0 .../test_char_buffer_det_loop.desc | 0 .../test_char_buffer_det_loop2.desc | 0 .../StringConcat/test_string_det.desc | 0 .../StringConcat/test_string_nondet.desc | 0 .../StringConcat_StringII/Test.class | Bin .../StringConcat_StringII/Test.java | 0 .../StringConcat_StringII/test.desc | 0 .../StringConcat_StringII/test_fail.desc | 0 .../StringConcatenation01.class | Bin .../StringConcatenation01.java | 0 .../StringConcatenation01/test.desc | 0 .../StringConcatenation02.class | Bin .../StringConcatenation02.java | 0 .../StringConcatenation02/test.desc | 0 .../StringConcatenation03.class | Bin .../StringConcatenation03.java | 0 .../StringConcatenation03/test.desc | 0 .../StringConcatenation04.class | Bin .../StringConcatenation04.java | 0 .../StringConcatenation04/test.desc | 0 .../StringConstructors01.class | Bin .../StringConstructors01.java | 0 .../StringConstructors01/test.desc | 0 .../StringConstructors02.class | Bin .../StringConstructors02.java | 0 .../StringConstructors02/test.desc | 0 .../StringConstructors03.class | Bin .../StringConstructors03.java | 0 .../StringConstructors03/test.desc | 0 .../StringConstructors04.class | Bin .../StringConstructors04.java | 0 .../StringConstructors04/test.desc | 0 .../StringConstructors05.class | Bin .../StringConstructors05.java | 0 .../StringConstructors05/test.desc | 0 .../jbmc-strings/StringContains01/test.class | Bin .../jbmc-strings/StringContains01/test.desc | 0 .../jbmc-strings/StringContains01/test.java | 0 .../jbmc-strings/StringContains02/test.class | Bin .../jbmc-strings/StringContains02/test.desc | 0 .../jbmc-strings/StringContains02/test.java | 0 .../StringDependencies/Test.class | Bin .../jbmc-strings/StringDependencies/Test.java | 0 .../jbmc-strings/StringDependencies/test.desc | 0 .../jbmc-strings/StringEquals/Test.class | Bin .../jbmc-strings/StringEquals/Test.java | 0 .../jbmc-strings/StringEquals/test.desc | 0 .../StringEquals/test_verify.desc | 0 .../StringEquals/test_verify_non_null.desc | 0 .../StringIndexMethods01.class | Bin .../StringIndexMethods01.java | 0 .../StringIndexMethods01/test.desc | 0 .../StringIndexMethods02.class | Bin .../StringIndexMethods02.java | 0 .../StringIndexMethods02/test.desc | 0 .../StringIndexMethods03.class | Bin .../StringIndexMethods03.java | 0 .../StringIndexMethods03/test.desc | 0 .../StringIndexMethods04.class | Bin .../StringIndexMethods04.java | 0 .../StringIndexMethods04/test.desc | 0 .../StringIndexMethods04/test_bug.desc | 0 .../StringIndexMethods05.class | Bin .../StringIndexMethods05.java | 0 .../StringIndexMethods05/test.desc | 0 .../jbmc-strings/StringIndexOf/Test.class | Bin .../jbmc-strings/StringIndexOf/Test.java | 0 .../jbmc-strings/StringIndexOf/test.desc | 0 .../jbmc-strings/StringIndexOf/test2.desc | 0 .../StringIndexOf/test_thorough.desc | 0 .../jbmc-strings/StringLastIndexOf/Test.class | Bin .../jbmc-strings/StringLastIndexOf/Test.java | 0 .../jbmc-strings/StringLastIndexOf/test.desc | 0 .../StringMiscellaneous01.class | Bin .../StringMiscellaneous01.java | 0 .../StringMiscellaneous01/test.desc | 0 .../StringMiscellaneous02.class | Bin .../StringMiscellaneous02.java | 0 .../StringMiscellaneous02/test.desc | 0 .../StringMiscellaneous03.class | Bin .../StringMiscellaneous03.java | 0 .../StringMiscellaneous03/test.desc | 0 .../StringMiscellaneous04.class | Bin .../StringMiscellaneous04.java | 0 .../StringMiscellaneous04/test.desc | 0 .../StringStartEnd01/StringStartEnd01.class | Bin .../StringStartEnd01/StringStartEnd01.java | 0 .../jbmc-strings/StringStartEnd01/test.desc | 0 .../StringStartEnd02/StringStartEnd02.class | Bin .../StringStartEnd02/StringStartEnd02.java | 0 .../jbmc-strings/StringStartEnd02/test.desc | 0 .../StringStartEnd03/StringStartEnd03.class | Bin .../StringStartEnd03/StringStartEnd03.java | 0 .../jbmc-strings/StringStartEnd03/test.desc | 0 .../jbmc-strings/StringSubstring/Test.class | Bin .../jbmc-strings/StringSubstring/Test.java | 0 .../jbmc-strings/StringSubstring/test.desc | 0 .../StringSubstring/test_fail.desc | 0 .../StringValueOf01/StringValueOf01.class | Bin .../StringValueOf01/StringValueOf01.java | 0 .../jbmc-strings/StringValueOf01/test.desc | 0 .../StringValueOf02/StringValueOf02.class | Bin .../StringValueOf02/StringValueOf02.java | 0 .../jbmc-strings/StringValueOf02/test.desc | 0 .../StringValueOf03/StringValueOf03.class | Bin .../StringValueOf03/StringValueOf03.java | 0 .../jbmc-strings/StringValueOf03/test.desc | 0 .../StringValueOf04/StringValueOf04.class | Bin .../StringValueOf04/StringValueOf04.java | 0 .../jbmc-strings/StringValueOf04/test.desc | 0 .../StringValueOf05/StringValueOf05.class | Bin .../StringValueOf05/StringValueOf05.java | 0 .../jbmc-strings/StringValueOf05/test.desc | 0 .../StringValueOf06/StringValueOf06.class | Bin .../StringValueOf06/StringValueOf06.java | 0 .../jbmc-strings/StringValueOf06/test.desc | 0 .../StringValueOf07/StringValueOf07.class | Bin .../StringValueOf07/StringValueOf07.java | 0 .../jbmc-strings/StringValueOf07/test.desc | 0 .../StringValueOf08/StringValueOf08.class | Bin .../StringValueOf08/StringValueOf08.java | 0 .../jbmc-strings/StringValueOf08/test.desc | 0 .../StringValueOf09/StringValueOf09.class | Bin .../StringValueOf09/StringValueOf09.java | 0 .../jbmc-strings/StringValueOf09/test.desc | 0 .../StringValueOf10/StringValueOf10.class | Bin .../StringValueOf10/StringValueOf10.java | 0 .../jbmc-strings/StringValueOf10/test.desc | 0 .../SubString01/SubString01.class | Bin .../jbmc-strings/SubString01/SubString01.java | 0 .../jbmc-strings/SubString01/test.desc | 0 .../SubString02/SubString02.class | Bin .../jbmc-strings/SubString02/SubString02.java | 0 .../jbmc-strings/SubString02/test.desc | 0 .../SubString03/SubString03.class | Bin .../jbmc-strings/SubString03/SubString03.java | 0 .../jbmc-strings/SubString03/test.desc | 0 .../TokenTest01/TokenTest01.class | Bin .../jbmc-strings/TokenTest01/TokenTest01.java | 0 .../jbmc-strings/TokenTest01/test.desc | 0 .../TokenTest02/TokenTest02.class | Bin .../jbmc-strings/TokenTest02/TokenTest02.java | 0 .../jbmc-strings/TokenTest02/test.desc | 0 .../jbmc-strings/Validate01/Validate01.class | Bin .../jbmc-strings/Validate01/Validate01.java | 0 .../Validate01/ValidateInput01.class | Bin .../Validate01/ValidateInput01.java | 0 .../jbmc-strings/Validate01/test.desc | 0 .../jbmc-strings/Validate02/Validate02.class | Bin .../jbmc-strings/Validate02/Validate02.java | 0 .../Validate02/ValidateInput02.class | Bin .../Validate02/ValidateInput02.java | 0 .../jbmc-strings/Validate02/test.desc | 0 .../VerifStringLastIndexOf/Test.class | Bin .../VerifStringLastIndexOf/Test.java | 0 .../VerifStringLastIndexOf/test.desc | 0 .../jbmc-strings/bug-test-gen-095/test.class | Bin .../jbmc-strings/bug-test-gen-095/test.desc | 0 .../jbmc-strings/bug-test-gen-095/test.java | 0 .../StringValueOfLong.class | Bin .../bug-test-gen-119-2/StringValueOfLong.java | 0 .../jbmc-strings/bug-test-gen-119-2/test.desc | 0 .../bug-test-gen-119/StringValueOfBool.class | Bin .../bug-test-gen-119/StringValueOfBool.java | 0 .../jbmc-strings/bug-test-gen-119/test.desc | 0 .../jbmc-strings/char_escape/Test.class | Bin .../jbmc-strings/char_escape/Test.java | 0 .../jbmc-strings/char_escape/test.desc | 0 .../jbmc-strings/cprover/CProverString.class | Bin .../jbmc-strings/cprover/CProverString.java | 0 .../jbmc-strings/instanceof/Test.class | Bin .../jbmc-strings/instanceof/Test.java | 0 .../jbmc-strings/instanceof/test.desc | 0 .../jbmc-strings/java_append_char/test.desc | 0 .../java_append_char/test_append_char.class | Bin .../java_append_char/test_append_char.java | 0 .../jbmc-strings/java_append_int/test.desc | 0 .../java_append_int/test_append_int.class | Bin .../java_append_int/test_append_int.java | 0 .../jbmc-strings/java_append_object/test.desc | 0 .../test_append_object.class | Bin .../test_append_object.java | 0 .../jbmc-strings/java_append_string/test.desc | 0 .../test_append_string.class | Bin .../test_append_string.java | 0 .../jbmc-strings/java_case/test.desc | 0 .../jbmc-strings/java_case/test_case.class | Bin .../jbmc-strings/java_case/test_case.java | 0 .../jbmc-strings/java_char_array/test.desc | 0 .../java_char_array/test_char_array.class | Bin .../java_char_array/test_char_array.java | 0 .../java_char_array_init/test.desc | 0 .../java_char_array_init/test_init.class | Bin .../java_char_array_init/test_init.java | 0 .../jbmc-strings/java_char_at/test.desc | 0 .../java_char_at/test_char_at.class | Bin .../java_char_at/test_char_at.java | 0 .../jbmc-strings/java_code_point/test.desc | 0 .../java_code_point/test_code_point.class | Bin .../java_code_point/test_code_point.java | 0 .../jbmc-strings/java_compare/test.desc | 0 .../java_compare/test_compare.class | Bin .../java_compare/test_compare.java | 0 .../jbmc-strings/java_concat/test.desc | 0 .../java_concat/test_concat.class | Bin .../jbmc-strings/java_concat/test_concat.java | 0 .../jbmc-strings/java_contains/test.desc | 0 .../java_contains/test_contains.class | Bin .../java_contains/test_contains.java | 0 .../jbmc-strings/java_delete/test.desc | 0 .../java_delete/test_delete.class | Bin .../jbmc-strings/java_delete/test_delete.java | 0 .../java_delete_char_at/test.desc | 0 .../test_delete_char_at.class | Bin .../test_delete_char_at.java | 0 .../java_easychair/easychair.class | Bin .../java_easychair/easychair.java | 0 .../jbmc-strings/java_easychair/test.desc | 0 .../jbmc-strings/java_empty/test.desc | 0 .../jbmc-strings/java_empty/test_empty.class | Bin .../jbmc-strings/java_empty/test_empty.java | 0 .../jbmc-strings/java_endswith/test.desc | 0 .../java_endswith/test_endswith.class | Bin .../java_endswith/test_endswith.java | 0 .../jbmc-strings/java_equal/test.desc | 0 .../jbmc-strings/java_equal/test_equal.class | Bin .../jbmc-strings/java_equal/test_equal.java | 0 .../jbmc-strings/java_float/test.desc | 0 .../jbmc-strings/java_float/test_float.class | Bin .../jbmc-strings/java_float/test_float.java | 0 .../jbmc-strings/java_hash_code/test.desc | 0 .../java_hash_code/test_hash_code.class | Bin .../java_hash_code/test_hash_code.java | 0 .../jbmc-strings/java_index_of/test.desc | 0 .../java_index_of/test_index_of.class | Bin .../java_index_of/test_index_of.java | 0 .../jbmc-strings/java_index_of_char/test.desc | 0 .../test_index_of_char.class | Bin .../test_index_of_char.java | 0 .../jbmc-strings/java_insert_char/test.desc | 0 .../java_insert_char/test_insert_char.class | Bin .../java_insert_char/test_insert_char.java | 0 .../java_insert_char_array/test.desc | 0 .../test_insert_char_array.class | Bin .../test_insert_char_array.java | 0 .../jbmc-strings/java_insert_int/test.desc | 0 .../java_insert_int/test_insert_int.class | Bin .../java_insert_int/test_insert_int.java | 0 .../java_insert_multiple/test.desc | 0 .../test_insert_multiple.class | Bin .../test_insert_multiple.java | 0 .../jbmc-strings/java_insert_string/test.desc | 0 .../test_insert_string.class | Bin .../test_insert_string.java | 0 .../jbmc-strings/literal-length/Test.class | Bin .../jbmc-strings/literal-length/Test.java | 0 .../jbmc-strings/literal-length/test.desc | 0 .../jbmc-strings/long_string/Test.class | Bin .../jbmc-strings/long_string/Test.java | 0 .../jbmc-strings/long_string/test.desc | 0 .../jbmc-strings/long_string/test_abort.desc | 0 .../IntegerTests.class | Bin .../IntegerTests.java | 0 .../max-length-generic-array/MyGenSet.class | Bin .../max-length-generic-array/MySet.class | Bin .../max-length-generic-array/test.desc | 0 .../max-length-generic-array/test_gen.desc | 0 .../jbmc-strings/max-length/Test.class | Bin .../jbmc-strings/max-length/Test.java | 0 .../jbmc-strings/max-length/test1.desc | 0 .../jbmc-strings/max-length/test2.desc | 0 .../jbmc-strings/max-length/test3.desc | 0 .../jbmc-strings/max-length/test4.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../jbmc}/ArithmeticException1/test.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../jbmc}/ArithmeticException2/test.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../jbmc}/ArithmeticException3/test.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../jbmc}/ArithmeticException4/test.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../jbmc}/ArithmeticException5/test.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../jbmc}/ArithmeticException6/test.desc | 0 .../ArithmeticExceptionTest.class | Bin .../ArithmeticExceptionTest.java | 0 .../java/lang/ArithmeticException.class | Bin .../java/lang/ArithmeticException.java | 0 .../java/lang/RuntimeException.class | Bin .../java/lang/RuntimeException.java | 0 .../jbmc}/ArithmeticException7/test.desc | 0 .../ArrayIndexOutOfBoundsExceptionTest.class | Bin .../ArrayIndexOutOfBoundsExceptionTest.java | 0 .../ArrayIndexOutOfBoundsException1/test.desc | 0 .../ArrayIndexOutOfBoundsExceptionTest.class | Bin .../ArrayIndexOutOfBoundsExceptionTest.java | 0 .../ArrayIndexOutOfBoundsException2/test.desc | 0 .../ArrayIndexOutOfBoundsExceptionTest.class | Bin .../ArrayIndexOutOfBoundsExceptionTest.java | 0 .../lang/ArrayIndexOutOfBoundsException.class | Bin .../lang/ArrayIndexOutOfBoundsException.java | 0 .../java/lang/IndexOutOfBoundsException.class | Bin .../java/lang/IndexOutOfBoundsException.java | 0 .../java/lang/RuntimeException.class | Bin .../java/lang/RuntimeException.java | 0 .../ArrayIndexOutOfBoundsException3/test.desc | 0 jbmc/regression/jbmc/CMakeLists.txt | 10 ++++ .../jbmc}/ClassCastException1/A.class | Bin .../jbmc}/ClassCastException1/B.class | Bin .../ClassCastExceptionTest.class | Bin .../ClassCastExceptionTest.java | 0 .../jbmc}/ClassCastException1/test.desc | 0 .../jbmc}/ClassCastException2/A.class | Bin .../jbmc}/ClassCastException2/B.class | Bin .../jbmc}/ClassCastException2/C.class | Bin .../ClassCastExceptionTest.class | Bin .../ClassCastExceptionTest.java | 0 .../jbmc}/ClassCastException2/test.desc | 0 .../jbmc}/ClassCastException3/A.class | Bin .../jbmc}/ClassCastException3/B.class | Bin .../ClassCastExceptionTest.class | Bin .../ClassCastExceptionTest.java | 0 .../java/lang/ClassCastException.class | Bin .../java/lang/ClassCastException.java | 0 .../java/lang/RuntimeException.class | Bin .../java/lang/RuntimeException.java | 0 .../jbmc}/ClassCastException3/test.desc | 0 .../jbmc}/Class_method1/Class_method1.class | Bin .../jbmc}/Class_method1/Class_method1.java | 0 .../regression/jbmc}/Inheritance1/A1.class | Bin .../regression/jbmc}/Inheritance1/A2.class | Bin .../regression/jbmc}/Inheritance1/A3.class | Bin .../jbmc}/Inheritance1/Inheritance1.class | Bin .../jbmc}/Inheritance1/Inheritance1.java | 0 .../regression/jbmc}/Inheritance1/test.desc | 0 .../jbmc}/LocalVarTable1/CtorLocalVar.class | Bin .../jbmc}/LocalVarTable1/CtorLocalVar.java | 0 .../regression/jbmc}/LocalVarTable1/test.desc | 0 .../jbmc}/LocalVarTable2/LocalVarTable2.class | Bin .../jbmc}/LocalVarTable2/LocalVarTable2.java | 0 .../regression/jbmc}/LocalVarTable2/test.desc | 0 .../live_range_with_holes.class | Bin .../LocalVarTable3/live_range_with_holes.java | 0 .../regression/jbmc}/LocalVarTable3/test.desc | 0 .../LocalVarTable4/live_range_exception.class | Bin .../LocalVarTable4/live_range_exception.java | 0 .../regression/jbmc}/LocalVarTable4/test.desc | 0 .../jbmc}/LocalVarTable5/test.class | Bin .../regression/jbmc}/LocalVarTable5/test.desc | 0 .../regression/jbmc}/LocalVarTable5/test.java | 0 jbmc/regression/jbmc/Makefile | 36 ++++++++++++ .../NegativeArraySizeExceptionTest.class | Bin .../NegativeArraySizeExceptionTest.java | 0 .../NegativeArraySizeException1/test.desc | 0 .../NegativeArraySizeExceptionTest.class | Bin .../NegativeArraySizeExceptionTest.java | 0 .../lang/NegativeArraySizeException.class | Bin .../java/lang/NegativeArraySizeException.java | 0 .../java/lang/RuntimeException.class | Bin .../java/lang/RuntimeException.java | 0 .../NegativeArraySizeException2/test.desc | 0 .../jbmc}/NondetArray/NondetArray.class | Bin .../jbmc}/NondetArray/NondetArray.java | 0 .../regression/jbmc}/NondetArray/test.desc | 0 .../jbmc}/NondetArray2/NondetArray2.class | Bin .../jbmc}/NondetArray2/NondetArray2.java | 0 .../regression/jbmc}/NondetArray2/test.desc | 0 .../jbmc}/NondetArray3/NondetArray3.class | Bin .../jbmc}/NondetArray3/NondetArray3.java | 0 .../regression/jbmc}/NondetArray3/test.desc | 0 .../jbmc}/NondetArray4/NondetArray4.class | Bin .../jbmc}/NondetArray4/NondetArray4.java | 0 .../regression/jbmc}/NondetArray4/test.desc | 0 .../jbmc}/NondetAssume1/NondetAssume1.class | Bin .../jbmc}/NondetAssume1/NondetAssume1.java | 0 .../regression/jbmc}/NondetAssume1/test.desc | 0 .../regression/jbmc}/NondetAssume2/A.class | Bin .../regression/jbmc}/NondetAssume2/B.class | Bin .../regression/jbmc}/NondetAssume2/C.class | Bin .../jbmc}/NondetAssume2/NondetAssume2.class | Bin .../jbmc}/NondetAssume2/NondetAssume2.java | 0 .../regression/jbmc}/NondetAssume2/test.desc | 0 .../jbmc}/NondetBoolean/NondetBoolean.class | Bin .../jbmc}/NondetBoolean/NondetBoolean.java | 0 .../regression/jbmc}/NondetBoolean/test.desc | 0 .../jbmc}/NondetByte/NondetByte.class | Bin .../jbmc}/NondetByte/NondetByte.java | 0 .../regression/jbmc}/NondetByte/test.desc | 0 .../NondetCastToObject.class | Bin .../NondetCastToObject.java | 0 .../jbmc}/NondetCastToObject/test.desc | 0 .../jbmc}/NondetChar/NondetChar.class | Bin .../jbmc}/NondetChar/NondetChar.java | 0 .../regression/jbmc}/NondetChar/test.desc | 0 .../jbmc}/NondetDirectFromMethod/A.class | Bin .../NondetDirectFromMethod.class | Bin .../NondetDirectFromMethod.java | 0 .../jbmc}/NondetDirectFromMethod/test.desc | 0 .../jbmc}/NondetDouble/NondetDouble.class | Bin .../jbmc}/NondetDouble/NondetDouble.java | 0 .../regression/jbmc}/NondetDouble/test.desc | 0 .../jbmc}/NondetFloat/NondetFloat.class | Bin .../jbmc}/NondetFloat/NondetFloat.java | 0 .../regression/jbmc}/NondetFloat/test.desc | 0 .../jbmc}/NondetGenericArray/A.class | Bin .../jbmc}/NondetGenericArray/B.class | Bin .../jbmc}/NondetGenericArray/C.class | Bin .../NondetGenericArray.class | Bin .../NondetGenericArray.java | 0 .../jbmc}/NondetGenericArray/test.desc | 0 .../jbmc}/NondetGenericRecursive/A.class | Bin .../jbmc}/NondetGenericRecursive/B.class | Bin .../jbmc}/NondetGenericRecursive/C.class | Bin .../NondetGenericRecursive.class | Bin .../NondetGenericRecursive.java | 0 .../jbmc}/NondetGenericRecursive/test.desc | 0 .../jbmc}/NondetGenericRecursive2/A.class | Bin .../jbmc}/NondetGenericRecursive2/B.class | Bin .../jbmc}/NondetGenericRecursive2/C.class | Bin .../NondetGenericRecursive2.class | Bin .../NondetGenericRecursive2.java | 0 .../jbmc}/NondetGenericRecursive2/test.desc | 0 .../jbmc}/NondetGenericWithNull/B.class | Bin .../NondetGenericWithNull.class | Bin .../NondetGenericWithNull.java | 0 .../jbmc}/NondetGenericWithNull/test.desc | 0 .../jbmc}/NondetGenericWithoutNull/B.class | Bin .../NondetGenericWithoutNull.class | Bin .../NondetGenericWithoutNull.java | 0 .../jbmc}/NondetGenericWithoutNull/test.desc | 0 .../regression/jbmc}/NondetInit/Test.class | Bin .../regression/jbmc}/NondetInit/Test.java | 0 .../regression/jbmc}/NondetInit/test.desc | 0 .../jbmc}/NondetInit/test_lazy.desc | 0 .../regression/jbmc}/NondetInit2/Test.class | Bin .../regression/jbmc}/NondetInit2/Test.java | 0 .../regression/jbmc}/NondetInit2/test.desc | 0 .../jbmc}/NondetInit3/Subclass.class | Bin .../regression/jbmc}/NondetInit3/Test.class | Bin .../regression/jbmc}/NondetInit3/Test.java | 0 .../regression/jbmc}/NondetInit3/test.desc | 0 .../jbmc}/NondetInt/NondetInt.class | Bin .../regression/jbmc}/NondetInt/NondetInt.java | 0 .../regression/jbmc}/NondetInt/test.desc | 0 .../jbmc}/NondetLong/NondetLong.class | Bin .../jbmc}/NondetLong/NondetLong.java | 0 .../regression/jbmc}/NondetLong/test.desc | 0 .../jbmc}/NondetShort/NondetShort.class | Bin .../jbmc}/NondetShort/NondetShort.java | 0 .../regression/jbmc}/NondetShort/test.desc | 0 .../regression/jbmc}/NullPointer1/A.class | Bin .../regression/jbmc}/NullPointer1/B.class | Bin .../jbmc}/NullPointer1/NullPointer1.class | Bin .../jbmc}/NullPointer1/NullPointer1.java | 0 .../regression/jbmc}/NullPointer1/test.desc | 0 .../jbmc}/NullPointer2/NullPointer2.class | Bin .../jbmc}/NullPointer2/NullPointer2.java | 0 .../regression/jbmc}/NullPointer2/test.desc | 0 .../jbmc}/NullPointer3/NullPointer3.class | Bin .../jbmc}/NullPointer3/NullPointer3.java | 0 .../regression/jbmc}/NullPointer3/test.desc | 0 .../jbmc}/NullPointer4/NullPointer4.class | Bin .../jbmc}/NullPointer4/NullPointer4.java | 0 .../regression/jbmc}/NullPointer4/test.desc | 0 .../jbmc}/NullPointerException1/Main.class | Bin .../jbmc}/NullPointerException1/Main.java | 0 .../jbmc}/NullPointerException1/test.desc | 0 .../jbmc}/NullPointerException2/A.class | Bin .../jbmc}/NullPointerException2/B.class | Bin .../jbmc}/NullPointerException2/Test.class | Bin .../jbmc}/NullPointerException2/Test.java | 0 .../jbmc}/NullPointerException2/test.desc | 0 .../jbmc}/NullPointerException3/A.class | Bin .../jbmc}/NullPointerException3/B.class | Bin .../jbmc}/NullPointerException3/Test.class | Bin .../jbmc}/NullPointerException3/Test.java | 0 .../jbmc}/NullPointerException3/test.desc | 0 .../jbmc}/NullPointerException4/A.class | Bin .../jbmc}/NullPointerException4/Test.class | Bin .../jbmc}/NullPointerException4/Test.java | 0 .../java/lang/NullPointerException.class | Bin .../java/lang/NullPointerException.java | 0 .../java/lang/RuntimeException.class | Bin .../java/lang/RuntimeException.java | 0 .../jbmc}/NullPointerException4/test.desc | 0 .../VarLengthArrayTrace1/Container.class | Bin .../VarLengthArrayTrace1.class | Bin .../VarLengthArrayTrace1.java | 0 .../jbmc}/VarLengthArrayTrace1/test.desc | 0 .../regression/jbmc}/aastore_aaload1/A.class | Bin .../aastore_aaload1/aastore_aaload1.class | Bin .../aastore_aaload1/aastore_aaload1.java | 0 .../jbmc}/aastore_aaload1/test.desc | 0 .../address_space_size_limit1/Test.class | Bin .../jbmc}/address_space_size_limit1/Test.java | 0 .../jbmc}/address_space_size_limit1/test.desc | 0 .../address_space_size_limit2/Test.class | Bin .../jbmc}/address_space_size_limit2/Test.java | 0 .../jbmc}/address_space_size_limit2/test.desc | 0 .../jbmc}/annotations1/ClassAnnotation.class | Bin .../jbmc}/annotations1/FieldAnnotation.class | Bin .../jbmc}/annotations1/MethodAnnotation.class | Bin .../jbmc}/annotations1/annotations.class | Bin .../jbmc}/annotations1/annotations.java | 0 .../annotations1/show_annotation_symbol.desc | 0 .../jbmc}/annotations2/FieldAnnotation.class | Bin .../regression/jbmc}/annotations2/Test.class | Bin .../regression/jbmc}/annotations2/Test.java | 0 .../regression/jbmc}/annotations2/test.desc | 0 .../regression/jbmc}/array1/array1.class | Bin .../regression/jbmc}/array1/array1.java | 0 .../regression/jbmc}/array1/test.desc | 0 .../regression/jbmc}/array1/what_not.class | Bin .../regression/jbmc}/array1/what_not.java | 0 .../regression/jbmc}/array2/test.class | Bin .../regression/jbmc}/array2/test.desc | 0 .../regression/jbmc}/array2/test.java | 0 .../array_nonconstsize_nonconstaccess/A.class | Bin .../array_nonconstsize_nonconstaccess/A.java | 0 .../FloatMultidim1.class | Bin .../FloatMultidim1.java | 0 .../FloatMultidim2.class | Bin .../FloatMultidim2.java | 0 .../RefMultidim1.class | Bin .../RefMultidim1.java | 0 .../RefMultidim2.class | Bin .../RefMultidim2.java | 0 .../RefMultidimConstsize.class | Bin .../RefMultidimConstsize.java | 0 .../RefSingledim.class | Bin .../RefSingledim.java | 0 .../test_float_multidim_1.desc | 0 .../test_float_multidim_2.desc | 0 .../test_ref_multidim_1.desc | 0 .../test_ref_multidim_2.desc | 0 .../test_ref_multidim_constsize.desc | 0 .../test_ref_singledim.desc | 0 .../jbmc}/arraylength1/arraylength1.class | Bin .../jbmc}/arraylength1/arraylength1.java | 0 .../regression/jbmc}/arraylength1/test.desc | 0 .../jbmc}/arrayread1/arrayread1.class | Bin .../jbmc}/arrayread1/arrayread1.java | 0 .../regression/jbmc}/arrayread1/test.desc | 0 .../regression/jbmc}/assert1/assert1.class | Bin .../regression/jbmc}/assert1/assert1.java | 0 .../regression/jbmc}/assert1/test.desc | 0 .../regression/jbmc}/assert2/assert2.class | Bin .../regression/jbmc}/assert2/assert2.java | 0 .../regression/jbmc}/assert2/test.desc | 0 .../regression/jbmc}/assert3/assert3.class | Bin .../regression/jbmc}/assert3/assert3.java | 0 .../regression/jbmc}/assert3/test.desc | 0 .../regression/jbmc}/assert4/assert4.class | Bin .../regression/jbmc}/assert4/assert4.java | 0 .../regression/jbmc}/assert4/test.desc | 0 .../regression/jbmc}/assert5/assert5.class | Bin .../regression/jbmc}/assert5/assert5.java | 0 .../regression/jbmc}/assert5/test.desc | 0 .../regression/jbmc}/assert6/assert6.class | Bin .../regression/jbmc}/assert6/assert6.java | 0 .../regression/jbmc}/assert6/test.desc | 0 .../AssertionIssue.class | Bin .../AssertionIssue.java | 0 .../assertion_error_constructors/test.desc | 0 .../regression/jbmc}/assume1/Assume1.class | Bin .../regression/jbmc}/assume1/Assume1.java | 0 .../regression/jbmc}/assume1/test.desc | 0 .../regression/jbmc}/assume2/Assume2.class | Bin .../regression/jbmc}/assume2/Assume2.java | 0 .../regression/jbmc}/assume2/test.desc | 0 .../regression/jbmc}/assume3/Assume3.class | Bin .../regression/jbmc}/assume3/Assume3.java | 0 .../regression/jbmc}/assume3/test.desc | 0 .../jbmc}/astore_aload1/astore_aload1.class | Bin .../jbmc}/astore_aload1/astore_aload1.java | 0 .../regression/jbmc}/astore_aload1/test.desc | 0 .../regression/jbmc}/athrow1/A.class | Bin .../regression/jbmc}/athrow1/athrow1.class | Bin .../regression/jbmc}/athrow1/athrow1.java | 0 .../regression/jbmc}/athrow1/test.desc | 0 .../regression/jbmc}/basic1/helloworld.class | Bin .../regression/jbmc}/basic1/helloworld.java | 0 .../regression/jbmc}/basic1/test.desc | 0 .../regression/jbmc}/basic2/basic.class | Bin .../regression/jbmc}/basic2/basic.java | 0 .../regression/jbmc}/basic2/basic2.class | Bin .../regression/jbmc}/basic2/test.desc | 0 .../regression/jbmc}/bitwise1/bitwise1.class | Bin .../regression/jbmc}/bitwise1/bitwise1.java | 0 .../regression/jbmc}/bitwise1/test.desc | 0 .../regression/jbmc}/boolean1/boolean1.class | Bin .../regression/jbmc}/boolean1/boolean1.java | 0 .../regression/jbmc}/boolean1/test.desc | 0 .../regression/jbmc}/boolean2/boolean2.class | Bin .../regression/jbmc}/boolean2/boolean2.java | 0 .../regression/jbmc}/boolean2/test.desc | 0 .../regression/jbmc}/cast1/cast1.class | Bin .../regression/jbmc}/cast1/cast1.java | 0 .../regression/jbmc}/cast1/test.desc | 0 .../regression/jbmc}/cast_null1/test.class | Bin .../regression/jbmc}/cast_null1/test.desc | 0 .../regression/jbmc}/cast_null1/test.java | 0 .../regression/jbmc}/cast_null2/test.class | Bin .../regression/jbmc}/cast_null2/test.desc | 0 .../regression/jbmc}/cast_null2/test.java | 0 .../regression/jbmc}/catch1/catch1.class | Bin .../regression/jbmc}/catch1/catch1.java | 0 .../regression/jbmc}/catch1/test.desc | 0 .../regression/jbmc}/char1/char1.class | Bin .../regression/jbmc}/char1/char1.java | 0 .../regression/jbmc}/char1/test.desc | 0 .../jbmc}/classpath1/my_cp/test2.class | Bin .../jbmc}/classpath1/my_cp/test2.java | 0 .../regression/jbmc}/classpath1/test.class | Bin .../regression/jbmc}/classpath1/test.desc | 0 .../regression/jbmc}/classpath1/test.java | 0 .../jbmc}/classpath2/jarfile3$A.class | Bin .../jbmc}/classpath2/jarfile3$B.class | Bin .../jbmc}/classpath2/jarfile3.class | Bin .../regression/jbmc}/classpath2/jarfile3.java | 0 .../regression/jbmc}/classpath2/test.desc | 0 .../jbmc}/classtest1/classtest1.class | Bin .../jbmc}/classtest1/classtest1.java | 0 .../regression/jbmc}/classtest1/test.desc | 0 .../regression/jbmc}/const1/const1.class | Bin .../regression/jbmc}/const1/const1.java | 0 .../regression/jbmc}/const1/test.desc | 0 .../regression/jbmc}/constructor1/A.class | Bin .../jbmc}/constructor1/constructor1.class | Bin .../jbmc}/constructor1/constructor1.java | 0 .../regression/jbmc}/constructor1/sub.class | Bin .../regression/jbmc}/constructor1/test.desc | 0 .../regression/jbmc}/coreModels/test.class | Bin .../regression/jbmc}/coreModels/test.desc | 0 .../regression/jbmc}/coreModels/test.java | 0 .../regression/jbmc}/covered1/covered1.class | Bin .../regression/jbmc}/covered1/covered1.java | 0 .../regression/jbmc}/covered1/test.desc | 0 .../regression/jbmc}/destructor1/Break.class | Bin .../regression/jbmc}/destructor1/Break.java | 0 .../regression/jbmc}/destructor1/test.desc | 0 .../jbmc}/divide_by_zero/DivideByZero.class | Bin .../jbmc}/divide_by_zero/DivideByZero.java | 0 .../regression/jbmc}/divide_by_zero/test.desc | 0 .../regression/jbmc}/double1/double1.class | Bin .../regression/jbmc}/double1/double1.java | 0 .../regression/jbmc}/double1/test.desc | 0 .../TestClass.class | Bin .../TestClass.java | 0 .../dynamic-multi-dimensional-array/test.desc | 0 .../regression/jbmc}/enum1/enum1.class | Bin .../regression/jbmc}/enum1/enum1.java | 0 .../regression/jbmc}/enum1/test.desc | 0 .../regression/jbmc}/environment1/Main.class | Bin .../regression/jbmc}/environment1/Main.java | 0 .../regression/jbmc}/environment1/test.desc | 0 .../regression/jbmc}/exceptions1/A.class | Bin .../regression/jbmc}/exceptions1/B.class | Bin .../regression/jbmc}/exceptions1/C.class | Bin .../regression/jbmc}/exceptions1/D.class | Bin .../regression/jbmc}/exceptions1/test.class | Bin .../regression/jbmc}/exceptions1/test.desc | 0 .../regression/jbmc}/exceptions1/test.java | 0 .../regression/jbmc}/exceptions10/A.class | Bin .../regression/jbmc}/exceptions10/B.class | Bin .../regression/jbmc}/exceptions10/C.class | Bin .../regression/jbmc}/exceptions10/test.class | Bin .../regression/jbmc}/exceptions10/test.desc | 0 .../regression/jbmc}/exceptions10/test.java | 0 .../regression/jbmc}/exceptions11/A.class | Bin .../regression/jbmc}/exceptions11/B.class | Bin .../regression/jbmc}/exceptions11/test.class | Bin .../regression/jbmc}/exceptions11/test.desc | 0 .../regression/jbmc}/exceptions11/test.java | 0 .../regression/jbmc}/exceptions12/A.class | Bin .../regression/jbmc}/exceptions12/B.class | Bin .../regression/jbmc}/exceptions12/C.class | Bin .../regression/jbmc}/exceptions12/F.class | Bin .../regression/jbmc}/exceptions12/test.class | Bin .../regression/jbmc}/exceptions12/test.desc | 0 .../regression/jbmc}/exceptions12/test.java | 0 .../regression/jbmc}/exceptions13/A.class | Bin .../regression/jbmc}/exceptions13/B.class | Bin .../regression/jbmc}/exceptions13/C.class | Bin .../regression/jbmc}/exceptions13/F.class | Bin .../regression/jbmc}/exceptions13/test.class | Bin .../regression/jbmc}/exceptions13/test.desc | 0 .../regression/jbmc}/exceptions13/test.java | 0 .../regression/jbmc}/exceptions14/A.class | Bin .../regression/jbmc}/exceptions14/B.class | Bin .../regression/jbmc}/exceptions14/C.class | Bin .../regression/jbmc}/exceptions14/test.class | Bin .../regression/jbmc}/exceptions14/test.desc | 0 .../regression/jbmc}/exceptions14/test.java | 0 .../jbmc}/exceptions15/InetAddress.class | Bin .../exceptions15/InetSocketAddress.class | Bin .../regression/jbmc}/exceptions15/test.class | Bin .../regression/jbmc}/exceptions15/test.desc | 0 .../regression/jbmc}/exceptions15/test.java | 0 .../regression/jbmc}/exceptions16/A.class | Bin .../regression/jbmc}/exceptions16/B.class | Bin .../regression/jbmc}/exceptions16/C.class | Bin .../regression/jbmc}/exceptions16/test.class | Bin .../regression/jbmc}/exceptions16/test.desc | 0 .../regression/jbmc}/exceptions16/test.java | 0 .../regression/jbmc}/exceptions18/A.class | Bin .../regression/jbmc}/exceptions18/Test.class | Bin .../regression/jbmc}/exceptions18/Test.java | 0 .../regression/jbmc}/exceptions18/test.desc | 0 .../exceptions19/exception_handler.class | Bin .../jbmc}/exceptions19/exception_handler.j | 0 .../regression/jbmc}/exceptions19/test.desc | 0 .../regression/jbmc}/exceptions2/A.class | Bin .../regression/jbmc}/exceptions2/B.class | Bin .../regression/jbmc}/exceptions2/C.class | Bin .../regression/jbmc}/exceptions2/test.class | Bin .../regression/jbmc}/exceptions2/test.desc | 0 .../regression/jbmc}/exceptions2/test.java | 0 .../regression/jbmc}/exceptions20/A.class | Bin .../regression/jbmc}/exceptions20/B.class | Bin .../regression/jbmc}/exceptions20/C.class | Bin .../regression/jbmc}/exceptions20/D.class | Bin .../regression/jbmc}/exceptions20/test.class | Bin .../regression/jbmc}/exceptions20/test.desc | 0 .../regression/jbmc}/exceptions20/test.java | 0 .../regression/jbmc}/exceptions21/test.class | Bin .../regression/jbmc}/exceptions21/test.desc | 0 .../regression/jbmc}/exceptions21/test.java | 0 .../regression/jbmc}/exceptions22/test.class | Bin .../regression/jbmc}/exceptions22/test.desc | 0 .../regression/jbmc}/exceptions22/test.java | 0 .../regression/jbmc}/exceptions23/test.class | Bin .../regression/jbmc}/exceptions23/test.desc | 0 .../regression/jbmc}/exceptions23/test.java | 0 .../regression/jbmc}/exceptions24/A.class | Bin .../regression/jbmc}/exceptions24/test.class | Bin .../regression/jbmc}/exceptions24/test.desc | 0 .../regression/jbmc}/exceptions24/test.java | 0 .../regression/jbmc}/exceptions26/A.class | Bin .../regression/jbmc}/exceptions26/B.class | Bin .../regression/jbmc}/exceptions26/test.class | Bin .../regression/jbmc}/exceptions26/test.desc | 0 .../regression/jbmc}/exceptions26/test.java | 0 .../regression/jbmc}/exceptions27/A.class | Bin .../regression/jbmc}/exceptions27/B.class | Bin .../regression/jbmc}/exceptions27/test.class | Bin .../regression/jbmc}/exceptions27/test.desc | 0 .../regression/jbmc}/exceptions27/test.java | 0 .../regression/jbmc}/exceptions3/A.class | Bin .../regression/jbmc}/exceptions3/B.class | Bin .../regression/jbmc}/exceptions3/C.class | Bin .../regression/jbmc}/exceptions3/test.class | Bin .../regression/jbmc}/exceptions3/test.desc | 0 .../regression/jbmc}/exceptions3/test.java | 0 .../regression/jbmc}/exceptions4/A.class | Bin .../regression/jbmc}/exceptions4/B.class | Bin .../regression/jbmc}/exceptions4/C.class | Bin .../regression/jbmc}/exceptions4/test.class | Bin .../regression/jbmc}/exceptions4/test.desc | 0 .../regression/jbmc}/exceptions4/test.java | 0 .../regression/jbmc}/exceptions5/A.class | Bin .../regression/jbmc}/exceptions5/B.class | Bin .../regression/jbmc}/exceptions5/C.class | Bin .../regression/jbmc}/exceptions5/D.class | Bin .../regression/jbmc}/exceptions5/test.class | Bin .../regression/jbmc}/exceptions5/test.desc | 0 .../regression/jbmc}/exceptions5/test.java | 0 .../regression/jbmc}/exceptions6/A.class | Bin .../regression/jbmc}/exceptions6/B.class | Bin .../regression/jbmc}/exceptions6/C.class | Bin .../regression/jbmc}/exceptions6/D.class | Bin .../regression/jbmc}/exceptions6/test.class | Bin .../regression/jbmc}/exceptions6/test.desc | 0 .../regression/jbmc}/exceptions6/test.java | 0 .../regression/jbmc}/exceptions7/A.class | Bin .../regression/jbmc}/exceptions7/B.class | Bin .../regression/jbmc}/exceptions7/C.class | Bin .../regression/jbmc}/exceptions7/test.class | Bin .../regression/jbmc}/exceptions7/test.desc | 0 .../regression/jbmc}/exceptions7/test.java | 0 .../regression/jbmc}/exceptions8/A.class | Bin .../regression/jbmc}/exceptions8/B.class | Bin .../regression/jbmc}/exceptions8/C.class | Bin .../regression/jbmc}/exceptions8/test.class | Bin .../regression/jbmc}/exceptions8/test.desc | 0 .../regression/jbmc}/exceptions8/test.java | 0 .../regression/jbmc}/exceptions9/A.class | Bin .../regression/jbmc}/exceptions9/B.class | Bin .../regression/jbmc}/exceptions9/C.class | Bin .../regression/jbmc}/exceptions9/test.class | Bin .../regression/jbmc}/exceptions9/test.desc | 0 .../regression/jbmc}/exceptions9/test.java | 0 .../jbmc}/external_getstatic1/test.class | Bin .../jbmc}/external_getstatic1/test.desc | 0 .../jbmc}/external_getstatic1/test.java | 0 .../regression/jbmc}/farith1/__CPROVER.class | Bin .../regression/jbmc}/farith1/farith1.class | Bin .../regression/jbmc}/farith1/farith1.java | 0 .../regression/jbmc}/farith1/test.desc | 0 .../jbmc}/fcmpx_dcmpx1/fcmpx_dcmpx1.class | Bin .../jbmc}/fcmpx_dcmpx1/fcmpx_dcmpx1.java | 0 .../regression/jbmc}/fcmpx_dcmpx1/test.desc | 0 .../regression/jbmc}/finally1/test.class | Bin .../regression/jbmc}/finally1/test.desc | 0 .../regression/jbmc}/finally1/test.java | 0 .../regression/jbmc}/finally2/test.class | Bin .../regression/jbmc}/finally2/test.desc | 0 .../regression/jbmc}/finally2/test.java | 0 .../regression/jbmc}/finally3/test.class | Bin .../regression/jbmc}/finally3/test.desc | 0 .../regression/jbmc}/finally3/test.java | 0 .../regression/jbmc}/finally4/test.class | Bin .../regression/jbmc}/finally4/test.desc | 0 .../regression/jbmc}/finally4/test.java | 0 .../regression/jbmc}/finally5/test.class | Bin .../regression/jbmc}/finally5/test.desc | 0 .../regression/jbmc}/finally5/test.java | 0 .../regression/jbmc}/finally6/test.class | Bin .../regression/jbmc}/finally6/test.desc | 0 .../regression/jbmc}/finally6/test.java | 0 .../regression/jbmc}/finally7/test.class | Bin .../regression/jbmc}/finally7/test.desc | 0 .../regression/jbmc}/finally7/test.java | 0 .../regression/jbmc}/float1/float1.class | Bin .../regression/jbmc}/float1/float1.java | 0 .../regression/jbmc}/float1/test.desc | 0 .../regression/jbmc}/function1/Main.class | Bin .../regression/jbmc}/function1/Main.java | 0 .../regression/jbmc}/function1/Other.class | Bin .../regression/jbmc}/function1/test.desc | 0 .../regression/jbmc}/function2/A.class | Bin .../regression/jbmc}/function2/B.class | Bin .../regression/jbmc}/function2/C.class | Bin .../regression/jbmc}/function2/D.class | Bin .../regression/jbmc}/function2/Main.class | Bin .../regression/jbmc}/function2/Main.java | 0 .../regression/jbmc}/function2/test.desc | 0 .../regression/jbmc}/function3/A.class | Bin .../regression/jbmc}/function3/B.class | Bin .../regression/jbmc}/function3/Main.class | Bin .../regression/jbmc}/function3/Main.java | 0 .../regression/jbmc}/function3/test.desc | 0 .../regression/jbmc}/function4/Main.class | Bin .../regression/jbmc}/function4/Main.java | 0 .../regression/jbmc}/function4/Other.class | Bin .../regression/jbmc}/function4/test.desc | 0 .../jbmc}/generic_class_bound1/A.class | Bin .../jbmc}/generic_class_bound1/B.class | Bin .../jbmc}/generic_class_bound1/C.class | Bin .../jbmc}/generic_class_bound1/Gn.class | Bin .../jbmc}/generic_class_bound1/Gn.java | 0 .../jbmc}/generic_class_bound1/L.class | Bin .../jbmc}/generic_class_bound1/test.desc | 0 .../jbmc}/generics_type_param/AWrapper.class | Bin .../jbmc}/generics_type_param/FWrapper.class | Bin .../GenericFields$SimpleGenericField.class | Bin .../generics_type_param/GenericFields.class | Bin .../generics_type_param/GenericFields.java | 0 .../jbmc}/generics_type_param/IWrapper.class | Bin .../generics_type_param/SimpleWrapper.class | Bin .../jbmc}/generics_type_param/test.desc | 0 .../regression/jbmc}/iarith1/iarith1.class | Bin .../regression/jbmc}/iarith1/iarith1.java | 0 .../regression/jbmc}/iarith1/test.desc | 0 .../regression/jbmc}/iarith2/iarith2.class | Bin .../regression/jbmc}/iarith2/iarith2.java | 0 .../regression/jbmc}/iarith2/test.desc | 0 .../regression/jbmc}/if_acmp1/A.class | Bin .../regression/jbmc}/if_acmp1/B.class | Bin .../regression/jbmc}/if_acmp1/if_acmp1.class | Bin .../regression/jbmc}/if_acmp1/if_acmp1.java | 0 .../regression/jbmc}/if_acmp1/test.desc | 0 .../regression/jbmc}/if_expr1/if_expr1.class | Bin .../regression/jbmc}/if_expr1/if_expr1.java | 0 .../regression/jbmc}/if_expr1/test.desc | 0 .../regression/jbmc}/if_icmp1/if_icmp1.class | Bin .../regression/jbmc}/if_icmp1/if_icmp1.java | 0 .../regression/jbmc}/if_icmp1/test.desc | 0 .../regression/jbmc}/ifxx1/ifxx1.class | Bin .../regression/jbmc}/ifxx1/ifxx1.java | 0 .../regression/jbmc}/ifxx1/test.desc | 0 .../jbmc}/inferlexicalscope1/test.class | Bin .../jbmc}/inferlexicalscope1/test.desc | 0 .../jbmc}/inferlexicalscope1/test.java | 0 .../inherited_static_field1/Parent.class | Bin .../jbmc}/inherited_static_field1/Test.class | Bin .../jbmc}/inherited_static_field1/Test.java | 0 .../jbmc}/inherited_static_field1/test.desc | 0 .../inherited_static_field10/Parent.class | Bin .../inherited_static_field10/Parent.java | 0 .../jbmc}/inherited_static_field10/Test.class | Bin .../jbmc}/inherited_static_field10/Test.java | 0 .../compile_against/Parent.class | Bin .../compile_against/Parent.java | 0 .../jbmc}/inherited_static_field10/test.desc | 0 .../InterfaceWithStatic.class | Bin .../InterfaceWithStatic.java | 0 .../inherited_static_field2/Parent.class | Bin .../jbmc}/inherited_static_field2/Test.class | Bin .../jbmc}/inherited_static_field2/Test.java | 0 .../jbmc}/inherited_static_field2/test.desc | 0 .../jbmc}/inherited_static_field3/Test.class | Bin .../jbmc}/inherited_static_field3/Test.java | 0 .../jbmc}/inherited_static_field3/test.desc | 0 .../inherited_static_field4/Grandparent.class | Bin .../inherited_static_field4/Parent.class | Bin .../jbmc}/inherited_static_field4/Test.class | Bin .../jbmc}/inherited_static_field4/Test.java | 0 .../jbmc}/inherited_static_field4/test.desc | 0 .../InterfaceWithStatic.class | Bin .../InterfaceWithStatic.java | 0 .../jbmc}/inherited_static_field5/Test.class | Bin .../jbmc}/inherited_static_field5/Test.java | 0 .../jbmc}/inherited_static_field5/test.desc | 0 .../inherited_static_field6/Grandparent.class | Bin .../jbmc}/inherited_static_field6/Test.class | Bin .../jbmc}/inherited_static_field6/Test.java | 0 .../jbmc}/inherited_static_field6/test.desc | 0 .../OpaqueInterfaceWithStatic.java | 0 .../jbmc}/inherited_static_field7/Test.class | Bin .../jbmc}/inherited_static_field7/Test.java | 0 .../jbmc}/inherited_static_field7/test.desc | 0 .../inherited_static_field8/Parent.class | Bin .../jbmc}/inherited_static_field8/Test.class | Bin .../jbmc}/inherited_static_field8/Test.java | 0 .../jbmc}/inherited_static_field8/test.desc | 0 .../inherited_static_field9/Parent.class | Bin .../jbmc}/inherited_static_field9/Parent.java | 0 .../jbmc}/inherited_static_field9/Test.class | Bin .../jbmc}/inherited_static_field9/Test.java | 0 .../compile_against/Parent.class | Bin .../compile_against/Parent.java | 0 .../jbmc}/inherited_static_field9/test.desc | 0 .../jbmc}/instanceof1/instanceof1.class | Bin .../jbmc}/instanceof1/instanceof1.java | 0 .../regression/jbmc}/instanceof1/test.desc | 0 .../jbmc}/instanceof2/instanceof2.class | Bin .../jbmc}/instanceof2/instanceof2.java | 0 .../regression/jbmc}/instanceof2/test.desc | 0 .../jbmc}/instanceof3/instanceof3.class | Bin .../jbmc}/instanceof3/instanceof3.java | 0 .../regression/jbmc}/instanceof3/test.desc | 0 .../jbmc}/instanceof4/instanceof4.class | Bin .../jbmc}/instanceof4/instanceof4.java | 0 .../regression/jbmc}/instanceof4/test.desc | 0 .../jbmc}/instanceof5/instanceof5.class | Bin .../jbmc}/instanceof5/instanceof5.java | 0 .../regression/jbmc}/instanceof5/test.desc | 0 .../regression/jbmc}/instanceof6/A.class | Bin .../regression/jbmc}/instanceof6/B.class | Bin .../jbmc}/instanceof6/instanceof6.class | Bin .../jbmc}/instanceof6/instanceof6.java | 0 .../regression/jbmc}/instanceof6/test.desc | 0 .../regression/jbmc}/instanceof7/A.class | Bin .../regression/jbmc}/instanceof7/B.class | Bin .../jbmc}/instanceof7/instanceof7.class | Bin .../jbmc}/instanceof7/instanceof7.java | 0 .../regression/jbmc}/instanceof7/test.desc | 0 .../jbmc}/instanceof8/InstanceOf8.class | Bin .../jbmc}/instanceof8/InstanceOf8.java | 0 .../regression/jbmc}/instanceof8/test.desc | 0 .../integer_without_simplify1/test.class | Bin .../jbmc}/integer_without_simplify1/test.desc | 0 .../jbmc}/integer_without_simplify1/test.java | 0 .../regression/jbmc}/interface1/A.class | Bin .../regression/jbmc}/interface1/B.class | Bin .../regression/jbmc}/interface1/C.class | Bin .../jbmc}/interface1/interface1.class | Bin .../jbmc}/interface1/interface1.java | 0 .../regression/jbmc}/interface1/test.desc | 0 .../nestedobjects/subpackage/Item.class | Bin .../nestedobjects/subpackage/Item.java | 0 .../nestedobjects/subpackage/Order.class | Bin .../nestedobjects/subpackage/Order.java | 0 .../nestedobjects/subpackage/readme.txt | 0 .../regression/jbmc}/internal1/test.desc | 0 .../jbmc}/invalid_classpath/Test.class | Bin .../jbmc}/invalid_classpath/Test.java | 0 .../jbmc}/invalid_classpath/test-jar.desc | 0 .../jbmc}/invalid_classpath/test-path.desc | 0 .../regression/jbmc}/isnan1/test.class | Bin .../regression/jbmc}/isnan1/test.desc | 0 .../regression/jbmc}/isnan1/test.java | 0 .../jbmc}/iterator1/iterator1.class | Bin .../regression/jbmc}/iterator1/iterator1.java | 0 .../regression/jbmc}/iterator1/test.desc | 0 .../jbmc}/iterator2/iterator2.class | Bin .../regression/jbmc}/iterator2/iterator2.java | 0 .../regression/jbmc}/iterator2/test.desc | 0 .../regression/jbmc}/jar-file1/some_jar.jar | Bin .../regression/jbmc}/jar-file1/test.desc | 0 .../regression/jbmc}/jar-file2/jar-file2.jar | Bin .../jbmc}/jar-file2/some_class.java | 0 .../regression/jbmc}/jar-file2/test.desc | 0 .../regression/jbmc}/jar-file3/A.jar | Bin .../regression/jbmc}/jar-file3/B.jar | Bin .../regression/jbmc}/jar-file3/C.jar | Bin .../regression/jbmc}/jar-file3/jarfile3.class | Bin .../regression/jbmc}/jar-file3/jarfile3.java | 0 .../regression/jbmc}/jar-file3/test.desc | 0 .../regression/jbmc}/jar-file4/A.jar | Bin .../regression/jbmc}/jar-file4/B.jar | Bin .../regression/jbmc}/jar-file4/C.jar | Bin .../regression/jbmc}/jar-file4/jar.json | 0 .../regression/jbmc}/jar-file4/test.desc | 0 .../regression/jbmc}/json_trace1/Test.class | Bin .../regression/jbmc}/json_trace1/Test.java | 0 .../regression/jbmc}/json_trace1/test.desc | 0 .../regression/jbmc}/json_trace2/Test.class | Bin .../regression/jbmc}/json_trace2/Test.java | 0 .../regression/jbmc}/json_trace2/test.desc | 0 .../regression/jbmc}/json_trace3/Test.class | Bin .../regression/jbmc}/json_trace3/Test.java | 0 .../regression/jbmc}/json_trace3/test.desc | 0 .../util/concurrent/ConcurrentHashMap.class | Bin .../regression/jbmc}/jsr1/test.desc | 0 .../regression/jbmc}/jsr2/test.class | Bin .../regression/jbmc}/jsr2/test.desc | 0 .../regression/jbmc}/jsr2/test.j | 0 .../regression/jbmc}/lambda1/B.class | Bin .../regression/jbmc}/lambda1/B.java | 0 .../regression/jbmc}/lambda1/C.class | Bin .../jbmc}/lambda1/CustomLambda.class | Bin .../jbmc}/lambda1/CustomLambda.java | 0 .../jbmc}/lambda1/Lambdatest$A.class | Bin .../regression/jbmc}/lambda1/Lambdatest.class | Bin .../regression/jbmc}/lambda1/Lambdatest.java | 0 .../regression/jbmc}/lambda1/test.desc | 0 .../jbmc}/lambda2/StaticMethodRef.class | Bin .../jbmc}/lambda2/StaticMethodRef.java | 0 .../regression/jbmc}/lambda2/SymStream.class | Bin .../regression/jbmc}/lambda2/readme.txt | 0 .../regression/jbmc}/lambda2/test.desc | 0 .../jbmc}/lambda2/test_no_crash.desc | 0 .../jbmc}/lambda2/test_no_crash_ecj.desc | 0 .../jbmc}/lambda3/LambdaTest/Lamb1.class | Bin .../jbmc}/lambda3/LambdaTest/Test.class | Bin .../jbmc}/lambda3/LambdaTest/Test.java | 0 .../regression/jbmc}/lambda3/test.desc | 0 .../regression/jbmc}/lazyloading1/A.class | Bin .../regression/jbmc}/lazyloading1/B.class | Bin .../regression/jbmc}/lazyloading1/test.class | Bin .../regression/jbmc}/lazyloading1/test.desc | 0 .../regression/jbmc}/lazyloading1/test.java | 0 .../regression/jbmc}/lazyloading10/test.class | Bin .../regression/jbmc}/lazyloading10/test.desc | 0 .../regression/jbmc}/lazyloading10/test.java | 0 .../regression/jbmc}/lazyloading11/test.class | Bin .../regression/jbmc}/lazyloading11/test.desc | 0 .../regression/jbmc}/lazyloading11/test.java | 0 .../regression/jbmc}/lazyloading2/A.class | Bin .../regression/jbmc}/lazyloading2/B.class | Bin .../regression/jbmc}/lazyloading2/test.class | Bin .../regression/jbmc}/lazyloading2/test.desc | 0 .../regression/jbmc}/lazyloading2/test.java | 0 .../regression/jbmc}/lazyloading3/A.class | Bin .../regression/jbmc}/lazyloading3/B.class | Bin .../regression/jbmc}/lazyloading3/C.class | Bin .../regression/jbmc}/lazyloading3/D.class | Bin .../regression/jbmc}/lazyloading3/test.class | Bin .../regression/jbmc}/lazyloading3/test.desc | 0 .../regression/jbmc}/lazyloading3/test.java | 0 .../regression/jbmc}/lazyloading4/Main.class | Bin .../regression/jbmc}/lazyloading4/Main.java | 0 .../jbmc}/lazyloading4/Problem.class | Bin .../regression/jbmc}/lazyloading4/test.desc | 0 .../regression/jbmc}/lazyloading5/other.class | Bin .../regression/jbmc}/lazyloading5/test.class | Bin .../regression/jbmc}/lazyloading5/test.desc | 0 .../regression/jbmc}/lazyloading5/test.java | 0 .../regression/jbmc}/lazyloading6/test.class | Bin .../regression/jbmc}/lazyloading6/test.desc | 0 .../regression/jbmc}/lazyloading6/test.java | 0 .../regression/jbmc}/lazyloading7/test.class | Bin .../regression/jbmc}/lazyloading7/test.desc | 0 .../regression/jbmc}/lazyloading7/test.java | 0 .../regression/jbmc}/lazyloading8/test.class | Bin .../regression/jbmc}/lazyloading8/test.desc | 0 .../regression/jbmc}/lazyloading8/test.java | 0 .../regression/jbmc}/lazyloading9/test.class | Bin .../regression/jbmc}/lazyloading9/test.desc | 0 .../regression/jbmc}/lazyloading9/test.java | 0 .../asserthere.class | Bin .../lazyloading_array_parameter/test.class | Bin .../lazyloading_array_parameter/test.desc | 0 .../lazyloading_array_parameter/test.java | 0 .../jbmc}/lazyloading_cyclic_class/Base.class | Bin .../lazyloading_cyclic_class/Derived.class | Bin .../jbmc}/lazyloading_cyclic_class/Foo.class | Bin .../lazyloading_cyclic_class/Middle.class | Bin .../lazyloading_cyclic_class/cycle1.class | Bin .../lazyloading_cyclic_class/cycle2.class | Bin .../jbmc}/lazyloading_cyclic_class/test.class | Bin .../jbmc}/lazyloading_cyclic_class/test.desc | 0 .../jbmc}/lazyloading_cyclic_class/test.java | 0 .../asserthere.class | Bin .../container.class | Bin .../test.class | Bin .../test.desc | 0 .../test.java | 0 .../asserthere.class | Bin .../container.class | Bin .../test.class | Bin .../test.desc | 0 .../test.java | 0 .../jbmc}/lazyloading_inheritance/Base.class | Bin .../lazyloading_inheritance/Derived.class | Bin .../lazyloading_inheritance/Middle.class | Bin .../jbmc}/lazyloading_inheritance/test.class | Bin .../jbmc}/lazyloading_inheritance/test.desc | 0 .../jbmc}/lazyloading_inheritance/test.java | 0 .../lazyloading_inheritance_field/Base.class | Bin .../Derived.class | Bin .../lazyloading_inheritance_field/Foo.class | Bin .../Middle.class | Bin .../lazyloading_inheritance_field/test.class | Bin .../lazyloading_inheritance_field/test.desc | 0 .../lazyloading_inheritance_field/test.java | 0 .../lazyloading_multiple_array_types/A.class | Bin .../lazyloading_multiple_array_types/A.java | 0 .../lazyloading_multiple_array_types/B.class | Bin .../lazyloading_multiple_array_types/B.java | 0 .../Test.class | Bin .../Test.java | 0 .../test.desc | 0 .../asserthere.class | Bin .../container.class | Bin .../test.class | Bin .../test.desc | 0 .../test.java | 0 .../asserthere.class | Bin .../container.class | Bin .../container2.class | Bin .../test.class | Bin .../test.desc | 0 .../test.java | 0 .../Test$factory_intf.class | Bin .../lazyloading_no_candidates/Test$intf.class | Bin .../lazyloading_no_candidates/Test.class | Bin .../jbmc}/lazyloading_no_candidates/Test.java | 0 .../jbmc}/lazyloading_no_candidates/test.desc | 0 .../lazyloading_recursive_class/Base.class | Bin .../lazyloading_recursive_class/Derived.class | Bin .../lazyloading_recursive_class/Foo.class | Bin .../lazyloading_recursive_class/Middle.class | Bin .../lazyloading_recursive_class/test.class | Bin .../lazyloading_recursive_class/test.desc | 0 .../lazyloading_recursive_class/test.java | 0 .../Test.class | Bin .../Test.java | 0 .../Unused.class | Bin .../check_clinit_normally_present.desc | 0 .../check_clinit_removed_by_lazy_loading.desc | 0 .../check_runs_with_lazy_loading.desc | 0 .../Test.class | Bin .../Test.java | 0 .../Unused1.class | Bin .../Unused2.class | Bin .../check_clinit_normally_present.desc | 0 .../check_clinit_removed_by_lazy_loading.desc | 0 .../check_runs_with_lazy_loading.desc | 0 .../Test.class | Bin .../Test.java | 0 .../check_clinit_normally_present.desc | 0 .../check_clinit_removed_by_lazy_loading.desc | 0 .../check_runs_with_lazy_loading.desc | 0 .../regression/jbmc}/list1/LinkedList.class | Bin .../jbmc}/list1/LinkedListEntry.class | Bin .../jbmc}/list1/__CPROVER_nondet.class | Bin .../jbmc}/list1/__CPROVER_synthesis.class | Bin .../regression/jbmc}/list1/list1.class | Bin .../regression/jbmc}/list1/list1.java | 0 .../regression/jbmc}/list1/test.desc | 0 .../regression/jbmc}/long1/long1.class | Bin .../regression/jbmc}/long1/long1.java | 0 .../regression/jbmc}/long1/test.desc | 0 .../jbmc}/lookupswitch1/lookupswitch1.class | Bin .../jbmc}/lookupswitch1/lookupswitch1.java | 0 .../regression/jbmc}/lookupswitch1/test.desc | 0 .../regression/jbmc}/loop1/loop1.class | Bin .../regression/jbmc}/loop1/loop1.java | 0 .../regression/jbmc}/loop1/test.desc | 0 .../ManyLocalVariables.class | Bin .../ManyLocalVariables.j | 0 .../lots_local_variables_manual/test.desc | 0 .../TooManyLocals.class | Bin .../TooManyLocals.java | 0 .../jbmc}/lots_of_local_variables/test.desc | 0 .../lvt-groovy/DetectSplitPackagesTask.class | Bin .../regression/jbmc}/lvt-groovy/test.desc | 0 .../regression/jbmc}/lvt-unexpected/Makefile | 0 .../regression/jbmc}/lvt-unexpected/test.desc | 0 .../jbmc}/lvt-unexpected/unexpected.class | Bin .../jbmc}/lvt-unexpected/unexpected.j | 0 .../method_parmeters1/method_parameters.class | Bin .../method_parmeters1/method_parameters.java | 0 .../jbmc}/method_parmeters1/test.desc | 0 .../method_parmeters2/method_parameters.class | Bin .../method_parmeters2/method_parameters.java | 0 .../jbmc}/method_parmeters2/test.desc | 0 .../jbmc}/monitorenter1/monitorenter1.class | Bin .../jbmc}/monitorenter1/monitorenter1.java | 0 .../regression/jbmc}/monitorenter1/test.desc | 0 .../regression/jbmc}/multinewarray/A.class | Bin .../jbmc}/multinewarray/multinewarray.class | Bin .../jbmc}/multinewarray/multinewarray.java | 0 .../regression/jbmc}/multinewarray/test.desc | 0 .../regression/jbmc}/overlay-class/Test.class | Bin .../regression/jbmc}/overlay-class/Test.java | 0 .../diffblue/OverlayClassImplementation.class | Bin .../diffblue/OverlayClassImplementation.java | 0 .../OverlayMethodImplementation.class | Bin .../diffblue/OverlayMethodImplementation.java | 0 .../overlay-class/correct-overlay/Test.class | Bin .../overlay-class/correct-overlay/Test.java | 0 .../jbmc}/overlay-class/correct-test.desc | 0 .../jbmc}/overlay-class/duplicate-test.desc | 0 .../jbmc}/overlay-class/format_classpath.sh | 0 .../jbmc}/overlay-class/misordered-test.desc | 0 .../overlay-class/unmarked-overlay/Test.class | Bin .../overlay-class/unmarked-overlay/Test.java | 0 .../jbmc}/overlay-class/unmarked-test.desc | 0 .../jbmc}/overloading1/other_class.class | Bin .../jbmc}/overloading1/overloading1.class | Bin .../jbmc}/overloading1/overloading1.java | 0 .../regression/jbmc}/overloading1/test.desc | 0 .../regression/jbmc}/package1/classA.class | Bin .../regression/jbmc}/package1/classA.java | 0 .../jbmc}/package1/mypackage/classB.class | Bin .../jbmc}/package1/mypackage/classB.java | 0 .../regression/jbmc}/package1/test.desc | 0 .../jbmc}/package_friendly1/main.class | Bin .../jbmc}/package_friendly1/main.java | 0 .../package_friendly1/package_friendly1.class | Bin .../package_friendly1/package_friendly1.java | 0 .../package_friendly1/package_friendly2.class | Bin .../jbmc}/package_friendly1/test.desc | 0 .../PhiMergeUninitialized.class | Bin .../PhiMergeUninitialized.java | 0 .../phi-merge_uninitialized_values/field.desc | 0 .../phi-merge_uninitialized_values/local.desc | 0 .../static_field.desc | 0 .../regression/jbmc}/pointer_check1/A.class | Bin .../regression/jbmc}/pointer_check1/B.class | Bin .../jbmc}/pointer_check1/pointer_check1.class | Bin .../jbmc}/pointer_check1/pointer_check1.java | 0 .../regression/jbmc}/pointer_check1/test.desc | 0 .../java/lang/Object.class | Bin .../java/lang/Object.java | 0 .../provide_object_implementation/test.desc | 0 .../jbmc}/putfield_getfield1/A.class | Bin .../putfield_getfield1.class | Bin .../putfield_getfield1.java | 0 .../jbmc}/putfield_getfield1/test.desc | 0 .../jbmc}/putstatic_getstatic1/A.class | Bin .../putstatic_getstatic1.class | Bin .../putstatic_getstatic1.java | 0 .../jbmc}/putstatic_getstatic1/test.desc | 0 .../putstatic_source_location/test.class | Bin .../jbmc}/putstatic_source_location/test.desc | 0 .../jbmc}/putstatic_source_location/test.java | 0 .../jbmc}/reachability-slice/A.class | Bin .../jbmc}/reachability-slice/A.java | 0 .../jbmc}/reachability-slice/test.desc | 0 .../jbmc}/reachability-slice/test2.desc | 0 .../jbmc}/reachability-slice/test3.desc | 0 .../jbmc}/recursion1/recursion1.class | Bin .../jbmc}/recursion1/recursion1.java | 0 .../jbmc}/recursion2/recursion2.class | Bin .../jbmc}/recursion2/recursion2.java | 0 .../regression/jbmc}/recursion2/test.desc | 0 .../VirtualFunctions$A.class | Bin .../VirtualFunctions$B.class | Bin .../VirtualFunctions$C.class | Bin .../VirtualFunctions.class | Bin .../VirtualFunctions.java | 0 .../test.desc | 0 .../AbstractList$Itr.class | Bin .../AbstractList.class | Bin .../AbstractList.java | 0 .../ArrayList$Itr.class | Bin .../ArrayList$ListItr.class | Bin .../removed_virtual_functions/ArrayList.class | Bin .../removed_virtual_functions/ArrayList.java | 0 .../ArrayListEquals.class | Bin .../ArrayListEquals.java | 0 .../removed_virtual_functions/Iterator.class | Bin .../removed_virtual_functions/Iterator.java | 0 .../removed_virtual_functions/List.class | Bin .../jbmc}/removed_virtual_functions/List.java | 0 .../ListIterator.class | Bin .../ListIterator.java | 0 .../jbmc}/removed_virtual_functions/test.desc | 0 .../regression/jbmc}/return1/return1.class | Bin .../regression/jbmc}/return1/return1.java | 0 .../regression/jbmc}/return1/test.desc | 0 .../regression/jbmc}/return2/return2.class | Bin .../regression/jbmc}/return2/return2.java | 0 .../regression/jbmc}/return2/test.desc | 0 .../regression/jbmc}/short1/short1.class | Bin .../regression/jbmc}/short1/short1.java | 0 .../regression/jbmc}/short1/test.desc | 0 .../regression/jbmc}/short2/short2.class | Bin .../regression/jbmc}/short2/short2.java | 0 .../regression/jbmc}/short2/test.desc | 0 .../jbmc}/siblingobjects1/Other.class | Bin .../jbmc}/siblingobjects1/test.class | Bin .../jbmc}/siblingobjects1/test.desc | 0 .../jbmc}/siblingobjects1/test.java | 0 .../jbmc}/siblingobjects2/Other.class | Bin .../jbmc}/siblingobjects2/test.class | Bin .../jbmc}/siblingobjects2/test.desc | 0 .../jbmc}/siblingobjects2/test.java | 0 .../regression/jbmc}/stack_var1/README | 0 .../jbmc}/stack_var1/stack_test.class | Bin .../jbmc}/stack_var1/stack_test.java | 0 .../jbmc}/stack_var1/stack_var1.class | Bin .../regression/jbmc}/stack_var1/stack_var1.j | 0 .../regression/jbmc}/stack_var1/test.desc | 0 .../regression/jbmc}/stack_var10/README | 0 .../jbmc}/stack_var10/stack_test.class | Bin .../jbmc}/stack_var10/stack_test.java | 0 .../jbmc}/stack_var10/stack_var10.class | Bin .../jbmc}/stack_var10/stack_var10.j | 0 .../regression/jbmc}/stack_var10/test.desc | 0 .../regression/jbmc}/stack_var11/README | 0 .../jbmc}/stack_var11/stack_test.class | Bin .../jbmc}/stack_var11/stack_test.java | 0 .../jbmc}/stack_var11/stack_var11.class | Bin .../jbmc}/stack_var11/stack_var11.j | 0 .../regression/jbmc}/stack_var2/README | 0 .../jbmc}/stack_var2/stack_test.class | Bin .../jbmc}/stack_var2/stack_test.java | 0 .../jbmc}/stack_var2/stack_var2.class | Bin .../regression/jbmc}/stack_var2/stack_var2.j | 0 .../regression/jbmc}/stack_var2/test.desc | 0 .../regression/jbmc}/stack_var3/README | 0 .../jbmc}/stack_var3/stack_test.class | Bin .../jbmc}/stack_var3/stack_test.java | 0 .../jbmc}/stack_var3/stack_var3.class | Bin .../regression/jbmc}/stack_var3/stack_var3.j | 0 .../regression/jbmc}/stack_var3/test.desc | 0 .../regression/jbmc}/stack_var4/README | 0 .../jbmc}/stack_var4/stack_test.class | Bin .../jbmc}/stack_var4/stack_test.java | 0 .../jbmc}/stack_var4/stack_var4.class | Bin .../regression/jbmc}/stack_var4/stack_var4.j | 0 .../regression/jbmc}/stack_var4/test.desc | 0 .../regression/jbmc}/stack_var5/README | 0 .../jbmc}/stack_var5/stack_test.class | Bin .../jbmc}/stack_var5/stack_test.java | 0 .../jbmc}/stack_var5/stack_var5.class | Bin .../regression/jbmc}/stack_var5/stack_var5.j | 0 .../regression/jbmc}/stack_var5/test.desc | 0 .../regression/jbmc}/stack_var6/README | 0 .../jbmc}/stack_var6/stack_test.class | Bin .../jbmc}/stack_var6/stack_test.java | 0 .../jbmc}/stack_var6/stack_var6.class | Bin .../regression/jbmc}/stack_var6/stack_var6.j | 0 .../regression/jbmc}/stack_var6/test.desc | 0 .../regression/jbmc}/stack_var7/README | 0 .../jbmc}/stack_var7/stack_test.class | Bin .../jbmc}/stack_var7/stack_test.java | 0 .../jbmc}/stack_var7/stack_var7.class | Bin .../regression/jbmc}/stack_var7/stack_var7.j | 0 .../regression/jbmc}/stack_var7/test.desc | 0 .../regression/jbmc}/stack_var8/README | 0 .../jbmc}/stack_var8/stack_test.class | Bin .../jbmc}/stack_var8/stack_test.java | 0 .../jbmc}/stack_var8/stack_var8.class | Bin .../regression/jbmc}/stack_var8/stack_var8.j | 0 .../regression/jbmc}/stack_var9/README | 0 .../jbmc}/stack_var9/stack_test.class | Bin .../jbmc}/stack_var9/stack_test.java | 0 .../jbmc}/stack_var9/stack_var9.class | Bin .../regression/jbmc}/stack_var9/stack_var9.j | 0 .../regression/jbmc}/static_init1/A.class | Bin .../regression/jbmc}/static_init1/B.class | Bin .../jbmc}/static_init1/static_init.class | Bin .../jbmc}/static_init1/static_init.java | 0 .../regression/jbmc}/static_init1/test.desc | 0 .../regression/jbmc}/static_init1/test1.desc | 0 .../regression/jbmc}/static_init2/A.class | Bin .../regression/jbmc}/static_init2/B.class | Bin .../jbmc}/static_init2/static_init.class | Bin .../jbmc}/static_init2/static_init.java | 0 .../regression/jbmc}/static_init2/test.desc | 0 .../regression/jbmc}/static_init2/test1.desc | 0 .../jbmc}/static_init_order/A.class | Bin .../jbmc}/static_init_order/B.class | Bin .../jbmc}/static_init_order/C.class | Bin .../static_init_order/static_init_order.class | Bin .../static_init_order/static_init_order.java | 0 .../jbmc}/static_init_order/test1.desc | 0 .../jbmc}/static_init_order/test2.desc | 0 .../jbmc}/static_init_order/test3.desc | 0 .../jbmc}/static_init_order/test4.desc | 0 .../jbmc}/static_method1/static_method1.class | Bin .../jbmc}/static_method1/static_method1.java | 0 .../regression/jbmc}/static_method1/test.desc | 0 .../jbmc}/store_load1/store_load1.class | Bin .../jbmc}/store_load1/store_load1.java | 0 .../regression/jbmc}/store_load1/test.desc | 0 .../string_literal1/string_literal1.class | Bin .../string_literal1/string_literal1.java | 0 .../jbmc}/string_literal1/test.desc | 0 .../regression/jbmc}/swap1/Swap.class | Bin .../regression/jbmc}/swap1/Swap.java | 0 .../regression/jbmc}/swap1/SwapDump.java | 0 .../regression/jbmc}/swap1/test.desc | 0 ...Plugin$1$_execute_closure1$_closure2.class | Bin .../build/gradle/MergePlugin.groovy | 0 .../regression/jbmc}/swap2/test.desc | 0 .../regression/jbmc}/synchronized/Sync.class | Bin .../regression/jbmc}/synchronized/Sync.java | 0 .../regression/jbmc}/synchronized/test.desc | 0 .../jbmc}/tableswitch1/tableswitch1.class | Bin .../jbmc}/tableswitch1/tableswitch1.java | 0 .../regression/jbmc}/tableswitch1/test.desc | 0 .../generate_signed_tableswitch.java | 0 .../table_switch_neg_offset.class | Bin .../regression/jbmc}/tableswitch2/test.desc | 0 .../trace_class_identifier/TestGenTest.class | Bin .../trace_class_identifier/TestGenTest.java | 0 .../jbmc}/trace_class_identifier/test.desc | 0 .../trace_options_json_extended/Test.class | Bin .../trace_options_json_extended/Test.java | 0 .../trace_options_json_extended/extended.desc | 0 .../non-extended.desc | 0 .../regression/jbmc}/uninitialised1/test.desc | 0 .../jbmc}/uninitialised1/uninitialised1.class | Bin .../jbmc}/uninitialised1/uninitialised1.java | 0 .../jbmc}/very-long-jumps/NopJumps.class | Bin .../jbmc}/very-long-jumps/NopJumps.j | 0 .../jbmc}/very-long-jumps/test.desc | 0 .../regression/jbmc}/virtual1/A.class | Bin .../regression/jbmc}/virtual1/B.class | Bin .../regression/jbmc}/virtual1/test.desc | 0 .../regression/jbmc}/virtual1/virtual1.class | Bin .../regression/jbmc}/virtual1/virtual1.java | 0 .../regression/jbmc}/virtual10/A.class | Bin .../regression/jbmc}/virtual10/B.class | Bin .../regression/jbmc}/virtual10/C.class | Bin .../regression/jbmc}/virtual10/D.class | Bin .../regression/jbmc}/virtual10/E.class | Bin .../regression/jbmc}/virtual10/O.class | Bin .../regression/jbmc}/virtual10/test.desc | 0 .../regression/jbmc}/virtual10/test.java | 0 .../regression/jbmc}/virtual2/A.class | Bin .../regression/jbmc}/virtual2/B.class | Bin .../regression/jbmc}/virtual2/test.desc | 0 .../regression/jbmc}/virtual2/virtual2.class | Bin .../regression/jbmc}/virtual2/virtual2.java | 0 .../regression/jbmc}/virtual4/A.class | Bin .../regression/jbmc}/virtual4/B.class | Bin .../regression/jbmc}/virtual4/C.class | Bin .../regression/jbmc}/virtual4/test.desc | 0 .../regression/jbmc}/virtual4/virtual4.class | Bin .../regression/jbmc}/virtual4/virtual4.java | 0 .../regression/jbmc}/virtual5/child.class | Bin .../regression/jbmc}/virtual5/parent.class | Bin .../regression/jbmc}/virtual5/test.desc | 0 .../regression/jbmc}/virtual5/virtual5.class | Bin .../regression/jbmc}/virtual5/virtual5.java | 0 .../regression/jbmc}/virtual6/A.class | Bin .../regression/jbmc}/virtual6/A.java | 0 .../regression/jbmc}/virtual6/B.class | Bin .../regression/jbmc}/virtual6/C.class | Bin .../regression/jbmc}/virtual6/test.desc | 0 .../regression/jbmc}/virtual7/A.class | Bin .../regression/jbmc}/virtual7/B.class | Bin .../regression/jbmc}/virtual7/C.class | Bin .../regression/jbmc}/virtual7/D.class | Bin .../regression/jbmc}/virtual7/E.class | Bin .../regression/jbmc}/virtual7/test.class | Bin .../regression/jbmc}/virtual7/test.desc | 0 .../regression/jbmc}/virtual7/test.java | 0 .../regression/jbmc}/virtual8/A.class | Bin .../regression/jbmc}/virtual8/B.class | Bin .../regression/jbmc}/virtual8/C.class | Bin .../regression/jbmc}/virtual8/D.class | Bin .../regression/jbmc}/virtual8/E.class | Bin .../regression/jbmc}/virtual8/Test.class | Bin .../regression/jbmc}/virtual8/Test.java | 0 .../regression/jbmc}/virtual8/test.desc | 0 .../regression/jbmc}/virtual9/A.class | Bin .../regression/jbmc}/virtual9/B.class | Bin .../regression/jbmc}/virtual9/C.class | Bin .../regression/jbmc}/virtual9/D.class | Bin .../regression/jbmc}/virtual9/E.class | Bin .../regression/jbmc}/virtual9/Test.class | Bin .../regression/jbmc}/virtual9/Test.java | 0 .../regression/jbmc}/virtual9/test.desc | 0 .../virtual_function_unwinding/Inner.class | Bin .../Interface.class | Bin .../virtual_function_unwinding/Outer.class | Bin .../virtual_function_unwinding/Virtual.class | Bin .../virtual_function_unwinding/Virtual.java | 0 .../virtual_function_unwinding/test.desc | 0 jbmc/regression/jdiff/CMakeLists.txt | 3 + jbmc/regression/jdiff/Makefile | 20 +++++++ .../jdiff}/java-add-package/new.jar | Bin .../jdiff}/java-add-package/new/Test.java | 0 .../jdiff}/java-add-package/old.jar | Bin .../jdiff}/java-add-package/old/Test.java | 0 .../jdiff}/java-add-package/test.desc | 0 .../jdiff}/java-del-package/new.jar | Bin .../jdiff}/java-del-package/new/Test.java | 0 .../jdiff}/java-del-package/old.jar | Bin .../jdiff}/java-del-package/old/Test.java | 0 .../jdiff}/java-del-package/test.desc | 0 .../jdiff}/java-deleted-function/new.jar | Bin .../java-deleted-function/new/Test.java | 0 .../jdiff}/java-deleted-function/old.jar | Bin .../java-deleted-function/old/Test.java | 0 .../jdiff}/java-deleted-function/test.desc | 0 .../regression/jdiff}/java-instanceof/new.jar | Bin .../jdiff}/java-instanceof/new/Test.java | 0 .../regression/jdiff}/java-instanceof/old.jar | Bin .../jdiff}/java-instanceof/old/Test.java | 0 .../jdiff}/java-instanceof/test.desc | 0 .../jdiff}/java-mod-comment/new.jar | Bin .../jdiff}/java-mod-comment/new/Test.java | 0 .../jdiff}/java-mod-comment/old.jar | Bin .../jdiff}/java-mod-comment/old/Test.java | 0 .../jdiff}/java-mod-comment/test.desc | 0 .../jdiff}/java-mod-identifier/new.jar | Bin .../jdiff}/java-mod-identifier/new/Test.java | 0 .../jdiff}/java-mod-identifier/old.jar | Bin .../jdiff}/java-mod-identifier/old/Test.java | 0 .../jdiff}/java-mod-identifier/test.desc | 0 .../jdiff}/java-mod-identifier2/new.jar | Bin .../jdiff}/java-mod-identifier2/new/Test.java | 0 .../jdiff}/java-mod-identifier2/old.jar | Bin .../jdiff}/java-mod-identifier2/old/Test.java | 0 .../jdiff}/java-mod-identifier2/test.desc | 0 .../jdiff}/java-mod-package/new.jar | Bin .../jdiff}/java-mod-package/new/Test.java | 0 .../jdiff}/java-mod-package/old.jar | Bin .../jdiff}/java-mod-package/old/Test.java | 0 .../jdiff}/java-mod-package/test.desc | 0 .../jdiff}/java-new-function/new.jar | Bin .../jdiff}/java-new-function/new/Test.java | 0 .../jdiff}/java-new-function/old.jar | Bin .../jdiff}/java-new-function/old/Test.java | 0 .../jdiff}/java-new-function/test.desc | 0 .../regression/jdiff}/java-no-change/new.jar | Bin .../jdiff}/java-no-change/new/Test.java | 0 .../regression/jdiff}/java-no-change/old.jar | Bin .../jdiff}/java-no-change/old/Test.java | 0 .../jdiff}/java-no-change/test.desc | 0 .../regression/jdiff}/java-properties/new.jar | Bin .../jdiff}/java-properties/new/Test.java | 0 .../regression/jdiff}/java-properties/old.jar | Bin .../jdiff}/java-properties/old/Test.java | 0 .../jdiff}/java-properties/test.desc | 0 .../jdiff}/java-scope-change/new.jar | Bin .../jdiff}/java-scope-change/new/Test.java | 0 .../jdiff}/java-scope-change/old.jar | Bin .../jdiff}/java-scope-change/old/Test.java | 0 .../jdiff}/java-scope-change/test.desc | 0 .../jdiff}/java-scope-change2/new.jar | Bin .../jdiff}/java-scope-change2/new/Test.java | 0 .../jdiff}/java-scope-change2/old.jar | Bin .../jdiff}/java-scope-change2/old/Test.java | 0 .../jdiff}/java-scope-change2/test.desc | 0 .../jdiff}/java-scope-change3/new.jar | Bin .../jdiff}/java-scope-change3/new/Test.java | 0 .../jdiff}/java-scope-change3/old.jar | Bin .../jdiff}/java-scope-change3/old/Test.java | 0 .../jdiff}/java-scope-change3/test.desc | 0 .../jdiff}/java-tmp-vars-array/new.jar | Bin .../jdiff}/java-tmp-vars-array/new/Test.java | 0 .../jdiff}/java-tmp-vars-array/old.jar | Bin .../jdiff}/java-tmp-vars-array/old/Test.java | 0 .../jdiff}/java-tmp-vars-array/test.desc | 0 .../jdiff}/java-tmp-vars-inc/new.jar | Bin .../jdiff}/java-tmp-vars-inc/new/Test.java | 0 .../jdiff}/java-tmp-vars-inc/old.jar | Bin .../jdiff}/java-tmp-vars-inc/old/Test.java | 0 .../jdiff}/java-tmp-vars-inc/test.desc | 0 .../jdiff}/java-tmp-vars-new/new.jar | Bin .../jdiff}/java-tmp-vars-new/new/Test.java | 0 .../jdiff}/java-tmp-vars-new/old.jar | Bin .../jdiff}/java-tmp-vars-new/old/Test.java | 0 .../jdiff}/java-tmp-vars-new/test.desc | 0 .../jdiff}/java-tmp-vars-string/new.jar | Bin .../jdiff}/java-tmp-vars-string/new/Test.java | 0 .../jdiff}/java-tmp-vars-string/old.jar | Bin .../jdiff}/java-tmp-vars-string/old/Test.java | 0 .../jdiff}/java-tmp-vars-string/test.desc | 0 .../jdiff}/java-virtual-methods/new.jar | Bin .../jdiff}/java-virtual-methods/new/Test.java | 0 .../jdiff}/java-virtual-methods/old.jar | Bin .../jdiff}/java-virtual-methods/old/Test.java | 0 .../jdiff}/java-virtual-methods/test.desc | 0 .../jdiff}/syntactic-diff-java1/new.jar | Bin .../jdiff}/syntactic-diff-java1/new/Test.java | 0 .../jdiff}/syntactic-diff-java1/old.jar | Bin .../jdiff}/syntactic-diff-java1/old/Test.java | 0 .../jdiff}/syntactic-diff-java1/test.desc | 0 .../strings-smoke-tests/CMakeLists.txt | 0 jbmc/regression/strings-smoke-tests/Makefile | 32 +++++++++++ .../cprover/CProverString.class | Bin .../cprover/CProverString.java | 0 .../java_append_char/test.desc | 0 .../java_append_char/test_append_char.class | Bin .../java_append_char/test_append_char.java | 0 .../java_append_int/test.desc | 0 .../java_append_int/test_append_int.class | Bin .../java_append_int/test_append_int.java | 0 .../java_append_object/test.desc | 0 .../test_append_object.class | Bin .../test_append_object.java | 0 .../java_append_string/test.desc | 0 .../test_append_string.class | Bin .../test_append_string.java | 0 .../java_append_string/test_substring.desc | 0 .../strings-smoke-tests/java_case/test.desc | 0 .../java_case/test_case.class | Bin .../java_case/test_case.java | 0 .../java_char_array/test.desc | 0 .../java_char_array/test_char_array.class | Bin .../java_char_array/test_char_array.java | 0 .../java_char_array_init/test.desc | 0 .../java_char_array_init/test_init.class | Bin .../java_char_array_init/test_init.java | 0 .../java_char_at/test.desc | 0 .../java_char_at/test_char_at.class | Bin .../java_char_at/test_char_at.java | 0 .../java_code_point/test.desc | 0 .../java_code_point/test_code_point.class | Bin .../java_code_point/test_code_point.java | 0 .../java_compare/test.desc | 0 .../java_compare/test_compare.class | Bin .../java_compare/test_compare.java | 0 .../strings-smoke-tests/java_concat/test.desc | 0 .../java_concat/test_concat.class | Bin .../java_concat/test_concat.java | 0 .../java_contains/test.desc | 0 .../java_contains/test_contains.class | Bin .../java_contains/test_contains.java | 0 .../java_contains/test_string_printable.desc | 0 .../strings-smoke-tests/java_delete/test.desc | 0 .../java_delete/test_delete.class | Bin .../java_delete/test_delete.java | 0 .../java_delete_char_at/test.desc | 0 .../test_delete_char_at.class | Bin .../test_delete_char_at.java | 0 .../strings-smoke-tests/java_empty/test.desc | 0 .../java_empty/test_empty.class | Bin .../java_empty/test_empty.java | 0 .../java_endswith/test.desc | 0 .../java_endswith/test_endswith.class | Bin .../java_endswith/test_endswith.java | 0 .../strings-smoke-tests/java_equal/test.desc | 0 .../java_equal/test_2.desc | 0 .../java_equal/test_equal.class | Bin .../java_equal/test_equal.java | 0 .../java_equal/test_equal_2.java | 0 .../strings-smoke-tests/java_float/test.desc | 0 .../java_float/test_float.class | Bin .../java_float/test_float.java | 0 .../java_format/test.class | Bin .../strings-smoke-tests/java_format/test.desc | 0 .../strings-smoke-tests/java_format/test.java | 0 .../java_format2/test.class | Bin .../java_format2/test.desc | 0 .../java_format2/test.java | 0 .../java_format3/test.class | Bin .../java_format3/test.desc | 0 .../java_format3/test.java | 0 .../java_format4/test.class | Bin .../java_format4/test.desc | 0 .../java_format4/test.java | 0 .../java_format5/test.class | Bin .../java_format5/test.desc | 0 .../java_format5/test.java | 0 .../java_hash_code/test.desc | 0 .../java_hash_code/test_hash_code.class | Bin .../java_hash_code/test_hash_code.java | 0 .../strings-smoke-tests/java_if/test.class | Bin .../strings-smoke-tests/java_if/test.desc | 0 .../strings-smoke-tests/java_if/test.java | 0 .../java_index_of/test.desc | 0 .../java_index_of/test_index_of.class | Bin .../java_index_of/test_index_of.java | 0 .../java_index_of2/test.desc | 0 .../java_index_of2/test_index_of2.class | Bin .../java_index_of2/test_index_of2.java | 0 .../java_index_of_char/test.desc | 0 .../test_index_of_char.class | Bin .../test_index_of_char.java | 0 .../java_insert_char/test.desc | 0 .../java_insert_char/test_insert_char.class | Bin .../java_insert_char/test_insert_char.java | 0 .../java_insert_char_array/test.desc | 0 .../test_insert_char_array.class | Bin .../test_insert_char_array.java | 0 .../java_insert_int/test.desc | 0 .../java_insert_int/test_insert_int.class | Bin .../java_insert_int/test_insert_int.java | 0 .../java_insert_multiple/test.desc | 0 .../test_insert_multiple.class | Bin .../test_insert_multiple.java | 0 .../java_insert_string/test.desc | 0 .../test_insert_string.class | Bin .../test_insert_string.java | 0 .../java_int_to_string/Test1.class | Bin .../java_int_to_string/Test1.java | 0 .../java_int_to_string/Test2.class | Bin .../java_int_to_string/Test2.java | 0 .../java_int_to_string/Test3.class | Bin .../java_int_to_string/Test3.java | 0 .../java_int_to_string/Test4.class | Bin .../java_int_to_string/Test4.java | 0 .../java_int_to_string/Test5.class | Bin .../java_int_to_string/Test5.java | 0 .../java_int_to_string/test1.desc | 0 .../java_int_to_string/test2.desc | 0 .../java_int_to_string/test2_bug.desc | 0 .../java_int_to_string/test3.desc | 0 .../java_int_to_string/test4.desc | 0 .../java_int_to_string/test5.desc | 0 .../java_int_to_string_knownbug/Test.class | Bin .../java_int_to_string_knownbug/Test.java | 0 .../java_int_to_string_knownbug/test.desc | 0 .../Test_binary1.class | Bin .../Test_binary1.java | 0 .../Test_binary2.class | Bin .../Test_binary2.java | 0 .../Test_binary3.class | Bin .../Test_binary3.java | 0 .../Test_decimal.class | Bin .../Test_decimal.java | 0 .../Test_hex1.class | Bin .../Test_hex1.java | 0 .../Test_hex2.class | Bin .../Test_hex2.java | 0 .../Test_hex3.class | Bin .../Test_hex3.java | 0 .../Test_octal1.class | Bin .../Test_octal1.java | 0 .../Test_octal2.class | Bin .../Test_octal2.java | 0 .../Test_octal3.class | Bin .../Test_octal3.java | 0 .../test_binary1.desc | 0 .../test_binary2.desc | 0 .../test_binary3.desc | 0 .../test_decimal.desc | 0 .../test_hex1.desc | 0 .../test_hex2.desc | 0 .../test_hex3.desc | 0 .../test_octal1.desc | 0 .../test_octal2.desc | 0 .../test_octal3.desc | 0 .../Test_binary.class | Bin .../Test_binary.java | 0 .../Test_hex.class | Bin .../Test_hex.java | 0 .../Test_octal.class | Bin .../Test_octal.java | 0 .../test_binary.desc | 0 .../test_hex.desc | 0 .../test_octal.desc | 0 .../strings-smoke-tests/java_intern/test.desc | 0 .../java_intern/test_intern.class | Bin .../java_intern/test_intern.java | 0 .../java_last_index_of/test.desc | 0 .../test_last_index_of.class | Bin .../test_last_index_of.java | 0 .../java_last_index_of2/test.desc | 0 .../test_last_index_of2.class | Bin .../test_last_index_of2.java | 0 .../java_last_index_of_char/test.desc | 0 .../test_last_index_of_char.class | Bin .../test_last_index_of_char.java | 0 .../strings-smoke-tests/java_length/test.desc | 0 .../java_length/test_length.class | Bin .../java_length/test_length.java | 0 .../java_length2/test.class | Bin .../java_length2/test.desc | 0 .../java_length2/test.java | 0 .../java_long_to_string/Test1.class | Bin .../java_long_to_string/Test1.java | 0 .../java_long_to_string/Test2.class | Bin .../java_long_to_string/Test2.java | 0 .../java_long_to_string/Test3.class | Bin .../java_long_to_string/Test3.java | 0 .../java_long_to_string/Test4.class | Bin .../java_long_to_string/Test4.java | 0 .../java_long_to_string/Test5.class | Bin .../java_long_to_string/Test5.java | 0 .../java_long_to_string/test1.desc | 0 .../java_long_to_string/test2.desc | 0 .../java_long_to_string/test3.desc | 0 .../java_long_to_string/test4.desc | 0 .../java_long_to_string/test5.desc | 0 .../Test_binary1.class | Bin .../Test_binary1.java | 0 .../Test_binary2.class | Bin .../Test_binary2.java | 0 .../Test_binary3.class | Bin .../Test_binary3.java | 0 .../Test_decimal.class | Bin .../Test_decimal.java | 0 .../Test_hex1.class | Bin .../Test_hex1.java | 0 .../Test_hex2.class | Bin .../Test_hex2.java | 0 .../Test_hex3.class | Bin .../Test_hex3.java | 0 .../Test_octal1.class | Bin .../Test_octal1.java | 0 .../Test_octal2.class | Bin .../Test_octal2.java | 0 .../Test_octal3.class | Bin .../Test_octal3.java | 0 .../test_binary1.desc | 0 .../test_binary2.desc | 0 .../test_binary3.desc | 0 .../test_decimal.desc | 0 .../test_hex1.desc | 0 .../test_hex2.desc | 0 .../test_hex3.desc | 0 .../test_octal1.desc | 0 .../test_octal2.desc | 0 .../test_octal3.desc | 0 .../java_parseint/Test1.class | Bin .../java_parseint/Test1.java | 0 .../java_parseint/Test2.class | Bin .../java_parseint/Test2.java | 0 .../java_parseint/Test3.class | Bin .../java_parseint/Test3.java | 0 .../java_parseint/test1.desc | 0 .../java_parseint/test2.desc | 0 .../java_parseint/test3.desc | 0 .../java_parseint_knownbug/Test.class | Bin .../java_parseint_knownbug/Test.java | 0 .../java_parseint_knownbug/test.desc | 0 .../java_parseint_with_radix/Test1.class | Bin .../java_parseint_with_radix/Test1.java | 0 .../java_parseint_with_radix/Test2.class | Bin .../java_parseint_with_radix/Test2.java | 0 .../java_parseint_with_radix/Test3.class | Bin .../java_parseint_with_radix/Test3.java | 0 .../java_parseint_with_radix/Test4.class | Bin .../java_parseint_with_radix/Test4.java | 0 .../java_parseint_with_radix/Test5.class | Bin .../java_parseint_with_radix/Test5.java | 0 .../java_parseint_with_radix/Test6.class | Bin .../java_parseint_with_radix/Test6.java | 0 .../java_parseint_with_radix/test1.desc | 0 .../java_parseint_with_radix/test2.desc | 0 .../java_parseint_with_radix/test3.desc | 0 .../java_parseint_with_radix/test4.desc | 0 .../java_parseint_with_radix/test5.desc | 0 .../java_parseint_with_radix/test6.desc | 0 .../Test.class | Bin .../Test.java | 0 .../java_parseint_with_radix_knownbug/output | 0 .../test.desc | 0 .../java_parselong/Test_binary_min.class | Bin .../java_parselong/Test_binary_min.java | 0 .../java_parselong/Test_decimal_max.class | Bin .../java_parselong/Test_decimal_max.java | 0 .../java_parselong/Test_decimal_min.class | Bin .../java_parselong/Test_decimal_min.java | 0 .../java_parselong/Test_hex.class | Bin .../java_parselong/Test_hex.java | 0 .../java_parselong/Test_octal.class | Bin .../java_parselong/Test_octal.java | 0 .../java_parselong/test_binary_min.desc | 0 .../java_parselong/test_decimal_max.desc | 0 .../java_parselong/test_decimal_min.desc | 0 .../java_parselong/test_hex.desc | 0 .../java_parselong/test_octal.desc | 0 .../java_replace/test.desc | 0 .../java_replace/test_replace.class | Bin .../java_replace/test_replace.java | 0 .../java_replace_char/test.desc | 0 .../java_replace_char/test_replace_char.class | Bin .../java_replace_char/test_replace_char.java | 0 .../java_set_char_at/test.desc | 0 .../java_set_char_at/test_set_char_at.class | Bin .../java_set_char_at/test_set_char_at.java | 0 .../java_set_length/test.desc | 0 .../java_set_length/test_set_length.class | Bin .../java_set_length/test_set_length.java | 0 .../java_starts_with/test.desc | 0 .../java_starts_with/test_starts_with.class | Bin .../java_starts_with/test_starts_with.java | 0 .../java_string_builder_length/test.desc | 0 .../test_sb_length.class | Bin .../test_sb_length.java | 0 .../java_string_printable/Test.class | Bin .../java_string_printable/Test.java | 0 .../java_string_printable/test.desc | 0 .../java_string_printable/test_char.desc | 0 .../java_subsequence/test.desc | 0 .../java_subsequence/test_subsequence.class | Bin .../java_subsequence/test_subsequence.java | 0 .../java_substring/test.desc | 0 .../java_substring/test_substring.class | Bin .../java_substring/test_substring.java | 0 .../strings-smoke-tests/java_trim/test.desc | 0 .../java_trim/test_trim.class | Bin .../java_trim/test_trim.java | 0 .../java_value_of_float/test.class | Bin .../java_value_of_float/test.desc | 0 .../java_value_of_float/test.java | 0 .../java_value_of_float_2/test.class | Bin .../java_value_of_float_2/test.desc | 0 .../java_value_of_float_2/test.java | 0 .../java_value_of_float_3/test.class | Bin .../java_value_of_float_3/test.desc | 0 .../java_value_of_float_3/test.java | 0 .../java_value_of_float_4/test.class | Bin .../java_value_of_float_4/test.desc | 0 .../java_value_of_float_4/test.java | 0 .../java_value_of_float_5/test.class | Bin .../java_value_of_float_5/test.desc | 0 .../java_value_of_float_5/test.java | 0 .../java_value_of_long/test.class | Bin .../java_value_of_long/test.desc | 0 .../java_value_of_long/test.java | 0 .../max_input_length/MemberTest.class | Bin .../max_input_length/MemberTest.desc | 0 .../max_input_length/MemberTest.java | 0 .../max_input_length/MemberTest2.desc | 0 .../max_input_length/Test.class | Bin .../max_input_length/Test.java | 0 .../max_input_length/test1.desc | 0 .../max_input_length/test2.desc | 0 .../strings-smoke-tests/performance.py | 0 .../strings-smoke-tests/performance_draw.gp | 0 regression/CMakeLists.txt | 4 -- regression/Makefile | 4 -- regression/goto-analyzer-taint/Makefile | 2 +- regression/jbmc-strings/Makefile | 30 ---------- regression/strings-smoke-tests/Makefile | 30 ---------- src/goto-analyzer/CMakeLists.txt | 1 - src/goto-diff/CMakeLists.txt | 1 - src/goto-instrument/CMakeLists.txt | 1 - src/goto-programs/CMakeLists.txt | 2 +- 2163 files changed, 260 insertions(+), 84 deletions(-) create mode 100644 jbmc/regression/CMakeLists.txt create mode 100644 jbmc/regression/Makefile create mode 100644 jbmc/regression/janalyzer-taint/CMakeLists.txt create mode 100644 jbmc/regression/janalyzer-taint/Makefile rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-aliasing1/aliasing1.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-aliasing1/aliasing1.java (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-aliasing1/taint.json (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-aliasing1/test.desc (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic1/basic1.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic1/basic1.java (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic1/taint.json (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic1/test.desc (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic2/basic2.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic2/basic2.java (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic2/taint.json (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-basic2/test.desc (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interface1/interface1.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interface1/interface1.java (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interface1/my_I.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interface1/some_class.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interface1/taint.json (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interface1/test.desc (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interproc1/interproc1.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interproc1/interproc1.java (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interproc1/taint.json (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-interproc1/test.desc (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-map1/map1.class (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-map1/map1.java (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-map1/taint.json (100%) rename {regression/goto-analyzer-taint => jbmc/regression/janalyzer-taint}/taint-map1/test.desc (100%) rename {regression/cbmc-java-concurrency => jbmc/regression/jbmc-concurrency}/CMakeLists.txt (100%) rename {regression/cbmc-java-concurrency => jbmc/regression/jbmc-concurrency}/Makefile (74%) rename {regression/cbmc-java-concurrency => jbmc/regression/jbmc-concurrency}/explicit_thread_blocks/A.class (100%) rename {regression/cbmc-java-concurrency => jbmc/regression/jbmc-concurrency}/explicit_thread_blocks/A.java (100%) rename {regression/cbmc-java-concurrency => jbmc/regression/jbmc-concurrency}/explicit_thread_blocks/test.desc (100%) rename {regression/cbmc-java-concurrency => jbmc/regression/jbmc-concurrency}/explicit_thread_blocks/test2.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc-cover}/CMakeLists.txt (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-cover}/Makefile (74%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractImpl.class (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractInt.class (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractTest$ClassA.class (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractTest$ClassB.class (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractTest$Dummy.class (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractTest.class (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/AbstractTest.java (100%) rename {regression => jbmc/regression}/jbmc-cover/generics/test.desc (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode1/Test.class (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode1/Test.java (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode1/test.desc (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode2/Test.class (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode2/Test.java (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode2/test.desc (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode3/Test.class (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode3/Test.java (100%) rename {regression => jbmc/regression}/jbmc-cover/unique-bytecode3/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/CMakeLists.txt (100%) rename {regression/cbmc-java => jbmc/regression/jbmc-inheritance}/Makefile (64%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance01/A.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance01/B.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance01/test.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance01/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance01/test.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance02/A.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance02/B.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance02/test.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance02/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance02/test.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance03/A.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance03/B.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance03/Z.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance03/test.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance03/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance03/test.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance04/A.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance04/B.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance04/Z.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance04/test.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance04/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance04/test.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance05/A.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance05/B.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance05/test.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance05/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance05/test.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/A.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/B.java (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/temp/A.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/temp/B.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/test.class (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/test.desc (100%) rename {regression/cbmc-java-inheritance => jbmc/regression/jbmc-inheritance}/inheritance06/test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/CMakeLists.txt (100%) rename {regression => jbmc/regression}/jbmc-strings/CharacterGetNumericValue/test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/CharacterGetNumericValue/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/CharacterGetNumericValue/test.java (100%) create mode 100644 jbmc/regression/jbmc-strings/Makefile rename {regression => jbmc/regression}/jbmc-strings/RegexMatches01/RegexMatches01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexMatches01/RegexMatches01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexMatches01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexMatches02/RegexMatches02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexMatches02/RegexMatches02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexMatches02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution01/RegexSubstitution01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution01/RegexSubstitution01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution02/RegexSubstitution02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution02/RegexSubstitution02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution03/RegexSubstitution03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution03/RegexSubstitution03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/RegexSubstitution03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods01/StaticCharMethods01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods01/StaticCharMethods01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods02/StaticCharMethods02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods02/StaticCharMethods02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods03/StaticCharMethods03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods03/StaticCharMethods03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods04/StaticCharMethods04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods04/StaticCharMethods04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods05/StaticCharMethods05.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods05/StaticCharMethods05.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods05/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods06/StaticCharMethods06.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods06/StaticCharMethods06.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StaticCharMethods06/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringArray/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringArray/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringArray/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderAppend01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderAppend02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderCapLen04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars01/StringBuilderChars01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars01/StringBuilderChars01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars02/StringBuilderChars02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars02/StringBuilderChars02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars03/StringBuilderChars03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars03/StringBuilderChars03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars04/StringBuilderChars04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars04/StringBuilderChars04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars05/StringBuilderChars05.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars05/StringBuilderChars05.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars05/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars06/StringBuilderChars06.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars06/StringBuilderChars06.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderChars06/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderConstructors01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderConstructors02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsert/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsert/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsert/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringBuilderInsertDelete03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare01/StringCompare01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare01/StringCompare01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare02/StringCompare02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare02/StringCompare02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare03/StringCompare03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare03/StringCompare03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare04/StringCompare04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare04/StringCompare04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare05/StringCompare05.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare05/StringCompare05.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringCompare05/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_buffer_det.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_buffer_nondet_loop.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_buffer_nondet_loop2.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_buffer_nondet_loop3.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_buffer_nondet_loop4.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_buffer_nondet_loop5.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_char_buffer_det.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_char_buffer_det_loop.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_char_buffer_det_loop2.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_string_det.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat/test_string_nondet.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat_StringII/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat_StringII/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat_StringII/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcat_StringII/test_fail.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation01/StringConcatenation01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation01/StringConcatenation01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation02/StringConcatenation02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation02/StringConcatenation02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation03/StringConcatenation03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation03/StringConcatenation03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation04/StringConcatenation04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation04/StringConcatenation04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConcatenation04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors01/StringConstructors01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors01/StringConstructors01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors02/StringConstructors02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors02/StringConstructors02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors03/StringConstructors03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors03/StringConstructors03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors04/StringConstructors04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors04/StringConstructors04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors05/StringConstructors05.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors05/StringConstructors05.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringConstructors05/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringContains01/test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringContains01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringContains01/test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringContains02/test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringContains02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringContains02/test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringDependencies/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringDependencies/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringDependencies/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringEquals/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringEquals/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringEquals/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringEquals/test_verify.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringEquals/test_verify_non_null.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods01/StringIndexMethods01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods01/StringIndexMethods01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods02/StringIndexMethods02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods02/StringIndexMethods02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods03/StringIndexMethods03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods03/StringIndexMethods03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods04/StringIndexMethods04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods04/StringIndexMethods04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods04/test_bug.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods05/StringIndexMethods05.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods05/StringIndexMethods05.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexMethods05/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexOf/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexOf/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexOf/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexOf/test2.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringIndexOf/test_thorough.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringLastIndexOf/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringLastIndexOf/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringLastIndexOf/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringMiscellaneous04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd01/StringStartEnd01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd01/StringStartEnd01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd02/StringStartEnd02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd02/StringStartEnd02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd03/StringStartEnd03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd03/StringStartEnd03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringStartEnd03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringSubstring/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringSubstring/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringSubstring/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringSubstring/test_fail.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf01/StringValueOf01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf01/StringValueOf01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf02/StringValueOf02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf02/StringValueOf02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf03/StringValueOf03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf03/StringValueOf03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf04/StringValueOf04.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf04/StringValueOf04.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf04/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf05/StringValueOf05.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf05/StringValueOf05.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf05/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf06/StringValueOf06.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf06/StringValueOf06.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf06/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf07/StringValueOf07.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf07/StringValueOf07.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf07/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf08/StringValueOf08.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf08/StringValueOf08.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf08/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf09/StringValueOf09.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf09/StringValueOf09.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf09/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf10/StringValueOf10.class (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf10/StringValueOf10.java (100%) rename {regression => jbmc/regression}/jbmc-strings/StringValueOf10/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString01/SubString01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString01/SubString01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString02/SubString02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString02/SubString02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString03/SubString03.class (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString03/SubString03.java (100%) rename {regression => jbmc/regression}/jbmc-strings/SubString03/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/TokenTest01/TokenTest01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/TokenTest01/TokenTest01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/TokenTest01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/TokenTest02/TokenTest02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/TokenTest02/TokenTest02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/TokenTest02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate01/Validate01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate01/Validate01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate01/ValidateInput01.class (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate01/ValidateInput01.java (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate01/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate02/Validate02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate02/Validate02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate02/ValidateInput02.class (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate02/ValidateInput02.java (100%) rename {regression => jbmc/regression}/jbmc-strings/Validate02/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/VerifStringLastIndexOf/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/VerifStringLastIndexOf/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/VerifStringLastIndexOf/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-095/test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-095/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-095/test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.class (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.java (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-119-2/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-119/StringValueOfBool.class (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-119/StringValueOfBool.java (100%) rename {regression => jbmc/regression}/jbmc-strings/bug-test-gen-119/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/char_escape/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/char_escape/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/char_escape/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/cprover/CProverString.class (100%) rename {regression => jbmc/regression}/jbmc-strings/cprover/CProverString.java (100%) rename {regression => jbmc/regression}/jbmc-strings/instanceof/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/instanceof/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/instanceof/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_char/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_char/test_append_char.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_char/test_append_char.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_int/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_int/test_append_int.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_int/test_append_int.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_object/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_object/test_append_object.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_object/test_append_object.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_string/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_string/test_append_string.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_append_string/test_append_string.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_case/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_case/test_case.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_case/test_case.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_array/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_array/test_char_array.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_array/test_char_array.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_array_init/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_array_init/test_init.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_array_init/test_init.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_at/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_at/test_char_at.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_char_at/test_char_at.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_code_point/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_code_point/test_code_point.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_code_point/test_code_point.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_compare/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_compare/test_compare.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_compare/test_compare.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_concat/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_concat/test_concat.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_concat/test_concat.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_contains/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_contains/test_contains.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_contains/test_contains.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_delete/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_delete/test_delete.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_delete/test_delete.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_delete_char_at/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_delete_char_at/test_delete_char_at.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_delete_char_at/test_delete_char_at.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_easychair/easychair.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_easychair/easychair.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_easychair/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_empty/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_empty/test_empty.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_empty/test_empty.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_endswith/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_endswith/test_endswith.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_endswith/test_endswith.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_equal/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_equal/test_equal.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_equal/test_equal.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_float/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_float/test_float.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_float/test_float.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_hash_code/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_hash_code/test_hash_code.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_hash_code/test_hash_code.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_index_of/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_index_of/test_index_of.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_index_of/test_index_of.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_index_of_char/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_index_of_char/test_index_of_char.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_index_of_char/test_index_of_char.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_char/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_char/test_insert_char.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_char/test_insert_char.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_char_array/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_char_array/test_insert_char_array.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_char_array/test_insert_char_array.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_int/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_int/test_insert_int.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_int/test_insert_int.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_multiple/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_multiple/test_insert_multiple.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_multiple/test_insert_multiple.java (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_string/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_string/test_insert_string.class (100%) rename {regression => jbmc/regression}/jbmc-strings/java_insert_string/test_insert_string.java (100%) rename {regression => jbmc/regression}/jbmc-strings/literal-length/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/literal-length/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/literal-length/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/long_string/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/long_string/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/long_string/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/long_string/test_abort.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length-generic-array/IntegerTests.class (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length-generic-array/IntegerTests.java (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length-generic-array/MyGenSet.class (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length-generic-array/MySet.class (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length-generic-array/test.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length-generic-array/test_gen.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length/Test.class (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length/Test.java (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length/test1.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length/test2.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length/test3.desc (100%) rename {regression => jbmc/regression}/jbmc-strings/max-length/test4.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException1/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException1/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException2/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException2/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException3/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException3/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException4/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException4/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException5/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException5/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException6/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException6/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/ArithmeticExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/ArithmeticExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/java/lang/ArithmeticException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/java/lang/ArithmeticException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/java/lang/RuntimeException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/java/lang/RuntimeException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArithmeticException7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ArrayIndexOutOfBoundsException3/test.desc (100%) create mode 100644 jbmc/regression/jbmc/CMakeLists.txt rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException1/ClassCastExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException1/ClassCastExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException2/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException2/ClassCastExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException2/ClassCastExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/ClassCastExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/ClassCastExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/java/lang/ClassCastException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/java/lang/ClassCastException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/java/lang/RuntimeException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/java/lang/RuntimeException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ClassCastException3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Class_method1/Class_method1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Class_method1/Class_method1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Inheritance1/A1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Inheritance1/A2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Inheritance1/A3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Inheritance1/Inheritance1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Inheritance1/Inheritance1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/Inheritance1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable1/CtorLocalVar.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable1/CtorLocalVar.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable2/LocalVarTable2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable2/LocalVarTable2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable3/live_range_with_holes.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable3/live_range_with_holes.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable4/live_range_exception.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable4/live_range_exception.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable5/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/LocalVarTable5/test.java (100%) create mode 100644 jbmc/regression/jbmc/Makefile rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException1/NegativeArraySizeExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException1/NegativeArraySizeExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/NegativeArraySizeExceptionTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/NegativeArraySizeExceptionTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/java/lang/NegativeArraySizeException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/java/lang/NegativeArraySizeException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/java/lang/RuntimeException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/java/lang/RuntimeException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NegativeArraySizeException2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray/NondetArray.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray/NondetArray.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray2/NondetArray2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray2/NondetArray2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray3/NondetArray3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray3/NondetArray3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray4/NondetArray4.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray4/NondetArray4.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetArray4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume1/NondetAssume1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume1/NondetAssume1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume2/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume2/NondetAssume2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume2/NondetAssume2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetAssume2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetBoolean/NondetBoolean.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetBoolean/NondetBoolean.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetBoolean/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetByte/NondetByte.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetByte/NondetByte.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetByte/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetCastToObject/NondetCastToObject.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetCastToObject/NondetCastToObject.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetCastToObject/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetChar/NondetChar.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetChar/NondetChar.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetChar/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDirectFromMethod/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDirectFromMethod/NondetDirectFromMethod.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDirectFromMethod/NondetDirectFromMethod.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDirectFromMethod/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDouble/NondetDouble.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDouble/NondetDouble.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetDouble/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetFloat/NondetFloat.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetFloat/NondetFloat.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetFloat/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericArray/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericArray/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericArray/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericArray/NondetGenericArray.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericArray/NondetGenericArray.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericArray/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive/NondetGenericRecursive.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive/NondetGenericRecursive.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive2/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive2/NondetGenericRecursive2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive2/NondetGenericRecursive2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericRecursive2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithNull/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithNull/NondetGenericWithNull.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithNull/NondetGenericWithNull.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithNull/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithoutNull/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithoutNull/NondetGenericWithoutNull.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithoutNull/NondetGenericWithoutNull.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetGenericWithoutNull/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit/test_lazy.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit3/Subclass.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit3/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit3/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInit3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInt/NondetInt.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInt/NondetInt.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetInt/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetLong/NondetLong.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetLong/NondetLong.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetLong/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetShort/NondetShort.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetShort/NondetShort.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NondetShort/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer1/NullPointer1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer1/NullPointer1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer2/NullPointer2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer2/NullPointer2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer3/NullPointer3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer3/NullPointer3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer4/NullPointer4.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer4/NullPointer4.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointer4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException1/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException1/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException3/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException3/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException3/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException3/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/java/lang/NullPointerException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/java/lang/NullPointerException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/java/lang/RuntimeException.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/java/lang/RuntimeException.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/NullPointerException4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/VarLengthArrayTrace1/Container.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/VarLengthArrayTrace1/VarLengthArrayTrace1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/VarLengthArrayTrace1/VarLengthArrayTrace1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/VarLengthArrayTrace1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/aastore_aaload1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/aastore_aaload1/aastore_aaload1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/aastore_aaload1/aastore_aaload1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/aastore_aaload1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/address_space_size_limit1/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/address_space_size_limit1/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/address_space_size_limit1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/address_space_size_limit2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/address_space_size_limit2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/address_space_size_limit2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations1/ClassAnnotation.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations1/FieldAnnotation.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations1/MethodAnnotation.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations1/annotations.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations1/annotations.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations1/show_annotation_symbol.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations2/FieldAnnotation.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/annotations2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array1/array1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array1/array1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array1/what_not.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array1/what_not.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array2/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/A.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/FloatMultidim1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/FloatMultidim1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/FloatMultidim2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/FloatMultidim2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefMultidim1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefMultidim1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefMultidim2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefMultidim2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefMultidimConstsize.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefMultidimConstsize.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefSingledim.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/RefSingledim.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/test_float_multidim_1.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/test_float_multidim_2.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/test_ref_multidim_1.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/test_ref_multidim_2.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/test_ref_multidim_constsize.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/array_nonconstsize_nonconstaccess/test_ref_singledim.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/arraylength1/arraylength1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/arraylength1/arraylength1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/arraylength1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/arrayread1/arrayread1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/arrayread1/arrayread1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/arrayread1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert1/assert1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert1/assert1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert2/assert2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert2/assert2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert3/assert3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert3/assert3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert4/assert4.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert4/assert4.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert5/assert5.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert5/assert5.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert6/assert6.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert6/assert6.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assert6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assertion_error_constructors/AssertionIssue.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assertion_error_constructors/AssertionIssue.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assertion_error_constructors/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume1/Assume1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume1/Assume1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume2/Assume2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume2/Assume2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume3/Assume3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume3/Assume3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/assume3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/astore_aload1/astore_aload1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/astore_aload1/astore_aload1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/astore_aload1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/athrow1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/athrow1/athrow1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/athrow1/athrow1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/athrow1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic1/helloworld.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic1/helloworld.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic2/basic.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic2/basic.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic2/basic2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/basic2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/bitwise1/bitwise1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/bitwise1/bitwise1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/bitwise1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/boolean1/boolean1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/boolean1/boolean1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/boolean1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/boolean2/boolean2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/boolean2/boolean2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/boolean2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast1/cast1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast1/cast1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast_null1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast_null1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast_null1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast_null2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast_null2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/cast_null2/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/catch1/catch1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/catch1/catch1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/catch1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/char1/char1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/char1/char1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/char1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath1/my_cp/test2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath1/my_cp/test2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath2/jarfile3$A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath2/jarfile3$B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath2/jarfile3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath2/jarfile3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classpath2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classtest1/classtest1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classtest1/classtest1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/classtest1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/const1/const1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/const1/const1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/const1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/constructor1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/constructor1/constructor1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/constructor1/constructor1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/constructor1/sub.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/constructor1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/coreModels/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/coreModels/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/coreModels/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/covered1/covered1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/covered1/covered1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/covered1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/destructor1/Break.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/destructor1/Break.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/destructor1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/divide_by_zero/DivideByZero.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/divide_by_zero/DivideByZero.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/divide_by_zero/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/double1/double1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/double1/double1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/double1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/dynamic-multi-dimensional-array/TestClass.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/dynamic-multi-dimensional-array/TestClass.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/dynamic-multi-dimensional-array/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/enum1/enum1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/enum1/enum1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/enum1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/environment1/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/environment1/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/environment1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions10/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions10/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions10/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions10/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions10/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions10/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions11/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions11/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions11/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions11/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions11/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/F.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions12/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/F.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions13/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions14/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions14/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions14/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions14/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions14/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions14/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions15/InetAddress.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions15/InetSocketAddress.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions15/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions15/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions15/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions16/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions16/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions16/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions16/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions16/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions16/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions18/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions18/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions18/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions18/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions19/exception_handler.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions19/exception_handler.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions19/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions2/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions2/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions20/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions21/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions21/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions21/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions22/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions22/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions22/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions23/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions23/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions23/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions24/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions24/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions24/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions24/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions26/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions26/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions26/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions26/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions26/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions27/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions27/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions27/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions27/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions27/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions3/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions3/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions3/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions3/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions3/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions4/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions4/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions4/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions4/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions4/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions5/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions6/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions7/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions7/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions7/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions7/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions7/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions8/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions8/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions8/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions8/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions8/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions8/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions9/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions9/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions9/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions9/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions9/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/exceptions9/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/external_getstatic1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/external_getstatic1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/external_getstatic1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/farith1/__CPROVER.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/farith1/farith1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/farith1/farith1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/farith1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/fcmpx_dcmpx1/fcmpx_dcmpx1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/fcmpx_dcmpx1/fcmpx_dcmpx1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/fcmpx_dcmpx1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally2/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally3/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally3/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally4/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally4/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally5/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally5/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally6/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally6/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally7/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/finally7/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/float1/float1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/float1/float1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/float1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function1/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function1/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function1/Other.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function3/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function3/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function3/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function3/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function4/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function4/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function4/Other.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/function4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/Gn.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/Gn.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/L.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generic_class_bound1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/AWrapper.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/FWrapper.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/GenericFields$SimpleGenericField.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/GenericFields.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/GenericFields.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/IWrapper.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/SimpleWrapper.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/generics_type_param/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iarith1/iarith1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iarith1/iarith1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iarith1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iarith2/iarith2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iarith2/iarith2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iarith2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_acmp1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_acmp1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_acmp1/if_acmp1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_acmp1/if_acmp1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_acmp1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_expr1/if_expr1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_expr1/if_expr1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_expr1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_icmp1/if_icmp1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_icmp1/if_icmp1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/if_icmp1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ifxx1/ifxx1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ifxx1/ifxx1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/ifxx1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inferlexicalscope1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inferlexicalscope1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inferlexicalscope1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field1/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field1/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field1/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/Parent.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/compile_against/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/compile_against/Parent.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field10/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field2/InterfaceWithStatic.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field2/InterfaceWithStatic.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field2/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field3/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field3/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field4/Grandparent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field4/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field4/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field4/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field5/InterfaceWithStatic.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field5/InterfaceWithStatic.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field5/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field5/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field6/Grandparent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field6/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field6/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field7/OpaqueInterfaceWithStatic.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field7/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field7/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field8/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field8/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field8/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field8/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/Parent.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/compile_against/Parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/compile_against/Parent.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/inherited_static_field9/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof1/instanceof1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof1/instanceof1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof2/instanceof2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof2/instanceof2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof3/instanceof3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof3/instanceof3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof4/instanceof4.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof4/instanceof4.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof5/instanceof5.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof5/instanceof5.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof6/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof6/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof6/instanceof6.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof6/instanceof6.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof7/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof7/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof7/instanceof7.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof7/instanceof7.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof8/InstanceOf8.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof8/InstanceOf8.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/instanceof8/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/integer_without_simplify1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/integer_without_simplify1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/integer_without_simplify1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/interface1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/interface1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/interface1/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/interface1/interface1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/interface1/interface1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/interface1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/internal1/com/diffblue/javatest/nestedobjects/subpackage/readme.txt (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/internal1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/invalid_classpath/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/invalid_classpath/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/invalid_classpath/test-jar.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/invalid_classpath/test-path.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/isnan1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/isnan1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/isnan1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iterator1/iterator1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iterator1/iterator1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iterator1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iterator2/iterator2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iterator2/iterator2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/iterator2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file1/some_jar.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file2/jar-file2.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file2/some_class.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file3/A.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file3/B.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file3/C.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file3/jarfile3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file3/jarfile3.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file4/A.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file4/B.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file4/C.jar (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file4/jar.json (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jar-file4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace1/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace1/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace3/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace3/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/json_trace3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jsr1/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentHashMap.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jsr1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jsr2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jsr2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/jsr2/test.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/B.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/CustomLambda.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/CustomLambda.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/Lambdatest$A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/Lambdatest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/Lambdatest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/StaticMethodRef.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/StaticMethodRef.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/SymStream.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/readme.txt (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/test_no_crash.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda2/test_no_crash_ecj.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda3/LambdaTest/Lamb1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda3/LambdaTest/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda3/LambdaTest/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lambda3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading10/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading10/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading10/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading11/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading11/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading11/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading2/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading3/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading4/Main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading4/Main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading4/Problem.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading5/other.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading5/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading5/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading6/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading6/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading7/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading7/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading8/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading8/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading8/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading9/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading9/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading9/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_array_parameter/asserthere.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_array_parameter/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_array_parameter/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_array_parameter/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/Base.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/Derived.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/Foo.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/Middle.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/cycle1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/cycle2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_cyclic_class/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_array_parameter/asserthere.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_array_parameter/container.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_array_parameter/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_array_parameter/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_array_parameter/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_generic_array_parameter/asserthere.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_generic_array_parameter/container.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_generic_array_parameter/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_generic_array_parameter/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_indirect_generic_array_parameter/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance/Base.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance/Derived.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance/Middle.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/Base.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/Derived.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/Foo.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/Middle.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_inheritance_field/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/A.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/B.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_array_types/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_generic_parameters/asserthere.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_generic_parameters/container.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_generic_parameters/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_generic_parameters/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_multiple_generic_parameters/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_nested_generic_parameters/asserthere.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_nested_generic_parameters/container.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_nested_generic_parameters/container2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_nested_generic_parameters/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_nested_generic_parameters/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_nested_generic_parameters/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_no_candidates/Test$factory_intf.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_no_candidates/Test$intf.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_no_candidates/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_no_candidates/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_no_candidates/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/Base.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/Derived.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/Foo.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/Middle.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_recursive_class/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup1/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup1/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup1/Unused.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup1/check_clinit_normally_present.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup1/check_clinit_removed_by_lazy_loading.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup1/check_runs_with_lazy_loading.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/Unused1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/Unused2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/check_clinit_normally_present.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/check_clinit_removed_by_lazy_loading.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup2/check_runs_with_lazy_loading.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup3/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup3/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup3/check_clinit_normally_present.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup3/check_clinit_removed_by_lazy_loading.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lazyloading_synthetic_method_cleanup3/check_runs_with_lazy_loading.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/LinkedList.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/LinkedListEntry.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/__CPROVER_nondet.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/__CPROVER_synthesis.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/list1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/list1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/list1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/long1/long1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/long1/long1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/long1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lookupswitch1/lookupswitch1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lookupswitch1/lookupswitch1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lookupswitch1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/loop1/loop1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/loop1/loop1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/loop1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lots_local_variables_manual/ManyLocalVariables.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lots_local_variables_manual/ManyLocalVariables.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lots_local_variables_manual/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lots_of_local_variables/TooManyLocals.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lots_of_local_variables/TooManyLocals.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lots_of_local_variables/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lvt-groovy/DetectSplitPackagesTask.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lvt-groovy/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lvt-unexpected/Makefile (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lvt-unexpected/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lvt-unexpected/unexpected.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/lvt-unexpected/unexpected.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/method_parmeters1/method_parameters.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/method_parmeters1/method_parameters.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/method_parmeters1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/method_parmeters2/method_parameters.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/method_parmeters2/method_parameters.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/method_parmeters2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/monitorenter1/monitorenter1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/monitorenter1/monitorenter1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/monitorenter1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/multinewarray/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/multinewarray/multinewarray.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/multinewarray/multinewarray.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/multinewarray/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/correct-overlay/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/correct-overlay/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/correct-test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/duplicate-test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/format_classpath.sh (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/misordered-test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/unmarked-overlay/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/unmarked-overlay/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overlay-class/unmarked-test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overloading1/other_class.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overloading1/overloading1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overloading1/overloading1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/overloading1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package1/classA.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package1/classA.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package1/mypackage/classB.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package1/mypackage/classB.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package_friendly1/main.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package_friendly1/main.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package_friendly1/package_friendly1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package_friendly1/package_friendly1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package_friendly1/package_friendly2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/package_friendly1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/phi-merge_uninitialized_values/PhiMergeUninitialized.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/phi-merge_uninitialized_values/PhiMergeUninitialized.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/phi-merge_uninitialized_values/field.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/phi-merge_uninitialized_values/local.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/phi-merge_uninitialized_values/static_field.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/pointer_check1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/pointer_check1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/pointer_check1/pointer_check1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/pointer_check1/pointer_check1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/pointer_check1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/provide_object_implementation/java/lang/Object.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/provide_object_implementation/java/lang/Object.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/provide_object_implementation/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putfield_getfield1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putfield_getfield1/putfield_getfield1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putfield_getfield1/putfield_getfield1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putfield_getfield1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_getstatic1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_getstatic1/putstatic_getstatic1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_getstatic1/putstatic_getstatic1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_getstatic1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_source_location/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_source_location/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/putstatic_source_location/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/reachability-slice/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/reachability-slice/A.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/reachability-slice/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/reachability-slice/test2.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/reachability-slice/test3.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/recursion1/recursion1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/recursion1/recursion1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/recursion2/recursion2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/recursion2/recursion2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/recursion2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/remove_virtual_function_typecast/VirtualFunctions$A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/remove_virtual_function_typecast/VirtualFunctions$B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/remove_virtual_function_typecast/VirtualFunctions$C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/remove_virtual_function_typecast/VirtualFunctions.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/remove_virtual_function_typecast/VirtualFunctions.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/remove_virtual_function_typecast/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/AbstractList$Itr.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/AbstractList.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/AbstractList.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ArrayList$Itr.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ArrayList$ListItr.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ArrayList.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ArrayList.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ArrayListEquals.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ArrayListEquals.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/Iterator.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/Iterator.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/List.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/List.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ListIterator.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/ListIterator.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/removed_virtual_functions/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/return1/return1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/return1/return1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/return1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/return2/return2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/return2/return2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/return2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/short1/short1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/short1/short1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/short1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/short2/short2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/short2/short2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/short2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects1/Other.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects1/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects1/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects2/Other.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects2/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/siblingobjects2/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var1/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var1/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var1/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var1/stack_var1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var1/stack_var1.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var10/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var10/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var10/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var10/stack_var10.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var10/stack_var10.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var10/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var11/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var11/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var11/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var11/stack_var11.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var11/stack_var11.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var2/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var2/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var2/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var2/stack_var2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var2/stack_var2.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var3/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var3/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var3/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var3/stack_var3.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var3/stack_var3.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var3/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var4/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var4/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var4/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var4/stack_var4.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var4/stack_var4.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var5/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var5/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var5/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var5/stack_var5.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var5/stack_var5.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var6/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var6/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var6/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var6/stack_var6.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var6/stack_var6.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var7/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var7/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var7/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var7/stack_var7.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var7/stack_var7.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var8/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var8/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var8/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var8/stack_var8.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var8/stack_var8.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var9/README (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var9/stack_test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var9/stack_test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var9/stack_var9.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/stack_var9/stack_var9.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init1/static_init.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init1/static_init.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init1/test1.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init2/static_init.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init2/static_init.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init2/test1.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/static_init_order.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/static_init_order.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/test1.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/test2.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/test3.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_init_order/test4.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_method1/static_method1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_method1/static_method1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/static_method1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/store_load1/store_load1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/store_load1/store_load1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/store_load1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/string_literal1/string_literal1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/string_literal1/string_literal1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/string_literal1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap1/Swap.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap1/Swap.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap1/SwapDump.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap2/org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap2/org/springframework/build/gradle/MergePlugin.groovy (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/swap2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/synchronized/Sync.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/synchronized/Sync.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/synchronized/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/tableswitch1/tableswitch1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/tableswitch1/tableswitch1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/tableswitch1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/tableswitch2/generate_signed_tableswitch.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/tableswitch2/table_switch_neg_offset.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/tableswitch2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_class_identifier/TestGenTest.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_class_identifier/TestGenTest.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_class_identifier/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_options_json_extended/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_options_json_extended/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_options_json_extended/extended.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/trace_options_json_extended/non-extended.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/uninitialised1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/uninitialised1/uninitialised1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/uninitialised1/uninitialised1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/very-long-jumps/NopJumps.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/very-long-jumps/NopJumps.j (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/very-long-jumps/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual1/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual1/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual1/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual1/virtual1.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual1/virtual1.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/E.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/O.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual10/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual2/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual2/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual2/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual2/virtual2.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual2/virtual2.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual4/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual4/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual4/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual4/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual4/virtual4.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual4/virtual4.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual5/child.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual5/parent.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual5/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual5/virtual5.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual5/virtual5.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual6/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual6/A.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual6/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual6/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual6/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/E.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual7/test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/E.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual8/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/A.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/B.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/C.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/D.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/E.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/Test.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/Test.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual9/test.desc (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual_function_unwinding/Inner.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual_function_unwinding/Interface.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual_function_unwinding/Outer.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual_function_unwinding/Virtual.class (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual_function_unwinding/Virtual.java (100%) rename {regression/cbmc-java => jbmc/regression/jbmc}/virtual_function_unwinding/test.desc (100%) create mode 100644 jbmc/regression/jdiff/CMakeLists.txt create mode 100644 jbmc/regression/jdiff/Makefile rename {regression/goto-diff => jbmc/regression/jdiff}/java-add-package/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-add-package/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-add-package/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-add-package/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-add-package/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-del-package/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-del-package/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-del-package/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-del-package/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-del-package/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-deleted-function/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-deleted-function/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-deleted-function/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-deleted-function/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-deleted-function/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-instanceof/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-instanceof/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-instanceof/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-instanceof/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-instanceof/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-comment/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-comment/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-comment/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-comment/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-comment/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier2/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier2/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier2/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier2/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-identifier2/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-package/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-package/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-package/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-package/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-mod-package/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-new-function/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-new-function/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-new-function/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-new-function/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-new-function/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-no-change/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-no-change/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-no-change/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-no-change/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-no-change/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-properties/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-properties/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-properties/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-properties/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-properties/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change2/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change2/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change2/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change2/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change2/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change3/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change3/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change3/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change3/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-scope-change3/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-array/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-array/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-array/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-array/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-array/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-inc/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-inc/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-inc/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-inc/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-inc/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-new/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-new/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-new/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-new/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-new/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-string/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-string/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-string/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-string/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-tmp-vars-string/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-virtual-methods/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-virtual-methods/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-virtual-methods/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-virtual-methods/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/java-virtual-methods/test.desc (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/syntactic-diff-java1/new.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/syntactic-diff-java1/new/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/syntactic-diff-java1/old.jar (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/syntactic-diff-java1/old/Test.java (100%) rename {regression/goto-diff => jbmc/regression/jdiff}/syntactic-diff-java1/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/CMakeLists.txt (100%) create mode 100644 jbmc/regression/strings-smoke-tests/Makefile rename {regression => jbmc/regression}/strings-smoke-tests/cprover/CProverString.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/cprover/CProverString.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_char/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_char/test_append_char.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_char/test_append_char.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_int/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_int/test_append_int.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_int/test_append_int.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_object/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_object/test_append_object.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_object/test_append_object.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_string/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_string/test_append_string.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_string/test_append_string.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_append_string/test_substring.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_case/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_case/test_case.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_case/test_case.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_array/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_array/test_char_array.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_array/test_char_array.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_array_init/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_array_init/test_init.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_array_init/test_init.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_at/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_at/test_char_at.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_char_at/test_char_at.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_code_point/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_code_point/test_code_point.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_code_point/test_code_point.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_compare/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_compare/test_compare.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_compare/test_compare.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_concat/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_concat/test_concat.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_concat/test_concat.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_contains/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_contains/test_contains.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_contains/test_contains.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_contains/test_string_printable.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_delete/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_delete/test_delete.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_delete/test_delete.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_delete_char_at/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_delete_char_at/test_delete_char_at.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_delete_char_at/test_delete_char_at.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_empty/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_empty/test_empty.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_empty/test_empty.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_endswith/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_endswith/test_endswith.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_endswith/test_endswith.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_equal/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_equal/test_2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_equal/test_equal.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_equal/test_equal.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_equal/test_equal_2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_float/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_float/test_float.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_float/test_float.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format2/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format2/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format2/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format3/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format3/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format3/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format4/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format4/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format4/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format5/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format5/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_format5/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_hash_code/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_hash_code/test_hash_code.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_hash_code/test_hash_code.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_if/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_if/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_if/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of/test_index_of.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of/test_index_of.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of2/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of2/test_index_of2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of2/test_index_of2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of_char/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of_char/test_index_of_char.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_index_of_char/test_index_of_char.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_char/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_char/test_insert_char.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_char/test_insert_char.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_char_array/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_char_array/test_insert_char_array.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_char_array/test_insert_char_array.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_int/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_int/test_insert_int.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_int/test_insert_int.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_multiple/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_multiple/test_insert_multiple.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_multiple/test_insert_multiple.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_string/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_string/test_insert_string.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_insert_string/test_insert_string.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test4.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test4.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test5.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/Test5.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/test1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/test2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/test2_bug.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/test3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/test4.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string/test5.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_knownbug/Test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_knownbug/Test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_knownbug/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_binary1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_binary2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_binary3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_decimal.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_hex1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_hex2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_hex3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_octal1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_octal2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix/test_octal3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_binary.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_hex.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_octal.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_intern/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_intern/test_intern.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_intern/test_intern.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of/test_last_index_of.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of/test_last_index_of.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of2/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of2/test_last_index_of2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of2/test_last_index_of2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of_char/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_length/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_length/test_length.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_length/test_length.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_length2/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_length2/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_length2/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test4.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test4.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test5.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/Test5.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/test1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/test2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/test3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/test4.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string/test5.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_binary1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_binary2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_binary3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_decimal.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_hex1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_hex2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_hex3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_octal1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_octal2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_long_to_string_with_radix/test_octal3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/Test1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/Test1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/Test2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/Test2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/Test3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/Test3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/test1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/test2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint/test3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_knownbug/Test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_knownbug/Test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_knownbug/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test1.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test1.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test2.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test2.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test3.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test3.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test4.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test4.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test5.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test5.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test6.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/Test6.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/test1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/test2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/test3.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/test4.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/test5.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix/test6.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix_knownbug/output (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parseint_with_radix_knownbug/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_binary_min.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_binary_min.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_decimal_max.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_decimal_max.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_decimal_min.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_decimal_min.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_hex.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_hex.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_octal.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/Test_octal.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/test_binary_min.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/test_decimal_max.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/test_decimal_min.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/test_hex.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_parselong/test_octal.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_replace/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_replace/test_replace.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_replace/test_replace.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_replace_char/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_replace_char/test_replace_char.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_replace_char/test_replace_char.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_set_char_at/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_set_char_at/test_set_char_at.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_set_char_at/test_set_char_at.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_set_length/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_set_length/test_set_length.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_set_length/test_set_length.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_starts_with/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_starts_with/test_starts_with.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_starts_with/test_starts_with.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_builder_length/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_builder_length/test_sb_length.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_builder_length/test_sb_length.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_printable/Test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_printable/Test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_printable/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_string_printable/test_char.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_subsequence/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_subsequence/test_subsequence.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_subsequence/test_subsequence.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_substring/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_substring/test_substring.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_substring/test_substring.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_trim/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_trim/test_trim.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_trim/test_trim.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_2/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_2/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_2/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_3/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_3/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_3/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_4/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_4/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_4/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_5/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_5/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_float_5/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_long/test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_long/test.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/java_value_of_long/test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/MemberTest.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/MemberTest.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/MemberTest.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/MemberTest2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/Test.class (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/Test.java (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/test1.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/max_input_length/test2.desc (100%) rename {regression => jbmc/regression}/strings-smoke-tests/performance.py (100%) rename {regression => jbmc/regression}/strings-smoke-tests/performance_draw.gp (100%) delete mode 100644 regression/jbmc-strings/Makefile delete mode 100644 regression/strings-smoke-tests/Makefile diff --git a/jbmc/regression/CMakeLists.txt b/jbmc/regression/CMakeLists.txt new file mode 100644 index 00000000000..86e68b6c590 --- /dev/null +++ b/jbmc/regression/CMakeLists.txt @@ -0,0 +1,33 @@ +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} -p -c ${cmdline} ${flag} ${ARGN} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + set_tests_properties("${name}-${profile}" PROPERTIES + LABELS "${profile};CBMC" + ) +endmacro(add_test_pl_profile) + +macro(add_test_pl_tests cmdline) + get_filename_component(TEST_DIR_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) + message(STATUS "Adding tests in directory: ${TEST_DIR_NAME}") + add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -C CORE ${ARGN}) + add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -T THOROUGH ${ARGN}) + add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -F FUTURE ${ARGN}) + add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -K KNOWNBUG ${ARGN}) +endmacro(add_test_pl_tests) + +# For the best possible utilisation of multiple cores when +# running tests in parallel, it is important that these directories are +# listed with decreasing runtimes (i.e. longest running at the top) +add_subdirectory(jbmc) +add_subdirectory(strings-smoke-tests) +add_subdirectory(jbmc-strings) +add_subdirectory(jdiff) +add_subdirectory(janalyzer-taint) +add_subdirectory(jbmc-concurrency) +add_subdirectory(jbmc-inheritance) +add_subdirectory(jbmc-cover) diff --git a/jbmc/regression/Makefile b/jbmc/regression/Makefile new file mode 100644 index 00000000000..7e607532891 --- /dev/null +++ b/jbmc/regression/Makefile @@ -0,0 +1,53 @@ +# For the best possible utilisation of multiple cores when +# running tests in parallel, it is important that these directories are +# listed with decreasing runtimes (i.e. longest running at the top) +DIRS = janalzyer-taint \ + jbmc \ + jbmc-concurrency \ + jbmc-cover \ + jbmc-inheritance \ + jbmc-strings \ + jdiff \ + string-smoke-tests \ + # Empty last line + +# Tests under goto-gcc cannot be run on Windows, so appveyor.yml unlinks +# the entire directory under Windows. This variable will contain the list +# of directories that actually exist on the current platform. +PLATFORM_DIRS = $(wildcard $(DIRS)) + +# Run all test directories in sequence +.PHONY: test +test: + @for dir in $(PLATFORM_DIRS); do \ + $(MAKE) "$$dir" || exit 1; \ + done; + +# Pattern to execute a single test suite directory +.PHONY: $(PLATFORM_DIRS) +$(PLATFORM_DIRS): + @echo "Running $@..." ; + $(MAKE) -C "$@" test || exit 1; + +# Run all test directories using GNU Parallel +.PHONY: test-parallel +.NOTPARALLEL: test-parallel +test-parallel: + @echo "Building with $(JOBS) jobs" + parallel \ + --halt soon,fail=1 \ + --tag \ + --tagstring '{#}:' \ + --linebuffer \ + --jobs $(JOBS) \ + $(MAKE) "{}" \ + ::: $(PLATFORM_DIRS) + + +.PHONY: clean +clean: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + $(MAKE) -C "$$dir" clean; \ + fi; \ + done; diff --git a/jbmc/regression/janalyzer-taint/CMakeLists.txt b/jbmc/regression/janalyzer-taint/CMakeLists.txt new file mode 100644 index 00000000000..73af8689568 --- /dev/null +++ b/jbmc/regression/janalyzer-taint/CMakeLists.txt @@ -0,0 +1,3 @@ +add_test_pl_tests( + "$" +) diff --git a/jbmc/regression/janalyzer-taint/Makefile b/jbmc/regression/janalyzer-taint/Makefile new file mode 100644 index 00000000000..7b513b64647 --- /dev/null +++ b/jbmc/regression/janalyzer-taint/Makefile @@ -0,0 +1,21 @@ +default: tests.log + +include ../../src/config.inc + +test: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/janalyzer/janalyzer + +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/janalyzer/janalyzer + +show: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + vim -o "$$dir/*.java" "$$dir/*.out"; \ + fi; \ + done; + +clean: + find -name '*.out' -execdir $(RM) '{}' \; + find -name '*.gb' -execdir $(RM) '{}' \; + $(RM) tests.log diff --git a/regression/goto-analyzer-taint/taint-aliasing1/aliasing1.class b/jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.class similarity index 100% rename from regression/goto-analyzer-taint/taint-aliasing1/aliasing1.class rename to jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.class diff --git a/regression/goto-analyzer-taint/taint-aliasing1/aliasing1.java b/jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.java similarity index 100% rename from regression/goto-analyzer-taint/taint-aliasing1/aliasing1.java rename to jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.java diff --git a/regression/goto-analyzer-taint/taint-aliasing1/taint.json b/jbmc/regression/janalyzer-taint/taint-aliasing1/taint.json similarity index 100% rename from regression/goto-analyzer-taint/taint-aliasing1/taint.json rename to jbmc/regression/janalyzer-taint/taint-aliasing1/taint.json diff --git a/regression/goto-analyzer-taint/taint-aliasing1/test.desc b/jbmc/regression/janalyzer-taint/taint-aliasing1/test.desc similarity index 100% rename from regression/goto-analyzer-taint/taint-aliasing1/test.desc rename to jbmc/regression/janalyzer-taint/taint-aliasing1/test.desc diff --git a/regression/goto-analyzer-taint/taint-basic1/basic1.class b/jbmc/regression/janalyzer-taint/taint-basic1/basic1.class similarity index 100% rename from regression/goto-analyzer-taint/taint-basic1/basic1.class rename to jbmc/regression/janalyzer-taint/taint-basic1/basic1.class diff --git a/regression/goto-analyzer-taint/taint-basic1/basic1.java b/jbmc/regression/janalyzer-taint/taint-basic1/basic1.java similarity index 100% rename from regression/goto-analyzer-taint/taint-basic1/basic1.java rename to jbmc/regression/janalyzer-taint/taint-basic1/basic1.java diff --git a/regression/goto-analyzer-taint/taint-basic1/taint.json b/jbmc/regression/janalyzer-taint/taint-basic1/taint.json similarity index 100% rename from regression/goto-analyzer-taint/taint-basic1/taint.json rename to jbmc/regression/janalyzer-taint/taint-basic1/taint.json diff --git a/regression/goto-analyzer-taint/taint-basic1/test.desc b/jbmc/regression/janalyzer-taint/taint-basic1/test.desc similarity index 100% rename from regression/goto-analyzer-taint/taint-basic1/test.desc rename to jbmc/regression/janalyzer-taint/taint-basic1/test.desc diff --git a/regression/goto-analyzer-taint/taint-basic2/basic2.class b/jbmc/regression/janalyzer-taint/taint-basic2/basic2.class similarity index 100% rename from regression/goto-analyzer-taint/taint-basic2/basic2.class rename to jbmc/regression/janalyzer-taint/taint-basic2/basic2.class diff --git a/regression/goto-analyzer-taint/taint-basic2/basic2.java b/jbmc/regression/janalyzer-taint/taint-basic2/basic2.java similarity index 100% rename from regression/goto-analyzer-taint/taint-basic2/basic2.java rename to jbmc/regression/janalyzer-taint/taint-basic2/basic2.java diff --git a/regression/goto-analyzer-taint/taint-basic2/taint.json b/jbmc/regression/janalyzer-taint/taint-basic2/taint.json similarity index 100% rename from regression/goto-analyzer-taint/taint-basic2/taint.json rename to jbmc/regression/janalyzer-taint/taint-basic2/taint.json diff --git a/regression/goto-analyzer-taint/taint-basic2/test.desc b/jbmc/regression/janalyzer-taint/taint-basic2/test.desc similarity index 100% rename from regression/goto-analyzer-taint/taint-basic2/test.desc rename to jbmc/regression/janalyzer-taint/taint-basic2/test.desc diff --git a/regression/goto-analyzer-taint/taint-interface1/interface1.class b/jbmc/regression/janalyzer-taint/taint-interface1/interface1.class similarity index 100% rename from regression/goto-analyzer-taint/taint-interface1/interface1.class rename to jbmc/regression/janalyzer-taint/taint-interface1/interface1.class diff --git a/regression/goto-analyzer-taint/taint-interface1/interface1.java b/jbmc/regression/janalyzer-taint/taint-interface1/interface1.java similarity index 100% rename from regression/goto-analyzer-taint/taint-interface1/interface1.java rename to jbmc/regression/janalyzer-taint/taint-interface1/interface1.java diff --git a/regression/goto-analyzer-taint/taint-interface1/my_I.class b/jbmc/regression/janalyzer-taint/taint-interface1/my_I.class similarity index 100% rename from regression/goto-analyzer-taint/taint-interface1/my_I.class rename to jbmc/regression/janalyzer-taint/taint-interface1/my_I.class diff --git a/regression/goto-analyzer-taint/taint-interface1/some_class.class b/jbmc/regression/janalyzer-taint/taint-interface1/some_class.class similarity index 100% rename from regression/goto-analyzer-taint/taint-interface1/some_class.class rename to jbmc/regression/janalyzer-taint/taint-interface1/some_class.class diff --git a/regression/goto-analyzer-taint/taint-interface1/taint.json b/jbmc/regression/janalyzer-taint/taint-interface1/taint.json similarity index 100% rename from regression/goto-analyzer-taint/taint-interface1/taint.json rename to jbmc/regression/janalyzer-taint/taint-interface1/taint.json diff --git a/regression/goto-analyzer-taint/taint-interface1/test.desc b/jbmc/regression/janalyzer-taint/taint-interface1/test.desc similarity index 100% rename from regression/goto-analyzer-taint/taint-interface1/test.desc rename to jbmc/regression/janalyzer-taint/taint-interface1/test.desc diff --git a/regression/goto-analyzer-taint/taint-interproc1/interproc1.class b/jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.class similarity index 100% rename from regression/goto-analyzer-taint/taint-interproc1/interproc1.class rename to jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.class diff --git a/regression/goto-analyzer-taint/taint-interproc1/interproc1.java b/jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.java similarity index 100% rename from regression/goto-analyzer-taint/taint-interproc1/interproc1.java rename to jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.java diff --git a/regression/goto-analyzer-taint/taint-interproc1/taint.json b/jbmc/regression/janalyzer-taint/taint-interproc1/taint.json similarity index 100% rename from regression/goto-analyzer-taint/taint-interproc1/taint.json rename to jbmc/regression/janalyzer-taint/taint-interproc1/taint.json diff --git a/regression/goto-analyzer-taint/taint-interproc1/test.desc b/jbmc/regression/janalyzer-taint/taint-interproc1/test.desc similarity index 100% rename from regression/goto-analyzer-taint/taint-interproc1/test.desc rename to jbmc/regression/janalyzer-taint/taint-interproc1/test.desc diff --git a/regression/goto-analyzer-taint/taint-map1/map1.class b/jbmc/regression/janalyzer-taint/taint-map1/map1.class similarity index 100% rename from regression/goto-analyzer-taint/taint-map1/map1.class rename to jbmc/regression/janalyzer-taint/taint-map1/map1.class diff --git a/regression/goto-analyzer-taint/taint-map1/map1.java b/jbmc/regression/janalyzer-taint/taint-map1/map1.java similarity index 100% rename from regression/goto-analyzer-taint/taint-map1/map1.java rename to jbmc/regression/janalyzer-taint/taint-map1/map1.java diff --git a/regression/goto-analyzer-taint/taint-map1/taint.json b/jbmc/regression/janalyzer-taint/taint-map1/taint.json similarity index 100% rename from regression/goto-analyzer-taint/taint-map1/taint.json rename to jbmc/regression/janalyzer-taint/taint-map1/taint.json diff --git a/regression/goto-analyzer-taint/taint-map1/test.desc b/jbmc/regression/janalyzer-taint/taint-map1/test.desc similarity index 100% rename from regression/goto-analyzer-taint/taint-map1/test.desc rename to jbmc/regression/janalyzer-taint/taint-map1/test.desc diff --git a/regression/cbmc-java-concurrency/CMakeLists.txt b/jbmc/regression/jbmc-concurrency/CMakeLists.txt similarity index 100% rename from regression/cbmc-java-concurrency/CMakeLists.txt rename to jbmc/regression/jbmc-concurrency/CMakeLists.txt diff --git a/regression/cbmc-java-concurrency/Makefile b/jbmc/regression/jbmc-concurrency/Makefile similarity index 74% rename from regression/cbmc-java-concurrency/Makefile rename to jbmc/regression/jbmc-concurrency/Makefile index e94b327bb43..ad6e5381fff 100644 --- a/regression/cbmc-java-concurrency/Makefile +++ b/jbmc/regression/jbmc-concurrency/Makefile @@ -1,10 +1,12 @@ default: tests.log +include ../../src/config.inc + test: - @../test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -tests.log: ../test.pl - @../test.pl -p -c ../../../src/jbmc/jbmc +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc show: @for dir in *; do \ diff --git a/regression/cbmc-java-concurrency/explicit_thread_blocks/A.class b/jbmc/regression/jbmc-concurrency/explicit_thread_blocks/A.class similarity index 100% rename from regression/cbmc-java-concurrency/explicit_thread_blocks/A.class rename to jbmc/regression/jbmc-concurrency/explicit_thread_blocks/A.class diff --git a/regression/cbmc-java-concurrency/explicit_thread_blocks/A.java b/jbmc/regression/jbmc-concurrency/explicit_thread_blocks/A.java similarity index 100% rename from regression/cbmc-java-concurrency/explicit_thread_blocks/A.java rename to jbmc/regression/jbmc-concurrency/explicit_thread_blocks/A.java diff --git a/regression/cbmc-java-concurrency/explicit_thread_blocks/test.desc b/jbmc/regression/jbmc-concurrency/explicit_thread_blocks/test.desc similarity index 100% rename from regression/cbmc-java-concurrency/explicit_thread_blocks/test.desc rename to jbmc/regression/jbmc-concurrency/explicit_thread_blocks/test.desc diff --git a/regression/cbmc-java-concurrency/explicit_thread_blocks/test2.desc b/jbmc/regression/jbmc-concurrency/explicit_thread_blocks/test2.desc similarity index 100% rename from regression/cbmc-java-concurrency/explicit_thread_blocks/test2.desc rename to jbmc/regression/jbmc-concurrency/explicit_thread_blocks/test2.desc diff --git a/regression/cbmc-java/CMakeLists.txt b/jbmc/regression/jbmc-cover/CMakeLists.txt similarity index 100% rename from regression/cbmc-java/CMakeLists.txt rename to jbmc/regression/jbmc-cover/CMakeLists.txt diff --git a/regression/cbmc-java-inheritance/Makefile b/jbmc/regression/jbmc-cover/Makefile similarity index 74% rename from regression/cbmc-java-inheritance/Makefile rename to jbmc/regression/jbmc-cover/Makefile index e94b327bb43..ad6e5381fff 100644 --- a/regression/cbmc-java-inheritance/Makefile +++ b/jbmc/regression/jbmc-cover/Makefile @@ -1,10 +1,12 @@ default: tests.log +include ../../src/config.inc + test: - @../test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -tests.log: ../test.pl - @../test.pl -p -c ../../../src/jbmc/jbmc +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc show: @for dir in *; do \ diff --git a/regression/jbmc-cover/generics/AbstractImpl.class b/jbmc/regression/jbmc-cover/generics/AbstractImpl.class similarity index 100% rename from regression/jbmc-cover/generics/AbstractImpl.class rename to jbmc/regression/jbmc-cover/generics/AbstractImpl.class diff --git a/regression/jbmc-cover/generics/AbstractInt.class b/jbmc/regression/jbmc-cover/generics/AbstractInt.class similarity index 100% rename from regression/jbmc-cover/generics/AbstractInt.class rename to jbmc/regression/jbmc-cover/generics/AbstractInt.class diff --git a/regression/jbmc-cover/generics/AbstractTest$ClassA.class b/jbmc/regression/jbmc-cover/generics/AbstractTest$ClassA.class similarity index 100% rename from regression/jbmc-cover/generics/AbstractTest$ClassA.class rename to jbmc/regression/jbmc-cover/generics/AbstractTest$ClassA.class diff --git a/regression/jbmc-cover/generics/AbstractTest$ClassB.class b/jbmc/regression/jbmc-cover/generics/AbstractTest$ClassB.class similarity index 100% rename from regression/jbmc-cover/generics/AbstractTest$ClassB.class rename to jbmc/regression/jbmc-cover/generics/AbstractTest$ClassB.class diff --git a/regression/jbmc-cover/generics/AbstractTest$Dummy.class b/jbmc/regression/jbmc-cover/generics/AbstractTest$Dummy.class similarity index 100% rename from regression/jbmc-cover/generics/AbstractTest$Dummy.class rename to jbmc/regression/jbmc-cover/generics/AbstractTest$Dummy.class diff --git a/regression/jbmc-cover/generics/AbstractTest.class b/jbmc/regression/jbmc-cover/generics/AbstractTest.class similarity index 100% rename from regression/jbmc-cover/generics/AbstractTest.class rename to jbmc/regression/jbmc-cover/generics/AbstractTest.class diff --git a/regression/jbmc-cover/generics/AbstractTest.java b/jbmc/regression/jbmc-cover/generics/AbstractTest.java similarity index 100% rename from regression/jbmc-cover/generics/AbstractTest.java rename to jbmc/regression/jbmc-cover/generics/AbstractTest.java diff --git a/regression/jbmc-cover/generics/test.desc b/jbmc/regression/jbmc-cover/generics/test.desc similarity index 100% rename from regression/jbmc-cover/generics/test.desc rename to jbmc/regression/jbmc-cover/generics/test.desc diff --git a/regression/jbmc-cover/unique-bytecode1/Test.class b/jbmc/regression/jbmc-cover/unique-bytecode1/Test.class similarity index 100% rename from regression/jbmc-cover/unique-bytecode1/Test.class rename to jbmc/regression/jbmc-cover/unique-bytecode1/Test.class diff --git a/regression/jbmc-cover/unique-bytecode1/Test.java b/jbmc/regression/jbmc-cover/unique-bytecode1/Test.java similarity index 100% rename from regression/jbmc-cover/unique-bytecode1/Test.java rename to jbmc/regression/jbmc-cover/unique-bytecode1/Test.java diff --git a/regression/jbmc-cover/unique-bytecode1/test.desc b/jbmc/regression/jbmc-cover/unique-bytecode1/test.desc similarity index 100% rename from regression/jbmc-cover/unique-bytecode1/test.desc rename to jbmc/regression/jbmc-cover/unique-bytecode1/test.desc diff --git a/regression/jbmc-cover/unique-bytecode2/Test.class b/jbmc/regression/jbmc-cover/unique-bytecode2/Test.class similarity index 100% rename from regression/jbmc-cover/unique-bytecode2/Test.class rename to jbmc/regression/jbmc-cover/unique-bytecode2/Test.class diff --git a/regression/jbmc-cover/unique-bytecode2/Test.java b/jbmc/regression/jbmc-cover/unique-bytecode2/Test.java similarity index 100% rename from regression/jbmc-cover/unique-bytecode2/Test.java rename to jbmc/regression/jbmc-cover/unique-bytecode2/Test.java diff --git a/regression/jbmc-cover/unique-bytecode2/test.desc b/jbmc/regression/jbmc-cover/unique-bytecode2/test.desc similarity index 100% rename from regression/jbmc-cover/unique-bytecode2/test.desc rename to jbmc/regression/jbmc-cover/unique-bytecode2/test.desc diff --git a/regression/jbmc-cover/unique-bytecode3/Test.class b/jbmc/regression/jbmc-cover/unique-bytecode3/Test.class similarity index 100% rename from regression/jbmc-cover/unique-bytecode3/Test.class rename to jbmc/regression/jbmc-cover/unique-bytecode3/Test.class diff --git a/regression/jbmc-cover/unique-bytecode3/Test.java b/jbmc/regression/jbmc-cover/unique-bytecode3/Test.java similarity index 100% rename from regression/jbmc-cover/unique-bytecode3/Test.java rename to jbmc/regression/jbmc-cover/unique-bytecode3/Test.java diff --git a/regression/jbmc-cover/unique-bytecode3/test.desc b/jbmc/regression/jbmc-cover/unique-bytecode3/test.desc similarity index 100% rename from regression/jbmc-cover/unique-bytecode3/test.desc rename to jbmc/regression/jbmc-cover/unique-bytecode3/test.desc diff --git a/regression/cbmc-java-inheritance/CMakeLists.txt b/jbmc/regression/jbmc-inheritance/CMakeLists.txt similarity index 100% rename from regression/cbmc-java-inheritance/CMakeLists.txt rename to jbmc/regression/jbmc-inheritance/CMakeLists.txt diff --git a/regression/cbmc-java/Makefile b/jbmc/regression/jbmc-inheritance/Makefile similarity index 64% rename from regression/cbmc-java/Makefile rename to jbmc/regression/jbmc-inheritance/Makefile index 15894631527..ad6e5381fff 100644 --- a/regression/cbmc-java/Makefile +++ b/jbmc/regression/jbmc-inheritance/Makefile @@ -1,12 +1,12 @@ default: tests.log +include ../../src/config.inc + test: - @../test.pl -p -c ../../../src/jbmc/jbmc - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -tests.log: ../test.pl - @../test.pl -p -c ../../../src/jbmc/jbmc - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc show: @for dir in *; do \ diff --git a/regression/cbmc-java-inheritance/inheritance01/A.class b/jbmc/regression/jbmc-inheritance/inheritance01/A.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance01/A.class rename to jbmc/regression/jbmc-inheritance/inheritance01/A.class diff --git a/regression/cbmc-java-inheritance/inheritance01/B.class b/jbmc/regression/jbmc-inheritance/inheritance01/B.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance01/B.class rename to jbmc/regression/jbmc-inheritance/inheritance01/B.class diff --git a/regression/cbmc-java-inheritance/inheritance01/test.class b/jbmc/regression/jbmc-inheritance/inheritance01/test.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance01/test.class rename to jbmc/regression/jbmc-inheritance/inheritance01/test.class diff --git a/regression/cbmc-java-inheritance/inheritance01/test.desc b/jbmc/regression/jbmc-inheritance/inheritance01/test.desc similarity index 100% rename from regression/cbmc-java-inheritance/inheritance01/test.desc rename to jbmc/regression/jbmc-inheritance/inheritance01/test.desc diff --git a/regression/cbmc-java-inheritance/inheritance01/test.java b/jbmc/regression/jbmc-inheritance/inheritance01/test.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance01/test.java rename to jbmc/regression/jbmc-inheritance/inheritance01/test.java diff --git a/regression/cbmc-java-inheritance/inheritance02/A.class b/jbmc/regression/jbmc-inheritance/inheritance02/A.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance02/A.class rename to jbmc/regression/jbmc-inheritance/inheritance02/A.class diff --git a/regression/cbmc-java-inheritance/inheritance02/B.class b/jbmc/regression/jbmc-inheritance/inheritance02/B.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance02/B.class rename to jbmc/regression/jbmc-inheritance/inheritance02/B.class diff --git a/regression/cbmc-java-inheritance/inheritance02/test.class b/jbmc/regression/jbmc-inheritance/inheritance02/test.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance02/test.class rename to jbmc/regression/jbmc-inheritance/inheritance02/test.class diff --git a/regression/cbmc-java-inheritance/inheritance02/test.desc b/jbmc/regression/jbmc-inheritance/inheritance02/test.desc similarity index 100% rename from regression/cbmc-java-inheritance/inheritance02/test.desc rename to jbmc/regression/jbmc-inheritance/inheritance02/test.desc diff --git a/regression/cbmc-java-inheritance/inheritance02/test.java b/jbmc/regression/jbmc-inheritance/inheritance02/test.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance02/test.java rename to jbmc/regression/jbmc-inheritance/inheritance02/test.java diff --git a/regression/cbmc-java-inheritance/inheritance03/A.class b/jbmc/regression/jbmc-inheritance/inheritance03/A.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance03/A.class rename to jbmc/regression/jbmc-inheritance/inheritance03/A.class diff --git a/regression/cbmc-java-inheritance/inheritance03/B.class b/jbmc/regression/jbmc-inheritance/inheritance03/B.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance03/B.class rename to jbmc/regression/jbmc-inheritance/inheritance03/B.class diff --git a/regression/cbmc-java-inheritance/inheritance03/Z.class b/jbmc/regression/jbmc-inheritance/inheritance03/Z.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance03/Z.class rename to jbmc/regression/jbmc-inheritance/inheritance03/Z.class diff --git a/regression/cbmc-java-inheritance/inheritance03/test.class b/jbmc/regression/jbmc-inheritance/inheritance03/test.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance03/test.class rename to jbmc/regression/jbmc-inheritance/inheritance03/test.class diff --git a/regression/cbmc-java-inheritance/inheritance03/test.desc b/jbmc/regression/jbmc-inheritance/inheritance03/test.desc similarity index 100% rename from regression/cbmc-java-inheritance/inheritance03/test.desc rename to jbmc/regression/jbmc-inheritance/inheritance03/test.desc diff --git a/regression/cbmc-java-inheritance/inheritance03/test.java b/jbmc/regression/jbmc-inheritance/inheritance03/test.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance03/test.java rename to jbmc/regression/jbmc-inheritance/inheritance03/test.java diff --git a/regression/cbmc-java-inheritance/inheritance04/A.class b/jbmc/regression/jbmc-inheritance/inheritance04/A.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance04/A.class rename to jbmc/regression/jbmc-inheritance/inheritance04/A.class diff --git a/regression/cbmc-java-inheritance/inheritance04/B.class b/jbmc/regression/jbmc-inheritance/inheritance04/B.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance04/B.class rename to jbmc/regression/jbmc-inheritance/inheritance04/B.class diff --git a/regression/cbmc-java-inheritance/inheritance04/Z.class b/jbmc/regression/jbmc-inheritance/inheritance04/Z.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance04/Z.class rename to jbmc/regression/jbmc-inheritance/inheritance04/Z.class diff --git a/regression/cbmc-java-inheritance/inheritance04/test.class b/jbmc/regression/jbmc-inheritance/inheritance04/test.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance04/test.class rename to jbmc/regression/jbmc-inheritance/inheritance04/test.class diff --git a/regression/cbmc-java-inheritance/inheritance04/test.desc b/jbmc/regression/jbmc-inheritance/inheritance04/test.desc similarity index 100% rename from regression/cbmc-java-inheritance/inheritance04/test.desc rename to jbmc/regression/jbmc-inheritance/inheritance04/test.desc diff --git a/regression/cbmc-java-inheritance/inheritance04/test.java b/jbmc/regression/jbmc-inheritance/inheritance04/test.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance04/test.java rename to jbmc/regression/jbmc-inheritance/inheritance04/test.java diff --git a/regression/cbmc-java-inheritance/inheritance05/A.class b/jbmc/regression/jbmc-inheritance/inheritance05/A.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance05/A.class rename to jbmc/regression/jbmc-inheritance/inheritance05/A.class diff --git a/regression/cbmc-java-inheritance/inheritance05/B.class b/jbmc/regression/jbmc-inheritance/inheritance05/B.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance05/B.class rename to jbmc/regression/jbmc-inheritance/inheritance05/B.class diff --git a/regression/cbmc-java-inheritance/inheritance05/test.class b/jbmc/regression/jbmc-inheritance/inheritance05/test.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance05/test.class rename to jbmc/regression/jbmc-inheritance/inheritance05/test.class diff --git a/regression/cbmc-java-inheritance/inheritance05/test.desc b/jbmc/regression/jbmc-inheritance/inheritance05/test.desc similarity index 100% rename from regression/cbmc-java-inheritance/inheritance05/test.desc rename to jbmc/regression/jbmc-inheritance/inheritance05/test.desc diff --git a/regression/cbmc-java-inheritance/inheritance05/test.java b/jbmc/regression/jbmc-inheritance/inheritance05/test.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance05/test.java rename to jbmc/regression/jbmc-inheritance/inheritance05/test.java diff --git a/regression/cbmc-java-inheritance/inheritance06/A.java b/jbmc/regression/jbmc-inheritance/inheritance06/A.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/A.java rename to jbmc/regression/jbmc-inheritance/inheritance06/A.java diff --git a/regression/cbmc-java-inheritance/inheritance06/B.java b/jbmc/regression/jbmc-inheritance/inheritance06/B.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/B.java rename to jbmc/regression/jbmc-inheritance/inheritance06/B.java diff --git a/regression/cbmc-java-inheritance/inheritance06/temp/A.class b/jbmc/regression/jbmc-inheritance/inheritance06/temp/A.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/temp/A.class rename to jbmc/regression/jbmc-inheritance/inheritance06/temp/A.class diff --git a/regression/cbmc-java-inheritance/inheritance06/temp/B.class b/jbmc/regression/jbmc-inheritance/inheritance06/temp/B.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/temp/B.class rename to jbmc/regression/jbmc-inheritance/inheritance06/temp/B.class diff --git a/regression/cbmc-java-inheritance/inheritance06/test.class b/jbmc/regression/jbmc-inheritance/inheritance06/test.class similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/test.class rename to jbmc/regression/jbmc-inheritance/inheritance06/test.class diff --git a/regression/cbmc-java-inheritance/inheritance06/test.desc b/jbmc/regression/jbmc-inheritance/inheritance06/test.desc similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/test.desc rename to jbmc/regression/jbmc-inheritance/inheritance06/test.desc diff --git a/regression/cbmc-java-inheritance/inheritance06/test.java b/jbmc/regression/jbmc-inheritance/inheritance06/test.java similarity index 100% rename from regression/cbmc-java-inheritance/inheritance06/test.java rename to jbmc/regression/jbmc-inheritance/inheritance06/test.java diff --git a/regression/jbmc-strings/CMakeLists.txt b/jbmc/regression/jbmc-strings/CMakeLists.txt similarity index 100% rename from regression/jbmc-strings/CMakeLists.txt rename to jbmc/regression/jbmc-strings/CMakeLists.txt diff --git a/regression/jbmc-strings/CharacterGetNumericValue/test.class b/jbmc/regression/jbmc-strings/CharacterGetNumericValue/test.class similarity index 100% rename from regression/jbmc-strings/CharacterGetNumericValue/test.class rename to jbmc/regression/jbmc-strings/CharacterGetNumericValue/test.class diff --git a/regression/jbmc-strings/CharacterGetNumericValue/test.desc b/jbmc/regression/jbmc-strings/CharacterGetNumericValue/test.desc similarity index 100% rename from regression/jbmc-strings/CharacterGetNumericValue/test.desc rename to jbmc/regression/jbmc-strings/CharacterGetNumericValue/test.desc diff --git a/regression/jbmc-strings/CharacterGetNumericValue/test.java b/jbmc/regression/jbmc-strings/CharacterGetNumericValue/test.java similarity index 100% rename from regression/jbmc-strings/CharacterGetNumericValue/test.java rename to jbmc/regression/jbmc-strings/CharacterGetNumericValue/test.java diff --git a/jbmc/regression/jbmc-strings/Makefile b/jbmc/regression/jbmc-strings/Makefile new file mode 100644 index 00000000000..9c4a5076c4f --- /dev/null +++ b/jbmc/regression/jbmc-strings/Makefile @@ -0,0 +1,32 @@ +default: tests.log + +include ../../src/config.inc + +test: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + +testfuture: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -CF + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CF + +testall: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -CFTK + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CFTK + +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + +show: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + vim -o "$$dir/*.c" "$$dir/*.out"; \ + fi; \ + done; + +clean: + find -name '*.out' -execdir $(RM) '{}' \; + find -name '*.gb' -execdir $(RM) '{}' \; + $(RM) tests.log + diff --git a/regression/jbmc-strings/RegexMatches01/RegexMatches01.class b/jbmc/regression/jbmc-strings/RegexMatches01/RegexMatches01.class similarity index 100% rename from regression/jbmc-strings/RegexMatches01/RegexMatches01.class rename to jbmc/regression/jbmc-strings/RegexMatches01/RegexMatches01.class diff --git a/regression/jbmc-strings/RegexMatches01/RegexMatches01.java b/jbmc/regression/jbmc-strings/RegexMatches01/RegexMatches01.java similarity index 100% rename from regression/jbmc-strings/RegexMatches01/RegexMatches01.java rename to jbmc/regression/jbmc-strings/RegexMatches01/RegexMatches01.java diff --git a/regression/jbmc-strings/RegexMatches01/test.desc b/jbmc/regression/jbmc-strings/RegexMatches01/test.desc similarity index 100% rename from regression/jbmc-strings/RegexMatches01/test.desc rename to jbmc/regression/jbmc-strings/RegexMatches01/test.desc diff --git a/regression/jbmc-strings/RegexMatches02/RegexMatches02.class b/jbmc/regression/jbmc-strings/RegexMatches02/RegexMatches02.class similarity index 100% rename from regression/jbmc-strings/RegexMatches02/RegexMatches02.class rename to jbmc/regression/jbmc-strings/RegexMatches02/RegexMatches02.class diff --git a/regression/jbmc-strings/RegexMatches02/RegexMatches02.java b/jbmc/regression/jbmc-strings/RegexMatches02/RegexMatches02.java similarity index 100% rename from regression/jbmc-strings/RegexMatches02/RegexMatches02.java rename to jbmc/regression/jbmc-strings/RegexMatches02/RegexMatches02.java diff --git a/regression/jbmc-strings/RegexMatches02/test.desc b/jbmc/regression/jbmc-strings/RegexMatches02/test.desc similarity index 100% rename from regression/jbmc-strings/RegexMatches02/test.desc rename to jbmc/regression/jbmc-strings/RegexMatches02/test.desc diff --git a/regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.class b/jbmc/regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.class similarity index 100% rename from regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.class rename to jbmc/regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.class diff --git a/regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.java b/jbmc/regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.java similarity index 100% rename from regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.java rename to jbmc/regression/jbmc-strings/RegexSubstitution01/RegexSubstitution01.java diff --git a/regression/jbmc-strings/RegexSubstitution01/test.desc b/jbmc/regression/jbmc-strings/RegexSubstitution01/test.desc similarity index 100% rename from regression/jbmc-strings/RegexSubstitution01/test.desc rename to jbmc/regression/jbmc-strings/RegexSubstitution01/test.desc diff --git a/regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.class b/jbmc/regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.class similarity index 100% rename from regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.class rename to jbmc/regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.class diff --git a/regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.java b/jbmc/regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.java similarity index 100% rename from regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.java rename to jbmc/regression/jbmc-strings/RegexSubstitution02/RegexSubstitution02.java diff --git a/regression/jbmc-strings/RegexSubstitution02/test.desc b/jbmc/regression/jbmc-strings/RegexSubstitution02/test.desc similarity index 100% rename from regression/jbmc-strings/RegexSubstitution02/test.desc rename to jbmc/regression/jbmc-strings/RegexSubstitution02/test.desc diff --git a/regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.class b/jbmc/regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.class similarity index 100% rename from regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.class rename to jbmc/regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.class diff --git a/regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.java b/jbmc/regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.java similarity index 100% rename from regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.java rename to jbmc/regression/jbmc-strings/RegexSubstitution03/RegexSubstitution03.java diff --git a/regression/jbmc-strings/RegexSubstitution03/test.desc b/jbmc/regression/jbmc-strings/RegexSubstitution03/test.desc similarity index 100% rename from regression/jbmc-strings/RegexSubstitution03/test.desc rename to jbmc/regression/jbmc-strings/RegexSubstitution03/test.desc diff --git a/regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.class b/jbmc/regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.class similarity index 100% rename from regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.class rename to jbmc/regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.class diff --git a/regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.java b/jbmc/regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.java similarity index 100% rename from regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.java rename to jbmc/regression/jbmc-strings/StaticCharMethods01/StaticCharMethods01.java diff --git a/regression/jbmc-strings/StaticCharMethods01/test.desc b/jbmc/regression/jbmc-strings/StaticCharMethods01/test.desc similarity index 100% rename from regression/jbmc-strings/StaticCharMethods01/test.desc rename to jbmc/regression/jbmc-strings/StaticCharMethods01/test.desc diff --git a/regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.class b/jbmc/regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.class similarity index 100% rename from regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.class rename to jbmc/regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.class diff --git a/regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.java b/jbmc/regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.java similarity index 100% rename from regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.java rename to jbmc/regression/jbmc-strings/StaticCharMethods02/StaticCharMethods02.java diff --git a/regression/jbmc-strings/StaticCharMethods02/test.desc b/jbmc/regression/jbmc-strings/StaticCharMethods02/test.desc similarity index 100% rename from regression/jbmc-strings/StaticCharMethods02/test.desc rename to jbmc/regression/jbmc-strings/StaticCharMethods02/test.desc diff --git a/regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.class b/jbmc/regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.class similarity index 100% rename from regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.class rename to jbmc/regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.class diff --git a/regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.java b/jbmc/regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.java similarity index 100% rename from regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.java rename to jbmc/regression/jbmc-strings/StaticCharMethods03/StaticCharMethods03.java diff --git a/regression/jbmc-strings/StaticCharMethods03/test.desc b/jbmc/regression/jbmc-strings/StaticCharMethods03/test.desc similarity index 100% rename from regression/jbmc-strings/StaticCharMethods03/test.desc rename to jbmc/regression/jbmc-strings/StaticCharMethods03/test.desc diff --git a/regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.class b/jbmc/regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.class similarity index 100% rename from regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.class rename to jbmc/regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.class diff --git a/regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.java b/jbmc/regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.java similarity index 100% rename from regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.java rename to jbmc/regression/jbmc-strings/StaticCharMethods04/StaticCharMethods04.java diff --git a/regression/jbmc-strings/StaticCharMethods04/test.desc b/jbmc/regression/jbmc-strings/StaticCharMethods04/test.desc similarity index 100% rename from regression/jbmc-strings/StaticCharMethods04/test.desc rename to jbmc/regression/jbmc-strings/StaticCharMethods04/test.desc diff --git a/regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.class b/jbmc/regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.class similarity index 100% rename from regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.class rename to jbmc/regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.class diff --git a/regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.java b/jbmc/regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.java similarity index 100% rename from regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.java rename to jbmc/regression/jbmc-strings/StaticCharMethods05/StaticCharMethods05.java diff --git a/regression/jbmc-strings/StaticCharMethods05/test.desc b/jbmc/regression/jbmc-strings/StaticCharMethods05/test.desc similarity index 100% rename from regression/jbmc-strings/StaticCharMethods05/test.desc rename to jbmc/regression/jbmc-strings/StaticCharMethods05/test.desc diff --git a/regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.class b/jbmc/regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.class similarity index 100% rename from regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.class rename to jbmc/regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.class diff --git a/regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.java b/jbmc/regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.java similarity index 100% rename from regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.java rename to jbmc/regression/jbmc-strings/StaticCharMethods06/StaticCharMethods06.java diff --git a/regression/jbmc-strings/StaticCharMethods06/test.desc b/jbmc/regression/jbmc-strings/StaticCharMethods06/test.desc similarity index 100% rename from regression/jbmc-strings/StaticCharMethods06/test.desc rename to jbmc/regression/jbmc-strings/StaticCharMethods06/test.desc diff --git a/regression/jbmc-strings/StringArray/Test.class b/jbmc/regression/jbmc-strings/StringArray/Test.class similarity index 100% rename from regression/jbmc-strings/StringArray/Test.class rename to jbmc/regression/jbmc-strings/StringArray/Test.class diff --git a/regression/jbmc-strings/StringArray/Test.java b/jbmc/regression/jbmc-strings/StringArray/Test.java similarity index 100% rename from regression/jbmc-strings/StringArray/Test.java rename to jbmc/regression/jbmc-strings/StringArray/Test.java diff --git a/regression/jbmc-strings/StringArray/test.desc b/jbmc/regression/jbmc-strings/StringArray/test.desc similarity index 100% rename from regression/jbmc-strings/StringArray/test.desc rename to jbmc/regression/jbmc-strings/StringArray/test.desc diff --git a/regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.class b/jbmc/regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.class similarity index 100% rename from regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.class rename to jbmc/regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.class diff --git a/regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.java b/jbmc/regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.java similarity index 100% rename from regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.java rename to jbmc/regression/jbmc-strings/StringBuilderAppend01/StringBuilderAppend01.java diff --git a/regression/jbmc-strings/StringBuilderAppend01/test.desc b/jbmc/regression/jbmc-strings/StringBuilderAppend01/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderAppend01/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderAppend01/test.desc diff --git a/regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.class b/jbmc/regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.class similarity index 100% rename from regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.class rename to jbmc/regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.class diff --git a/regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.java b/jbmc/regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.java similarity index 100% rename from regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.java rename to jbmc/regression/jbmc-strings/StringBuilderAppend02/StringBuilderAppend02.java diff --git a/regression/jbmc-strings/StringBuilderAppend02/test.desc b/jbmc/regression/jbmc-strings/StringBuilderAppend02/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderAppend02/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderAppend02/test.desc diff --git a/regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.class b/jbmc/regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.class similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.class rename to jbmc/regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.class diff --git a/regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.java b/jbmc/regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.java similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.java rename to jbmc/regression/jbmc-strings/StringBuilderCapLen01/StringBuilderCapLen01.java diff --git a/regression/jbmc-strings/StringBuilderCapLen01/test.desc b/jbmc/regression/jbmc-strings/StringBuilderCapLen01/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen01/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderCapLen01/test.desc diff --git a/regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.class b/jbmc/regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.class similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.class rename to jbmc/regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.class diff --git a/regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.java b/jbmc/regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.java similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.java rename to jbmc/regression/jbmc-strings/StringBuilderCapLen02/StringBuilderCapLen02.java diff --git a/regression/jbmc-strings/StringBuilderCapLen02/test.desc b/jbmc/regression/jbmc-strings/StringBuilderCapLen02/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen02/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderCapLen02/test.desc diff --git a/regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.class b/jbmc/regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.class similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.class rename to jbmc/regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.class diff --git a/regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.java b/jbmc/regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.java similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.java rename to jbmc/regression/jbmc-strings/StringBuilderCapLen03/StringBuilderCapLen03.java diff --git a/regression/jbmc-strings/StringBuilderCapLen03/test.desc b/jbmc/regression/jbmc-strings/StringBuilderCapLen03/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen03/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderCapLen03/test.desc diff --git a/regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.class b/jbmc/regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.class similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.class rename to jbmc/regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.class diff --git a/regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.java b/jbmc/regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.java similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.java rename to jbmc/regression/jbmc-strings/StringBuilderCapLen04/StringBuilderCapLen04.java diff --git a/regression/jbmc-strings/StringBuilderCapLen04/test.desc b/jbmc/regression/jbmc-strings/StringBuilderCapLen04/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderCapLen04/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderCapLen04/test.desc diff --git a/regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.class b/jbmc/regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.class similarity index 100% rename from regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.class rename to jbmc/regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.class diff --git a/regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.java b/jbmc/regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.java similarity index 100% rename from regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.java rename to jbmc/regression/jbmc-strings/StringBuilderChars01/StringBuilderChars01.java diff --git a/regression/jbmc-strings/StringBuilderChars01/test.desc b/jbmc/regression/jbmc-strings/StringBuilderChars01/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderChars01/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderChars01/test.desc diff --git a/regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.class b/jbmc/regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.class similarity index 100% rename from regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.class rename to jbmc/regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.class diff --git a/regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.java b/jbmc/regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.java similarity index 100% rename from regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.java rename to jbmc/regression/jbmc-strings/StringBuilderChars02/StringBuilderChars02.java diff --git a/regression/jbmc-strings/StringBuilderChars02/test.desc b/jbmc/regression/jbmc-strings/StringBuilderChars02/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderChars02/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderChars02/test.desc diff --git a/regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.class b/jbmc/regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.class similarity index 100% rename from regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.class rename to jbmc/regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.class diff --git a/regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.java b/jbmc/regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.java similarity index 100% rename from regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.java rename to jbmc/regression/jbmc-strings/StringBuilderChars03/StringBuilderChars03.java diff --git a/regression/jbmc-strings/StringBuilderChars03/test.desc b/jbmc/regression/jbmc-strings/StringBuilderChars03/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderChars03/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderChars03/test.desc diff --git a/regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.class b/jbmc/regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.class similarity index 100% rename from regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.class rename to jbmc/regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.class diff --git a/regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.java b/jbmc/regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.java similarity index 100% rename from regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.java rename to jbmc/regression/jbmc-strings/StringBuilderChars04/StringBuilderChars04.java diff --git a/regression/jbmc-strings/StringBuilderChars04/test.desc b/jbmc/regression/jbmc-strings/StringBuilderChars04/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderChars04/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderChars04/test.desc diff --git a/regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.class b/jbmc/regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.class similarity index 100% rename from regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.class rename to jbmc/regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.class diff --git a/regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.java b/jbmc/regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.java similarity index 100% rename from regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.java rename to jbmc/regression/jbmc-strings/StringBuilderChars05/StringBuilderChars05.java diff --git a/regression/jbmc-strings/StringBuilderChars05/test.desc b/jbmc/regression/jbmc-strings/StringBuilderChars05/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderChars05/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderChars05/test.desc diff --git a/regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.class b/jbmc/regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.class similarity index 100% rename from regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.class rename to jbmc/regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.class diff --git a/regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.java b/jbmc/regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.java similarity index 100% rename from regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.java rename to jbmc/regression/jbmc-strings/StringBuilderChars06/StringBuilderChars06.java diff --git a/regression/jbmc-strings/StringBuilderChars06/test.desc b/jbmc/regression/jbmc-strings/StringBuilderChars06/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderChars06/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderChars06/test.desc diff --git a/regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.class b/jbmc/regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.class similarity index 100% rename from regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.class rename to jbmc/regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.class diff --git a/regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.java b/jbmc/regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.java similarity index 100% rename from regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.java rename to jbmc/regression/jbmc-strings/StringBuilderConstructors01/StringBuilderConstructors01.java diff --git a/regression/jbmc-strings/StringBuilderConstructors01/test.desc b/jbmc/regression/jbmc-strings/StringBuilderConstructors01/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderConstructors01/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderConstructors01/test.desc diff --git a/regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.class b/jbmc/regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.class similarity index 100% rename from regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.class rename to jbmc/regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.class diff --git a/regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.java b/jbmc/regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.java similarity index 100% rename from regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.java rename to jbmc/regression/jbmc-strings/StringBuilderConstructors02/StringBuilderConstructors02.java diff --git a/regression/jbmc-strings/StringBuilderConstructors02/test.desc b/jbmc/regression/jbmc-strings/StringBuilderConstructors02/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderConstructors02/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderConstructors02/test.desc diff --git a/regression/jbmc-strings/StringBuilderInsert/Test.class b/jbmc/regression/jbmc-strings/StringBuilderInsert/Test.class similarity index 100% rename from regression/jbmc-strings/StringBuilderInsert/Test.class rename to jbmc/regression/jbmc-strings/StringBuilderInsert/Test.class diff --git a/regression/jbmc-strings/StringBuilderInsert/Test.java b/jbmc/regression/jbmc-strings/StringBuilderInsert/Test.java similarity index 100% rename from regression/jbmc-strings/StringBuilderInsert/Test.java rename to jbmc/regression/jbmc-strings/StringBuilderInsert/Test.java diff --git a/regression/jbmc-strings/StringBuilderInsert/test.desc b/jbmc/regression/jbmc-strings/StringBuilderInsert/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderInsert/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderInsert/test.desc diff --git a/regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.class b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.class similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.class rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.class diff --git a/regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.java b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.java similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.java rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete01/StringBuilderInsertDelete01.java diff --git a/regression/jbmc-strings/StringBuilderInsertDelete01/test.desc b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete01/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete01/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete01/test.desc diff --git a/regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.class b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.class similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.class rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.class diff --git a/regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.java b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.java similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.java rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete02/StringBuilderInsertDelete02.java diff --git a/regression/jbmc-strings/StringBuilderInsertDelete02/test.desc b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete02/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete02/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete02/test.desc diff --git a/regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.class b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.class similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.class rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.class diff --git a/regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.java b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.java similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.java rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete03/StringBuilderInsertDelete03.java diff --git a/regression/jbmc-strings/StringBuilderInsertDelete03/test.desc b/jbmc/regression/jbmc-strings/StringBuilderInsertDelete03/test.desc similarity index 100% rename from regression/jbmc-strings/StringBuilderInsertDelete03/test.desc rename to jbmc/regression/jbmc-strings/StringBuilderInsertDelete03/test.desc diff --git a/regression/jbmc-strings/StringCompare01/StringCompare01.class b/jbmc/regression/jbmc-strings/StringCompare01/StringCompare01.class similarity index 100% rename from regression/jbmc-strings/StringCompare01/StringCompare01.class rename to jbmc/regression/jbmc-strings/StringCompare01/StringCompare01.class diff --git a/regression/jbmc-strings/StringCompare01/StringCompare01.java b/jbmc/regression/jbmc-strings/StringCompare01/StringCompare01.java similarity index 100% rename from regression/jbmc-strings/StringCompare01/StringCompare01.java rename to jbmc/regression/jbmc-strings/StringCompare01/StringCompare01.java diff --git a/regression/jbmc-strings/StringCompare01/test.desc b/jbmc/regression/jbmc-strings/StringCompare01/test.desc similarity index 100% rename from regression/jbmc-strings/StringCompare01/test.desc rename to jbmc/regression/jbmc-strings/StringCompare01/test.desc diff --git a/regression/jbmc-strings/StringCompare02/StringCompare02.class b/jbmc/regression/jbmc-strings/StringCompare02/StringCompare02.class similarity index 100% rename from regression/jbmc-strings/StringCompare02/StringCompare02.class rename to jbmc/regression/jbmc-strings/StringCompare02/StringCompare02.class diff --git a/regression/jbmc-strings/StringCompare02/StringCompare02.java b/jbmc/regression/jbmc-strings/StringCompare02/StringCompare02.java similarity index 100% rename from regression/jbmc-strings/StringCompare02/StringCompare02.java rename to jbmc/regression/jbmc-strings/StringCompare02/StringCompare02.java diff --git a/regression/jbmc-strings/StringCompare02/test.desc b/jbmc/regression/jbmc-strings/StringCompare02/test.desc similarity index 100% rename from regression/jbmc-strings/StringCompare02/test.desc rename to jbmc/regression/jbmc-strings/StringCompare02/test.desc diff --git a/regression/jbmc-strings/StringCompare03/StringCompare03.class b/jbmc/regression/jbmc-strings/StringCompare03/StringCompare03.class similarity index 100% rename from regression/jbmc-strings/StringCompare03/StringCompare03.class rename to jbmc/regression/jbmc-strings/StringCompare03/StringCompare03.class diff --git a/regression/jbmc-strings/StringCompare03/StringCompare03.java b/jbmc/regression/jbmc-strings/StringCompare03/StringCompare03.java similarity index 100% rename from regression/jbmc-strings/StringCompare03/StringCompare03.java rename to jbmc/regression/jbmc-strings/StringCompare03/StringCompare03.java diff --git a/regression/jbmc-strings/StringCompare03/test.desc b/jbmc/regression/jbmc-strings/StringCompare03/test.desc similarity index 100% rename from regression/jbmc-strings/StringCompare03/test.desc rename to jbmc/regression/jbmc-strings/StringCompare03/test.desc diff --git a/regression/jbmc-strings/StringCompare04/StringCompare04.class b/jbmc/regression/jbmc-strings/StringCompare04/StringCompare04.class similarity index 100% rename from regression/jbmc-strings/StringCompare04/StringCompare04.class rename to jbmc/regression/jbmc-strings/StringCompare04/StringCompare04.class diff --git a/regression/jbmc-strings/StringCompare04/StringCompare04.java b/jbmc/regression/jbmc-strings/StringCompare04/StringCompare04.java similarity index 100% rename from regression/jbmc-strings/StringCompare04/StringCompare04.java rename to jbmc/regression/jbmc-strings/StringCompare04/StringCompare04.java diff --git a/regression/jbmc-strings/StringCompare04/test.desc b/jbmc/regression/jbmc-strings/StringCompare04/test.desc similarity index 100% rename from regression/jbmc-strings/StringCompare04/test.desc rename to jbmc/regression/jbmc-strings/StringCompare04/test.desc diff --git a/regression/jbmc-strings/StringCompare05/StringCompare05.class b/jbmc/regression/jbmc-strings/StringCompare05/StringCompare05.class similarity index 100% rename from regression/jbmc-strings/StringCompare05/StringCompare05.class rename to jbmc/regression/jbmc-strings/StringCompare05/StringCompare05.class diff --git a/regression/jbmc-strings/StringCompare05/StringCompare05.java b/jbmc/regression/jbmc-strings/StringCompare05/StringCompare05.java similarity index 100% rename from regression/jbmc-strings/StringCompare05/StringCompare05.java rename to jbmc/regression/jbmc-strings/StringCompare05/StringCompare05.java diff --git a/regression/jbmc-strings/StringCompare05/test.desc b/jbmc/regression/jbmc-strings/StringCompare05/test.desc similarity index 100% rename from regression/jbmc-strings/StringCompare05/test.desc rename to jbmc/regression/jbmc-strings/StringCompare05/test.desc diff --git a/regression/jbmc-strings/StringConcat/Test.class b/jbmc/regression/jbmc-strings/StringConcat/Test.class similarity index 100% rename from regression/jbmc-strings/StringConcat/Test.class rename to jbmc/regression/jbmc-strings/StringConcat/Test.class diff --git a/regression/jbmc-strings/StringConcat/Test.java b/jbmc/regression/jbmc-strings/StringConcat/Test.java similarity index 100% rename from regression/jbmc-strings/StringConcat/Test.java rename to jbmc/regression/jbmc-strings/StringConcat/Test.java diff --git a/regression/jbmc-strings/StringConcat/test_buffer_det.desc b/jbmc/regression/jbmc-strings/StringConcat/test_buffer_det.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_buffer_det.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_buffer_det.desc diff --git a/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop.desc b/jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_buffer_nondet_loop.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop.desc diff --git a/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop2.desc b/jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop2.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_buffer_nondet_loop2.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop2.desc diff --git a/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop3.desc b/jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop3.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_buffer_nondet_loop3.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop3.desc diff --git a/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop4.desc b/jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop4.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_buffer_nondet_loop4.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop4.desc diff --git a/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop5.desc b/jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop5.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_buffer_nondet_loop5.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_buffer_nondet_loop5.desc diff --git a/regression/jbmc-strings/StringConcat/test_char_buffer_det.desc b/jbmc/regression/jbmc-strings/StringConcat/test_char_buffer_det.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_char_buffer_det.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_char_buffer_det.desc diff --git a/regression/jbmc-strings/StringConcat/test_char_buffer_det_loop.desc b/jbmc/regression/jbmc-strings/StringConcat/test_char_buffer_det_loop.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_char_buffer_det_loop.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_char_buffer_det_loop.desc diff --git a/regression/jbmc-strings/StringConcat/test_char_buffer_det_loop2.desc b/jbmc/regression/jbmc-strings/StringConcat/test_char_buffer_det_loop2.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_char_buffer_det_loop2.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_char_buffer_det_loop2.desc diff --git a/regression/jbmc-strings/StringConcat/test_string_det.desc b/jbmc/regression/jbmc-strings/StringConcat/test_string_det.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_string_det.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_string_det.desc diff --git a/regression/jbmc-strings/StringConcat/test_string_nondet.desc b/jbmc/regression/jbmc-strings/StringConcat/test_string_nondet.desc similarity index 100% rename from regression/jbmc-strings/StringConcat/test_string_nondet.desc rename to jbmc/regression/jbmc-strings/StringConcat/test_string_nondet.desc diff --git a/regression/jbmc-strings/StringConcat_StringII/Test.class b/jbmc/regression/jbmc-strings/StringConcat_StringII/Test.class similarity index 100% rename from regression/jbmc-strings/StringConcat_StringII/Test.class rename to jbmc/regression/jbmc-strings/StringConcat_StringII/Test.class diff --git a/regression/jbmc-strings/StringConcat_StringII/Test.java b/jbmc/regression/jbmc-strings/StringConcat_StringII/Test.java similarity index 100% rename from regression/jbmc-strings/StringConcat_StringII/Test.java rename to jbmc/regression/jbmc-strings/StringConcat_StringII/Test.java diff --git a/regression/jbmc-strings/StringConcat_StringII/test.desc b/jbmc/regression/jbmc-strings/StringConcat_StringII/test.desc similarity index 100% rename from regression/jbmc-strings/StringConcat_StringII/test.desc rename to jbmc/regression/jbmc-strings/StringConcat_StringII/test.desc diff --git a/regression/jbmc-strings/StringConcat_StringII/test_fail.desc b/jbmc/regression/jbmc-strings/StringConcat_StringII/test_fail.desc similarity index 100% rename from regression/jbmc-strings/StringConcat_StringII/test_fail.desc rename to jbmc/regression/jbmc-strings/StringConcat_StringII/test_fail.desc diff --git a/regression/jbmc-strings/StringConcatenation01/StringConcatenation01.class b/jbmc/regression/jbmc-strings/StringConcatenation01/StringConcatenation01.class similarity index 100% rename from regression/jbmc-strings/StringConcatenation01/StringConcatenation01.class rename to jbmc/regression/jbmc-strings/StringConcatenation01/StringConcatenation01.class diff --git a/regression/jbmc-strings/StringConcatenation01/StringConcatenation01.java b/jbmc/regression/jbmc-strings/StringConcatenation01/StringConcatenation01.java similarity index 100% rename from regression/jbmc-strings/StringConcatenation01/StringConcatenation01.java rename to jbmc/regression/jbmc-strings/StringConcatenation01/StringConcatenation01.java diff --git a/regression/jbmc-strings/StringConcatenation01/test.desc b/jbmc/regression/jbmc-strings/StringConcatenation01/test.desc similarity index 100% rename from regression/jbmc-strings/StringConcatenation01/test.desc rename to jbmc/regression/jbmc-strings/StringConcatenation01/test.desc diff --git a/regression/jbmc-strings/StringConcatenation02/StringConcatenation02.class b/jbmc/regression/jbmc-strings/StringConcatenation02/StringConcatenation02.class similarity index 100% rename from regression/jbmc-strings/StringConcatenation02/StringConcatenation02.class rename to jbmc/regression/jbmc-strings/StringConcatenation02/StringConcatenation02.class diff --git a/regression/jbmc-strings/StringConcatenation02/StringConcatenation02.java b/jbmc/regression/jbmc-strings/StringConcatenation02/StringConcatenation02.java similarity index 100% rename from regression/jbmc-strings/StringConcatenation02/StringConcatenation02.java rename to jbmc/regression/jbmc-strings/StringConcatenation02/StringConcatenation02.java diff --git a/regression/jbmc-strings/StringConcatenation02/test.desc b/jbmc/regression/jbmc-strings/StringConcatenation02/test.desc similarity index 100% rename from regression/jbmc-strings/StringConcatenation02/test.desc rename to jbmc/regression/jbmc-strings/StringConcatenation02/test.desc diff --git a/regression/jbmc-strings/StringConcatenation03/StringConcatenation03.class b/jbmc/regression/jbmc-strings/StringConcatenation03/StringConcatenation03.class similarity index 100% rename from regression/jbmc-strings/StringConcatenation03/StringConcatenation03.class rename to jbmc/regression/jbmc-strings/StringConcatenation03/StringConcatenation03.class diff --git a/regression/jbmc-strings/StringConcatenation03/StringConcatenation03.java b/jbmc/regression/jbmc-strings/StringConcatenation03/StringConcatenation03.java similarity index 100% rename from regression/jbmc-strings/StringConcatenation03/StringConcatenation03.java rename to jbmc/regression/jbmc-strings/StringConcatenation03/StringConcatenation03.java diff --git a/regression/jbmc-strings/StringConcatenation03/test.desc b/jbmc/regression/jbmc-strings/StringConcatenation03/test.desc similarity index 100% rename from regression/jbmc-strings/StringConcatenation03/test.desc rename to jbmc/regression/jbmc-strings/StringConcatenation03/test.desc diff --git a/regression/jbmc-strings/StringConcatenation04/StringConcatenation04.class b/jbmc/regression/jbmc-strings/StringConcatenation04/StringConcatenation04.class similarity index 100% rename from regression/jbmc-strings/StringConcatenation04/StringConcatenation04.class rename to jbmc/regression/jbmc-strings/StringConcatenation04/StringConcatenation04.class diff --git a/regression/jbmc-strings/StringConcatenation04/StringConcatenation04.java b/jbmc/regression/jbmc-strings/StringConcatenation04/StringConcatenation04.java similarity index 100% rename from regression/jbmc-strings/StringConcatenation04/StringConcatenation04.java rename to jbmc/regression/jbmc-strings/StringConcatenation04/StringConcatenation04.java diff --git a/regression/jbmc-strings/StringConcatenation04/test.desc b/jbmc/regression/jbmc-strings/StringConcatenation04/test.desc similarity index 100% rename from regression/jbmc-strings/StringConcatenation04/test.desc rename to jbmc/regression/jbmc-strings/StringConcatenation04/test.desc diff --git a/regression/jbmc-strings/StringConstructors01/StringConstructors01.class b/jbmc/regression/jbmc-strings/StringConstructors01/StringConstructors01.class similarity index 100% rename from regression/jbmc-strings/StringConstructors01/StringConstructors01.class rename to jbmc/regression/jbmc-strings/StringConstructors01/StringConstructors01.class diff --git a/regression/jbmc-strings/StringConstructors01/StringConstructors01.java b/jbmc/regression/jbmc-strings/StringConstructors01/StringConstructors01.java similarity index 100% rename from regression/jbmc-strings/StringConstructors01/StringConstructors01.java rename to jbmc/regression/jbmc-strings/StringConstructors01/StringConstructors01.java diff --git a/regression/jbmc-strings/StringConstructors01/test.desc b/jbmc/regression/jbmc-strings/StringConstructors01/test.desc similarity index 100% rename from regression/jbmc-strings/StringConstructors01/test.desc rename to jbmc/regression/jbmc-strings/StringConstructors01/test.desc diff --git a/regression/jbmc-strings/StringConstructors02/StringConstructors02.class b/jbmc/regression/jbmc-strings/StringConstructors02/StringConstructors02.class similarity index 100% rename from regression/jbmc-strings/StringConstructors02/StringConstructors02.class rename to jbmc/regression/jbmc-strings/StringConstructors02/StringConstructors02.class diff --git a/regression/jbmc-strings/StringConstructors02/StringConstructors02.java b/jbmc/regression/jbmc-strings/StringConstructors02/StringConstructors02.java similarity index 100% rename from regression/jbmc-strings/StringConstructors02/StringConstructors02.java rename to jbmc/regression/jbmc-strings/StringConstructors02/StringConstructors02.java diff --git a/regression/jbmc-strings/StringConstructors02/test.desc b/jbmc/regression/jbmc-strings/StringConstructors02/test.desc similarity index 100% rename from regression/jbmc-strings/StringConstructors02/test.desc rename to jbmc/regression/jbmc-strings/StringConstructors02/test.desc diff --git a/regression/jbmc-strings/StringConstructors03/StringConstructors03.class b/jbmc/regression/jbmc-strings/StringConstructors03/StringConstructors03.class similarity index 100% rename from regression/jbmc-strings/StringConstructors03/StringConstructors03.class rename to jbmc/regression/jbmc-strings/StringConstructors03/StringConstructors03.class diff --git a/regression/jbmc-strings/StringConstructors03/StringConstructors03.java b/jbmc/regression/jbmc-strings/StringConstructors03/StringConstructors03.java similarity index 100% rename from regression/jbmc-strings/StringConstructors03/StringConstructors03.java rename to jbmc/regression/jbmc-strings/StringConstructors03/StringConstructors03.java diff --git a/regression/jbmc-strings/StringConstructors03/test.desc b/jbmc/regression/jbmc-strings/StringConstructors03/test.desc similarity index 100% rename from regression/jbmc-strings/StringConstructors03/test.desc rename to jbmc/regression/jbmc-strings/StringConstructors03/test.desc diff --git a/regression/jbmc-strings/StringConstructors04/StringConstructors04.class b/jbmc/regression/jbmc-strings/StringConstructors04/StringConstructors04.class similarity index 100% rename from regression/jbmc-strings/StringConstructors04/StringConstructors04.class rename to jbmc/regression/jbmc-strings/StringConstructors04/StringConstructors04.class diff --git a/regression/jbmc-strings/StringConstructors04/StringConstructors04.java b/jbmc/regression/jbmc-strings/StringConstructors04/StringConstructors04.java similarity index 100% rename from regression/jbmc-strings/StringConstructors04/StringConstructors04.java rename to jbmc/regression/jbmc-strings/StringConstructors04/StringConstructors04.java diff --git a/regression/jbmc-strings/StringConstructors04/test.desc b/jbmc/regression/jbmc-strings/StringConstructors04/test.desc similarity index 100% rename from regression/jbmc-strings/StringConstructors04/test.desc rename to jbmc/regression/jbmc-strings/StringConstructors04/test.desc diff --git a/regression/jbmc-strings/StringConstructors05/StringConstructors05.class b/jbmc/regression/jbmc-strings/StringConstructors05/StringConstructors05.class similarity index 100% rename from regression/jbmc-strings/StringConstructors05/StringConstructors05.class rename to jbmc/regression/jbmc-strings/StringConstructors05/StringConstructors05.class diff --git a/regression/jbmc-strings/StringConstructors05/StringConstructors05.java b/jbmc/regression/jbmc-strings/StringConstructors05/StringConstructors05.java similarity index 100% rename from regression/jbmc-strings/StringConstructors05/StringConstructors05.java rename to jbmc/regression/jbmc-strings/StringConstructors05/StringConstructors05.java diff --git a/regression/jbmc-strings/StringConstructors05/test.desc b/jbmc/regression/jbmc-strings/StringConstructors05/test.desc similarity index 100% rename from regression/jbmc-strings/StringConstructors05/test.desc rename to jbmc/regression/jbmc-strings/StringConstructors05/test.desc diff --git a/regression/jbmc-strings/StringContains01/test.class b/jbmc/regression/jbmc-strings/StringContains01/test.class similarity index 100% rename from regression/jbmc-strings/StringContains01/test.class rename to jbmc/regression/jbmc-strings/StringContains01/test.class diff --git a/regression/jbmc-strings/StringContains01/test.desc b/jbmc/regression/jbmc-strings/StringContains01/test.desc similarity index 100% rename from regression/jbmc-strings/StringContains01/test.desc rename to jbmc/regression/jbmc-strings/StringContains01/test.desc diff --git a/regression/jbmc-strings/StringContains01/test.java b/jbmc/regression/jbmc-strings/StringContains01/test.java similarity index 100% rename from regression/jbmc-strings/StringContains01/test.java rename to jbmc/regression/jbmc-strings/StringContains01/test.java diff --git a/regression/jbmc-strings/StringContains02/test.class b/jbmc/regression/jbmc-strings/StringContains02/test.class similarity index 100% rename from regression/jbmc-strings/StringContains02/test.class rename to jbmc/regression/jbmc-strings/StringContains02/test.class diff --git a/regression/jbmc-strings/StringContains02/test.desc b/jbmc/regression/jbmc-strings/StringContains02/test.desc similarity index 100% rename from regression/jbmc-strings/StringContains02/test.desc rename to jbmc/regression/jbmc-strings/StringContains02/test.desc diff --git a/regression/jbmc-strings/StringContains02/test.java b/jbmc/regression/jbmc-strings/StringContains02/test.java similarity index 100% rename from regression/jbmc-strings/StringContains02/test.java rename to jbmc/regression/jbmc-strings/StringContains02/test.java diff --git a/regression/jbmc-strings/StringDependencies/Test.class b/jbmc/regression/jbmc-strings/StringDependencies/Test.class similarity index 100% rename from regression/jbmc-strings/StringDependencies/Test.class rename to jbmc/regression/jbmc-strings/StringDependencies/Test.class diff --git a/regression/jbmc-strings/StringDependencies/Test.java b/jbmc/regression/jbmc-strings/StringDependencies/Test.java similarity index 100% rename from regression/jbmc-strings/StringDependencies/Test.java rename to jbmc/regression/jbmc-strings/StringDependencies/Test.java diff --git a/regression/jbmc-strings/StringDependencies/test.desc b/jbmc/regression/jbmc-strings/StringDependencies/test.desc similarity index 100% rename from regression/jbmc-strings/StringDependencies/test.desc rename to jbmc/regression/jbmc-strings/StringDependencies/test.desc diff --git a/regression/jbmc-strings/StringEquals/Test.class b/jbmc/regression/jbmc-strings/StringEquals/Test.class similarity index 100% rename from regression/jbmc-strings/StringEquals/Test.class rename to jbmc/regression/jbmc-strings/StringEquals/Test.class diff --git a/regression/jbmc-strings/StringEquals/Test.java b/jbmc/regression/jbmc-strings/StringEquals/Test.java similarity index 100% rename from regression/jbmc-strings/StringEquals/Test.java rename to jbmc/regression/jbmc-strings/StringEquals/Test.java diff --git a/regression/jbmc-strings/StringEquals/test.desc b/jbmc/regression/jbmc-strings/StringEquals/test.desc similarity index 100% rename from regression/jbmc-strings/StringEquals/test.desc rename to jbmc/regression/jbmc-strings/StringEquals/test.desc diff --git a/regression/jbmc-strings/StringEquals/test_verify.desc b/jbmc/regression/jbmc-strings/StringEquals/test_verify.desc similarity index 100% rename from regression/jbmc-strings/StringEquals/test_verify.desc rename to jbmc/regression/jbmc-strings/StringEquals/test_verify.desc diff --git a/regression/jbmc-strings/StringEquals/test_verify_non_null.desc b/jbmc/regression/jbmc-strings/StringEquals/test_verify_non_null.desc similarity index 100% rename from regression/jbmc-strings/StringEquals/test_verify_non_null.desc rename to jbmc/regression/jbmc-strings/StringEquals/test_verify_non_null.desc diff --git a/regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.class b/jbmc/regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.class similarity index 100% rename from regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.class rename to jbmc/regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.class diff --git a/regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.java b/jbmc/regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.java similarity index 100% rename from regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.java rename to jbmc/regression/jbmc-strings/StringIndexMethods01/StringIndexMethods01.java diff --git a/regression/jbmc-strings/StringIndexMethods01/test.desc b/jbmc/regression/jbmc-strings/StringIndexMethods01/test.desc similarity index 100% rename from regression/jbmc-strings/StringIndexMethods01/test.desc rename to jbmc/regression/jbmc-strings/StringIndexMethods01/test.desc diff --git a/regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.class b/jbmc/regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.class similarity index 100% rename from regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.class rename to jbmc/regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.class diff --git a/regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.java b/jbmc/regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.java similarity index 100% rename from regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.java rename to jbmc/regression/jbmc-strings/StringIndexMethods02/StringIndexMethods02.java diff --git a/regression/jbmc-strings/StringIndexMethods02/test.desc b/jbmc/regression/jbmc-strings/StringIndexMethods02/test.desc similarity index 100% rename from regression/jbmc-strings/StringIndexMethods02/test.desc rename to jbmc/regression/jbmc-strings/StringIndexMethods02/test.desc diff --git a/regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.class b/jbmc/regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.class similarity index 100% rename from regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.class rename to jbmc/regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.class diff --git a/regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.java b/jbmc/regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.java similarity index 100% rename from regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.java rename to jbmc/regression/jbmc-strings/StringIndexMethods03/StringIndexMethods03.java diff --git a/regression/jbmc-strings/StringIndexMethods03/test.desc b/jbmc/regression/jbmc-strings/StringIndexMethods03/test.desc similarity index 100% rename from regression/jbmc-strings/StringIndexMethods03/test.desc rename to jbmc/regression/jbmc-strings/StringIndexMethods03/test.desc diff --git a/regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.class b/jbmc/regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.class similarity index 100% rename from regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.class rename to jbmc/regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.class diff --git a/regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.java b/jbmc/regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.java similarity index 100% rename from regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.java rename to jbmc/regression/jbmc-strings/StringIndexMethods04/StringIndexMethods04.java diff --git a/regression/jbmc-strings/StringIndexMethods04/test.desc b/jbmc/regression/jbmc-strings/StringIndexMethods04/test.desc similarity index 100% rename from regression/jbmc-strings/StringIndexMethods04/test.desc rename to jbmc/regression/jbmc-strings/StringIndexMethods04/test.desc diff --git a/regression/jbmc-strings/StringIndexMethods04/test_bug.desc b/jbmc/regression/jbmc-strings/StringIndexMethods04/test_bug.desc similarity index 100% rename from regression/jbmc-strings/StringIndexMethods04/test_bug.desc rename to jbmc/regression/jbmc-strings/StringIndexMethods04/test_bug.desc diff --git a/regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.class b/jbmc/regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.class similarity index 100% rename from regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.class rename to jbmc/regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.class diff --git a/regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.java b/jbmc/regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.java similarity index 100% rename from regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.java rename to jbmc/regression/jbmc-strings/StringIndexMethods05/StringIndexMethods05.java diff --git a/regression/jbmc-strings/StringIndexMethods05/test.desc b/jbmc/regression/jbmc-strings/StringIndexMethods05/test.desc similarity index 100% rename from regression/jbmc-strings/StringIndexMethods05/test.desc rename to jbmc/regression/jbmc-strings/StringIndexMethods05/test.desc diff --git a/regression/jbmc-strings/StringIndexOf/Test.class b/jbmc/regression/jbmc-strings/StringIndexOf/Test.class similarity index 100% rename from regression/jbmc-strings/StringIndexOf/Test.class rename to jbmc/regression/jbmc-strings/StringIndexOf/Test.class diff --git a/regression/jbmc-strings/StringIndexOf/Test.java b/jbmc/regression/jbmc-strings/StringIndexOf/Test.java similarity index 100% rename from regression/jbmc-strings/StringIndexOf/Test.java rename to jbmc/regression/jbmc-strings/StringIndexOf/Test.java diff --git a/regression/jbmc-strings/StringIndexOf/test.desc b/jbmc/regression/jbmc-strings/StringIndexOf/test.desc similarity index 100% rename from regression/jbmc-strings/StringIndexOf/test.desc rename to jbmc/regression/jbmc-strings/StringIndexOf/test.desc diff --git a/regression/jbmc-strings/StringIndexOf/test2.desc b/jbmc/regression/jbmc-strings/StringIndexOf/test2.desc similarity index 100% rename from regression/jbmc-strings/StringIndexOf/test2.desc rename to jbmc/regression/jbmc-strings/StringIndexOf/test2.desc diff --git a/regression/jbmc-strings/StringIndexOf/test_thorough.desc b/jbmc/regression/jbmc-strings/StringIndexOf/test_thorough.desc similarity index 100% rename from regression/jbmc-strings/StringIndexOf/test_thorough.desc rename to jbmc/regression/jbmc-strings/StringIndexOf/test_thorough.desc diff --git a/regression/jbmc-strings/StringLastIndexOf/Test.class b/jbmc/regression/jbmc-strings/StringLastIndexOf/Test.class similarity index 100% rename from regression/jbmc-strings/StringLastIndexOf/Test.class rename to jbmc/regression/jbmc-strings/StringLastIndexOf/Test.class diff --git a/regression/jbmc-strings/StringLastIndexOf/Test.java b/jbmc/regression/jbmc-strings/StringLastIndexOf/Test.java similarity index 100% rename from regression/jbmc-strings/StringLastIndexOf/Test.java rename to jbmc/regression/jbmc-strings/StringLastIndexOf/Test.java diff --git a/regression/jbmc-strings/StringLastIndexOf/test.desc b/jbmc/regression/jbmc-strings/StringLastIndexOf/test.desc similarity index 100% rename from regression/jbmc-strings/StringLastIndexOf/test.desc rename to jbmc/regression/jbmc-strings/StringLastIndexOf/test.desc diff --git a/regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.class b/jbmc/regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.class similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.class rename to jbmc/regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.class diff --git a/regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.java b/jbmc/regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.java similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.java rename to jbmc/regression/jbmc-strings/StringMiscellaneous01/StringMiscellaneous01.java diff --git a/regression/jbmc-strings/StringMiscellaneous01/test.desc b/jbmc/regression/jbmc-strings/StringMiscellaneous01/test.desc similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous01/test.desc rename to jbmc/regression/jbmc-strings/StringMiscellaneous01/test.desc diff --git a/regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.class b/jbmc/regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.class similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.class rename to jbmc/regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.class diff --git a/regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.java b/jbmc/regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.java similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.java rename to jbmc/regression/jbmc-strings/StringMiscellaneous02/StringMiscellaneous02.java diff --git a/regression/jbmc-strings/StringMiscellaneous02/test.desc b/jbmc/regression/jbmc-strings/StringMiscellaneous02/test.desc similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous02/test.desc rename to jbmc/regression/jbmc-strings/StringMiscellaneous02/test.desc diff --git a/regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.class b/jbmc/regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.class similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.class rename to jbmc/regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.class diff --git a/regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.java b/jbmc/regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.java similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.java rename to jbmc/regression/jbmc-strings/StringMiscellaneous03/StringMiscellaneous03.java diff --git a/regression/jbmc-strings/StringMiscellaneous03/test.desc b/jbmc/regression/jbmc-strings/StringMiscellaneous03/test.desc similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous03/test.desc rename to jbmc/regression/jbmc-strings/StringMiscellaneous03/test.desc diff --git a/regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.class b/jbmc/regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.class similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.class rename to jbmc/regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.class diff --git a/regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.java b/jbmc/regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.java similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.java rename to jbmc/regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.java diff --git a/regression/jbmc-strings/StringMiscellaneous04/test.desc b/jbmc/regression/jbmc-strings/StringMiscellaneous04/test.desc similarity index 100% rename from regression/jbmc-strings/StringMiscellaneous04/test.desc rename to jbmc/regression/jbmc-strings/StringMiscellaneous04/test.desc diff --git a/regression/jbmc-strings/StringStartEnd01/StringStartEnd01.class b/jbmc/regression/jbmc-strings/StringStartEnd01/StringStartEnd01.class similarity index 100% rename from regression/jbmc-strings/StringStartEnd01/StringStartEnd01.class rename to jbmc/regression/jbmc-strings/StringStartEnd01/StringStartEnd01.class diff --git a/regression/jbmc-strings/StringStartEnd01/StringStartEnd01.java b/jbmc/regression/jbmc-strings/StringStartEnd01/StringStartEnd01.java similarity index 100% rename from regression/jbmc-strings/StringStartEnd01/StringStartEnd01.java rename to jbmc/regression/jbmc-strings/StringStartEnd01/StringStartEnd01.java diff --git a/regression/jbmc-strings/StringStartEnd01/test.desc b/jbmc/regression/jbmc-strings/StringStartEnd01/test.desc similarity index 100% rename from regression/jbmc-strings/StringStartEnd01/test.desc rename to jbmc/regression/jbmc-strings/StringStartEnd01/test.desc diff --git a/regression/jbmc-strings/StringStartEnd02/StringStartEnd02.class b/jbmc/regression/jbmc-strings/StringStartEnd02/StringStartEnd02.class similarity index 100% rename from regression/jbmc-strings/StringStartEnd02/StringStartEnd02.class rename to jbmc/regression/jbmc-strings/StringStartEnd02/StringStartEnd02.class diff --git a/regression/jbmc-strings/StringStartEnd02/StringStartEnd02.java b/jbmc/regression/jbmc-strings/StringStartEnd02/StringStartEnd02.java similarity index 100% rename from regression/jbmc-strings/StringStartEnd02/StringStartEnd02.java rename to jbmc/regression/jbmc-strings/StringStartEnd02/StringStartEnd02.java diff --git a/regression/jbmc-strings/StringStartEnd02/test.desc b/jbmc/regression/jbmc-strings/StringStartEnd02/test.desc similarity index 100% rename from regression/jbmc-strings/StringStartEnd02/test.desc rename to jbmc/regression/jbmc-strings/StringStartEnd02/test.desc diff --git a/regression/jbmc-strings/StringStartEnd03/StringStartEnd03.class b/jbmc/regression/jbmc-strings/StringStartEnd03/StringStartEnd03.class similarity index 100% rename from regression/jbmc-strings/StringStartEnd03/StringStartEnd03.class rename to jbmc/regression/jbmc-strings/StringStartEnd03/StringStartEnd03.class diff --git a/regression/jbmc-strings/StringStartEnd03/StringStartEnd03.java b/jbmc/regression/jbmc-strings/StringStartEnd03/StringStartEnd03.java similarity index 100% rename from regression/jbmc-strings/StringStartEnd03/StringStartEnd03.java rename to jbmc/regression/jbmc-strings/StringStartEnd03/StringStartEnd03.java diff --git a/regression/jbmc-strings/StringStartEnd03/test.desc b/jbmc/regression/jbmc-strings/StringStartEnd03/test.desc similarity index 100% rename from regression/jbmc-strings/StringStartEnd03/test.desc rename to jbmc/regression/jbmc-strings/StringStartEnd03/test.desc diff --git a/regression/jbmc-strings/StringSubstring/Test.class b/jbmc/regression/jbmc-strings/StringSubstring/Test.class similarity index 100% rename from regression/jbmc-strings/StringSubstring/Test.class rename to jbmc/regression/jbmc-strings/StringSubstring/Test.class diff --git a/regression/jbmc-strings/StringSubstring/Test.java b/jbmc/regression/jbmc-strings/StringSubstring/Test.java similarity index 100% rename from regression/jbmc-strings/StringSubstring/Test.java rename to jbmc/regression/jbmc-strings/StringSubstring/Test.java diff --git a/regression/jbmc-strings/StringSubstring/test.desc b/jbmc/regression/jbmc-strings/StringSubstring/test.desc similarity index 100% rename from regression/jbmc-strings/StringSubstring/test.desc rename to jbmc/regression/jbmc-strings/StringSubstring/test.desc diff --git a/regression/jbmc-strings/StringSubstring/test_fail.desc b/jbmc/regression/jbmc-strings/StringSubstring/test_fail.desc similarity index 100% rename from regression/jbmc-strings/StringSubstring/test_fail.desc rename to jbmc/regression/jbmc-strings/StringSubstring/test_fail.desc diff --git a/regression/jbmc-strings/StringValueOf01/StringValueOf01.class b/jbmc/regression/jbmc-strings/StringValueOf01/StringValueOf01.class similarity index 100% rename from regression/jbmc-strings/StringValueOf01/StringValueOf01.class rename to jbmc/regression/jbmc-strings/StringValueOf01/StringValueOf01.class diff --git a/regression/jbmc-strings/StringValueOf01/StringValueOf01.java b/jbmc/regression/jbmc-strings/StringValueOf01/StringValueOf01.java similarity index 100% rename from regression/jbmc-strings/StringValueOf01/StringValueOf01.java rename to jbmc/regression/jbmc-strings/StringValueOf01/StringValueOf01.java diff --git a/regression/jbmc-strings/StringValueOf01/test.desc b/jbmc/regression/jbmc-strings/StringValueOf01/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf01/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf01/test.desc diff --git a/regression/jbmc-strings/StringValueOf02/StringValueOf02.class b/jbmc/regression/jbmc-strings/StringValueOf02/StringValueOf02.class similarity index 100% rename from regression/jbmc-strings/StringValueOf02/StringValueOf02.class rename to jbmc/regression/jbmc-strings/StringValueOf02/StringValueOf02.class diff --git a/regression/jbmc-strings/StringValueOf02/StringValueOf02.java b/jbmc/regression/jbmc-strings/StringValueOf02/StringValueOf02.java similarity index 100% rename from regression/jbmc-strings/StringValueOf02/StringValueOf02.java rename to jbmc/regression/jbmc-strings/StringValueOf02/StringValueOf02.java diff --git a/regression/jbmc-strings/StringValueOf02/test.desc b/jbmc/regression/jbmc-strings/StringValueOf02/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf02/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf02/test.desc diff --git a/regression/jbmc-strings/StringValueOf03/StringValueOf03.class b/jbmc/regression/jbmc-strings/StringValueOf03/StringValueOf03.class similarity index 100% rename from regression/jbmc-strings/StringValueOf03/StringValueOf03.class rename to jbmc/regression/jbmc-strings/StringValueOf03/StringValueOf03.class diff --git a/regression/jbmc-strings/StringValueOf03/StringValueOf03.java b/jbmc/regression/jbmc-strings/StringValueOf03/StringValueOf03.java similarity index 100% rename from regression/jbmc-strings/StringValueOf03/StringValueOf03.java rename to jbmc/regression/jbmc-strings/StringValueOf03/StringValueOf03.java diff --git a/regression/jbmc-strings/StringValueOf03/test.desc b/jbmc/regression/jbmc-strings/StringValueOf03/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf03/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf03/test.desc diff --git a/regression/jbmc-strings/StringValueOf04/StringValueOf04.class b/jbmc/regression/jbmc-strings/StringValueOf04/StringValueOf04.class similarity index 100% rename from regression/jbmc-strings/StringValueOf04/StringValueOf04.class rename to jbmc/regression/jbmc-strings/StringValueOf04/StringValueOf04.class diff --git a/regression/jbmc-strings/StringValueOf04/StringValueOf04.java b/jbmc/regression/jbmc-strings/StringValueOf04/StringValueOf04.java similarity index 100% rename from regression/jbmc-strings/StringValueOf04/StringValueOf04.java rename to jbmc/regression/jbmc-strings/StringValueOf04/StringValueOf04.java diff --git a/regression/jbmc-strings/StringValueOf04/test.desc b/jbmc/regression/jbmc-strings/StringValueOf04/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf04/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf04/test.desc diff --git a/regression/jbmc-strings/StringValueOf05/StringValueOf05.class b/jbmc/regression/jbmc-strings/StringValueOf05/StringValueOf05.class similarity index 100% rename from regression/jbmc-strings/StringValueOf05/StringValueOf05.class rename to jbmc/regression/jbmc-strings/StringValueOf05/StringValueOf05.class diff --git a/regression/jbmc-strings/StringValueOf05/StringValueOf05.java b/jbmc/regression/jbmc-strings/StringValueOf05/StringValueOf05.java similarity index 100% rename from regression/jbmc-strings/StringValueOf05/StringValueOf05.java rename to jbmc/regression/jbmc-strings/StringValueOf05/StringValueOf05.java diff --git a/regression/jbmc-strings/StringValueOf05/test.desc b/jbmc/regression/jbmc-strings/StringValueOf05/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf05/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf05/test.desc diff --git a/regression/jbmc-strings/StringValueOf06/StringValueOf06.class b/jbmc/regression/jbmc-strings/StringValueOf06/StringValueOf06.class similarity index 100% rename from regression/jbmc-strings/StringValueOf06/StringValueOf06.class rename to jbmc/regression/jbmc-strings/StringValueOf06/StringValueOf06.class diff --git a/regression/jbmc-strings/StringValueOf06/StringValueOf06.java b/jbmc/regression/jbmc-strings/StringValueOf06/StringValueOf06.java similarity index 100% rename from regression/jbmc-strings/StringValueOf06/StringValueOf06.java rename to jbmc/regression/jbmc-strings/StringValueOf06/StringValueOf06.java diff --git a/regression/jbmc-strings/StringValueOf06/test.desc b/jbmc/regression/jbmc-strings/StringValueOf06/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf06/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf06/test.desc diff --git a/regression/jbmc-strings/StringValueOf07/StringValueOf07.class b/jbmc/regression/jbmc-strings/StringValueOf07/StringValueOf07.class similarity index 100% rename from regression/jbmc-strings/StringValueOf07/StringValueOf07.class rename to jbmc/regression/jbmc-strings/StringValueOf07/StringValueOf07.class diff --git a/regression/jbmc-strings/StringValueOf07/StringValueOf07.java b/jbmc/regression/jbmc-strings/StringValueOf07/StringValueOf07.java similarity index 100% rename from regression/jbmc-strings/StringValueOf07/StringValueOf07.java rename to jbmc/regression/jbmc-strings/StringValueOf07/StringValueOf07.java diff --git a/regression/jbmc-strings/StringValueOf07/test.desc b/jbmc/regression/jbmc-strings/StringValueOf07/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf07/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf07/test.desc diff --git a/regression/jbmc-strings/StringValueOf08/StringValueOf08.class b/jbmc/regression/jbmc-strings/StringValueOf08/StringValueOf08.class similarity index 100% rename from regression/jbmc-strings/StringValueOf08/StringValueOf08.class rename to jbmc/regression/jbmc-strings/StringValueOf08/StringValueOf08.class diff --git a/regression/jbmc-strings/StringValueOf08/StringValueOf08.java b/jbmc/regression/jbmc-strings/StringValueOf08/StringValueOf08.java similarity index 100% rename from regression/jbmc-strings/StringValueOf08/StringValueOf08.java rename to jbmc/regression/jbmc-strings/StringValueOf08/StringValueOf08.java diff --git a/regression/jbmc-strings/StringValueOf08/test.desc b/jbmc/regression/jbmc-strings/StringValueOf08/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf08/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf08/test.desc diff --git a/regression/jbmc-strings/StringValueOf09/StringValueOf09.class b/jbmc/regression/jbmc-strings/StringValueOf09/StringValueOf09.class similarity index 100% rename from regression/jbmc-strings/StringValueOf09/StringValueOf09.class rename to jbmc/regression/jbmc-strings/StringValueOf09/StringValueOf09.class diff --git a/regression/jbmc-strings/StringValueOf09/StringValueOf09.java b/jbmc/regression/jbmc-strings/StringValueOf09/StringValueOf09.java similarity index 100% rename from regression/jbmc-strings/StringValueOf09/StringValueOf09.java rename to jbmc/regression/jbmc-strings/StringValueOf09/StringValueOf09.java diff --git a/regression/jbmc-strings/StringValueOf09/test.desc b/jbmc/regression/jbmc-strings/StringValueOf09/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf09/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf09/test.desc diff --git a/regression/jbmc-strings/StringValueOf10/StringValueOf10.class b/jbmc/regression/jbmc-strings/StringValueOf10/StringValueOf10.class similarity index 100% rename from regression/jbmc-strings/StringValueOf10/StringValueOf10.class rename to jbmc/regression/jbmc-strings/StringValueOf10/StringValueOf10.class diff --git a/regression/jbmc-strings/StringValueOf10/StringValueOf10.java b/jbmc/regression/jbmc-strings/StringValueOf10/StringValueOf10.java similarity index 100% rename from regression/jbmc-strings/StringValueOf10/StringValueOf10.java rename to jbmc/regression/jbmc-strings/StringValueOf10/StringValueOf10.java diff --git a/regression/jbmc-strings/StringValueOf10/test.desc b/jbmc/regression/jbmc-strings/StringValueOf10/test.desc similarity index 100% rename from regression/jbmc-strings/StringValueOf10/test.desc rename to jbmc/regression/jbmc-strings/StringValueOf10/test.desc diff --git a/regression/jbmc-strings/SubString01/SubString01.class b/jbmc/regression/jbmc-strings/SubString01/SubString01.class similarity index 100% rename from regression/jbmc-strings/SubString01/SubString01.class rename to jbmc/regression/jbmc-strings/SubString01/SubString01.class diff --git a/regression/jbmc-strings/SubString01/SubString01.java b/jbmc/regression/jbmc-strings/SubString01/SubString01.java similarity index 100% rename from regression/jbmc-strings/SubString01/SubString01.java rename to jbmc/regression/jbmc-strings/SubString01/SubString01.java diff --git a/regression/jbmc-strings/SubString01/test.desc b/jbmc/regression/jbmc-strings/SubString01/test.desc similarity index 100% rename from regression/jbmc-strings/SubString01/test.desc rename to jbmc/regression/jbmc-strings/SubString01/test.desc diff --git a/regression/jbmc-strings/SubString02/SubString02.class b/jbmc/regression/jbmc-strings/SubString02/SubString02.class similarity index 100% rename from regression/jbmc-strings/SubString02/SubString02.class rename to jbmc/regression/jbmc-strings/SubString02/SubString02.class diff --git a/regression/jbmc-strings/SubString02/SubString02.java b/jbmc/regression/jbmc-strings/SubString02/SubString02.java similarity index 100% rename from regression/jbmc-strings/SubString02/SubString02.java rename to jbmc/regression/jbmc-strings/SubString02/SubString02.java diff --git a/regression/jbmc-strings/SubString02/test.desc b/jbmc/regression/jbmc-strings/SubString02/test.desc similarity index 100% rename from regression/jbmc-strings/SubString02/test.desc rename to jbmc/regression/jbmc-strings/SubString02/test.desc diff --git a/regression/jbmc-strings/SubString03/SubString03.class b/jbmc/regression/jbmc-strings/SubString03/SubString03.class similarity index 100% rename from regression/jbmc-strings/SubString03/SubString03.class rename to jbmc/regression/jbmc-strings/SubString03/SubString03.class diff --git a/regression/jbmc-strings/SubString03/SubString03.java b/jbmc/regression/jbmc-strings/SubString03/SubString03.java similarity index 100% rename from regression/jbmc-strings/SubString03/SubString03.java rename to jbmc/regression/jbmc-strings/SubString03/SubString03.java diff --git a/regression/jbmc-strings/SubString03/test.desc b/jbmc/regression/jbmc-strings/SubString03/test.desc similarity index 100% rename from regression/jbmc-strings/SubString03/test.desc rename to jbmc/regression/jbmc-strings/SubString03/test.desc diff --git a/regression/jbmc-strings/TokenTest01/TokenTest01.class b/jbmc/regression/jbmc-strings/TokenTest01/TokenTest01.class similarity index 100% rename from regression/jbmc-strings/TokenTest01/TokenTest01.class rename to jbmc/regression/jbmc-strings/TokenTest01/TokenTest01.class diff --git a/regression/jbmc-strings/TokenTest01/TokenTest01.java b/jbmc/regression/jbmc-strings/TokenTest01/TokenTest01.java similarity index 100% rename from regression/jbmc-strings/TokenTest01/TokenTest01.java rename to jbmc/regression/jbmc-strings/TokenTest01/TokenTest01.java diff --git a/regression/jbmc-strings/TokenTest01/test.desc b/jbmc/regression/jbmc-strings/TokenTest01/test.desc similarity index 100% rename from regression/jbmc-strings/TokenTest01/test.desc rename to jbmc/regression/jbmc-strings/TokenTest01/test.desc diff --git a/regression/jbmc-strings/TokenTest02/TokenTest02.class b/jbmc/regression/jbmc-strings/TokenTest02/TokenTest02.class similarity index 100% rename from regression/jbmc-strings/TokenTest02/TokenTest02.class rename to jbmc/regression/jbmc-strings/TokenTest02/TokenTest02.class diff --git a/regression/jbmc-strings/TokenTest02/TokenTest02.java b/jbmc/regression/jbmc-strings/TokenTest02/TokenTest02.java similarity index 100% rename from regression/jbmc-strings/TokenTest02/TokenTest02.java rename to jbmc/regression/jbmc-strings/TokenTest02/TokenTest02.java diff --git a/regression/jbmc-strings/TokenTest02/test.desc b/jbmc/regression/jbmc-strings/TokenTest02/test.desc similarity index 100% rename from regression/jbmc-strings/TokenTest02/test.desc rename to jbmc/regression/jbmc-strings/TokenTest02/test.desc diff --git a/regression/jbmc-strings/Validate01/Validate01.class b/jbmc/regression/jbmc-strings/Validate01/Validate01.class similarity index 100% rename from regression/jbmc-strings/Validate01/Validate01.class rename to jbmc/regression/jbmc-strings/Validate01/Validate01.class diff --git a/regression/jbmc-strings/Validate01/Validate01.java b/jbmc/regression/jbmc-strings/Validate01/Validate01.java similarity index 100% rename from regression/jbmc-strings/Validate01/Validate01.java rename to jbmc/regression/jbmc-strings/Validate01/Validate01.java diff --git a/regression/jbmc-strings/Validate01/ValidateInput01.class b/jbmc/regression/jbmc-strings/Validate01/ValidateInput01.class similarity index 100% rename from regression/jbmc-strings/Validate01/ValidateInput01.class rename to jbmc/regression/jbmc-strings/Validate01/ValidateInput01.class diff --git a/regression/jbmc-strings/Validate01/ValidateInput01.java b/jbmc/regression/jbmc-strings/Validate01/ValidateInput01.java similarity index 100% rename from regression/jbmc-strings/Validate01/ValidateInput01.java rename to jbmc/regression/jbmc-strings/Validate01/ValidateInput01.java diff --git a/regression/jbmc-strings/Validate01/test.desc b/jbmc/regression/jbmc-strings/Validate01/test.desc similarity index 100% rename from regression/jbmc-strings/Validate01/test.desc rename to jbmc/regression/jbmc-strings/Validate01/test.desc diff --git a/regression/jbmc-strings/Validate02/Validate02.class b/jbmc/regression/jbmc-strings/Validate02/Validate02.class similarity index 100% rename from regression/jbmc-strings/Validate02/Validate02.class rename to jbmc/regression/jbmc-strings/Validate02/Validate02.class diff --git a/regression/jbmc-strings/Validate02/Validate02.java b/jbmc/regression/jbmc-strings/Validate02/Validate02.java similarity index 100% rename from regression/jbmc-strings/Validate02/Validate02.java rename to jbmc/regression/jbmc-strings/Validate02/Validate02.java diff --git a/regression/jbmc-strings/Validate02/ValidateInput02.class b/jbmc/regression/jbmc-strings/Validate02/ValidateInput02.class similarity index 100% rename from regression/jbmc-strings/Validate02/ValidateInput02.class rename to jbmc/regression/jbmc-strings/Validate02/ValidateInput02.class diff --git a/regression/jbmc-strings/Validate02/ValidateInput02.java b/jbmc/regression/jbmc-strings/Validate02/ValidateInput02.java similarity index 100% rename from regression/jbmc-strings/Validate02/ValidateInput02.java rename to jbmc/regression/jbmc-strings/Validate02/ValidateInput02.java diff --git a/regression/jbmc-strings/Validate02/test.desc b/jbmc/regression/jbmc-strings/Validate02/test.desc similarity index 100% rename from regression/jbmc-strings/Validate02/test.desc rename to jbmc/regression/jbmc-strings/Validate02/test.desc diff --git a/regression/jbmc-strings/VerifStringLastIndexOf/Test.class b/jbmc/regression/jbmc-strings/VerifStringLastIndexOf/Test.class similarity index 100% rename from regression/jbmc-strings/VerifStringLastIndexOf/Test.class rename to jbmc/regression/jbmc-strings/VerifStringLastIndexOf/Test.class diff --git a/regression/jbmc-strings/VerifStringLastIndexOf/Test.java b/jbmc/regression/jbmc-strings/VerifStringLastIndexOf/Test.java similarity index 100% rename from regression/jbmc-strings/VerifStringLastIndexOf/Test.java rename to jbmc/regression/jbmc-strings/VerifStringLastIndexOf/Test.java diff --git a/regression/jbmc-strings/VerifStringLastIndexOf/test.desc b/jbmc/regression/jbmc-strings/VerifStringLastIndexOf/test.desc similarity index 100% rename from regression/jbmc-strings/VerifStringLastIndexOf/test.desc rename to jbmc/regression/jbmc-strings/VerifStringLastIndexOf/test.desc diff --git a/regression/jbmc-strings/bug-test-gen-095/test.class b/jbmc/regression/jbmc-strings/bug-test-gen-095/test.class similarity index 100% rename from regression/jbmc-strings/bug-test-gen-095/test.class rename to jbmc/regression/jbmc-strings/bug-test-gen-095/test.class diff --git a/regression/jbmc-strings/bug-test-gen-095/test.desc b/jbmc/regression/jbmc-strings/bug-test-gen-095/test.desc similarity index 100% rename from regression/jbmc-strings/bug-test-gen-095/test.desc rename to jbmc/regression/jbmc-strings/bug-test-gen-095/test.desc diff --git a/regression/jbmc-strings/bug-test-gen-095/test.java b/jbmc/regression/jbmc-strings/bug-test-gen-095/test.java similarity index 100% rename from regression/jbmc-strings/bug-test-gen-095/test.java rename to jbmc/regression/jbmc-strings/bug-test-gen-095/test.java diff --git a/regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.class b/jbmc/regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.class similarity index 100% rename from regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.class rename to jbmc/regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.class diff --git a/regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.java b/jbmc/regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.java similarity index 100% rename from regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.java rename to jbmc/regression/jbmc-strings/bug-test-gen-119-2/StringValueOfLong.java diff --git a/regression/jbmc-strings/bug-test-gen-119-2/test.desc b/jbmc/regression/jbmc-strings/bug-test-gen-119-2/test.desc similarity index 100% rename from regression/jbmc-strings/bug-test-gen-119-2/test.desc rename to jbmc/regression/jbmc-strings/bug-test-gen-119-2/test.desc diff --git a/regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.class b/jbmc/regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.class similarity index 100% rename from regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.class rename to jbmc/regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.class diff --git a/regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.java b/jbmc/regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.java similarity index 100% rename from regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.java rename to jbmc/regression/jbmc-strings/bug-test-gen-119/StringValueOfBool.java diff --git a/regression/jbmc-strings/bug-test-gen-119/test.desc b/jbmc/regression/jbmc-strings/bug-test-gen-119/test.desc similarity index 100% rename from regression/jbmc-strings/bug-test-gen-119/test.desc rename to jbmc/regression/jbmc-strings/bug-test-gen-119/test.desc diff --git a/regression/jbmc-strings/char_escape/Test.class b/jbmc/regression/jbmc-strings/char_escape/Test.class similarity index 100% rename from regression/jbmc-strings/char_escape/Test.class rename to jbmc/regression/jbmc-strings/char_escape/Test.class diff --git a/regression/jbmc-strings/char_escape/Test.java b/jbmc/regression/jbmc-strings/char_escape/Test.java similarity index 100% rename from regression/jbmc-strings/char_escape/Test.java rename to jbmc/regression/jbmc-strings/char_escape/Test.java diff --git a/regression/jbmc-strings/char_escape/test.desc b/jbmc/regression/jbmc-strings/char_escape/test.desc similarity index 100% rename from regression/jbmc-strings/char_escape/test.desc rename to jbmc/regression/jbmc-strings/char_escape/test.desc diff --git a/regression/jbmc-strings/cprover/CProverString.class b/jbmc/regression/jbmc-strings/cprover/CProverString.class similarity index 100% rename from regression/jbmc-strings/cprover/CProverString.class rename to jbmc/regression/jbmc-strings/cprover/CProverString.class diff --git a/regression/jbmc-strings/cprover/CProverString.java b/jbmc/regression/jbmc-strings/cprover/CProverString.java similarity index 100% rename from regression/jbmc-strings/cprover/CProverString.java rename to jbmc/regression/jbmc-strings/cprover/CProverString.java diff --git a/regression/jbmc-strings/instanceof/Test.class b/jbmc/regression/jbmc-strings/instanceof/Test.class similarity index 100% rename from regression/jbmc-strings/instanceof/Test.class rename to jbmc/regression/jbmc-strings/instanceof/Test.class diff --git a/regression/jbmc-strings/instanceof/Test.java b/jbmc/regression/jbmc-strings/instanceof/Test.java similarity index 100% rename from regression/jbmc-strings/instanceof/Test.java rename to jbmc/regression/jbmc-strings/instanceof/Test.java diff --git a/regression/jbmc-strings/instanceof/test.desc b/jbmc/regression/jbmc-strings/instanceof/test.desc similarity index 100% rename from regression/jbmc-strings/instanceof/test.desc rename to jbmc/regression/jbmc-strings/instanceof/test.desc diff --git a/regression/jbmc-strings/java_append_char/test.desc b/jbmc/regression/jbmc-strings/java_append_char/test.desc similarity index 100% rename from regression/jbmc-strings/java_append_char/test.desc rename to jbmc/regression/jbmc-strings/java_append_char/test.desc diff --git a/regression/jbmc-strings/java_append_char/test_append_char.class b/jbmc/regression/jbmc-strings/java_append_char/test_append_char.class similarity index 100% rename from regression/jbmc-strings/java_append_char/test_append_char.class rename to jbmc/regression/jbmc-strings/java_append_char/test_append_char.class diff --git a/regression/jbmc-strings/java_append_char/test_append_char.java b/jbmc/regression/jbmc-strings/java_append_char/test_append_char.java similarity index 100% rename from regression/jbmc-strings/java_append_char/test_append_char.java rename to jbmc/regression/jbmc-strings/java_append_char/test_append_char.java diff --git a/regression/jbmc-strings/java_append_int/test.desc b/jbmc/regression/jbmc-strings/java_append_int/test.desc similarity index 100% rename from regression/jbmc-strings/java_append_int/test.desc rename to jbmc/regression/jbmc-strings/java_append_int/test.desc diff --git a/regression/jbmc-strings/java_append_int/test_append_int.class b/jbmc/regression/jbmc-strings/java_append_int/test_append_int.class similarity index 100% rename from regression/jbmc-strings/java_append_int/test_append_int.class rename to jbmc/regression/jbmc-strings/java_append_int/test_append_int.class diff --git a/regression/jbmc-strings/java_append_int/test_append_int.java b/jbmc/regression/jbmc-strings/java_append_int/test_append_int.java similarity index 100% rename from regression/jbmc-strings/java_append_int/test_append_int.java rename to jbmc/regression/jbmc-strings/java_append_int/test_append_int.java diff --git a/regression/jbmc-strings/java_append_object/test.desc b/jbmc/regression/jbmc-strings/java_append_object/test.desc similarity index 100% rename from regression/jbmc-strings/java_append_object/test.desc rename to jbmc/regression/jbmc-strings/java_append_object/test.desc diff --git a/regression/jbmc-strings/java_append_object/test_append_object.class b/jbmc/regression/jbmc-strings/java_append_object/test_append_object.class similarity index 100% rename from regression/jbmc-strings/java_append_object/test_append_object.class rename to jbmc/regression/jbmc-strings/java_append_object/test_append_object.class diff --git a/regression/jbmc-strings/java_append_object/test_append_object.java b/jbmc/regression/jbmc-strings/java_append_object/test_append_object.java similarity index 100% rename from regression/jbmc-strings/java_append_object/test_append_object.java rename to jbmc/regression/jbmc-strings/java_append_object/test_append_object.java diff --git a/regression/jbmc-strings/java_append_string/test.desc b/jbmc/regression/jbmc-strings/java_append_string/test.desc similarity index 100% rename from regression/jbmc-strings/java_append_string/test.desc rename to jbmc/regression/jbmc-strings/java_append_string/test.desc diff --git a/regression/jbmc-strings/java_append_string/test_append_string.class b/jbmc/regression/jbmc-strings/java_append_string/test_append_string.class similarity index 100% rename from regression/jbmc-strings/java_append_string/test_append_string.class rename to jbmc/regression/jbmc-strings/java_append_string/test_append_string.class diff --git a/regression/jbmc-strings/java_append_string/test_append_string.java b/jbmc/regression/jbmc-strings/java_append_string/test_append_string.java similarity index 100% rename from regression/jbmc-strings/java_append_string/test_append_string.java rename to jbmc/regression/jbmc-strings/java_append_string/test_append_string.java diff --git a/regression/jbmc-strings/java_case/test.desc b/jbmc/regression/jbmc-strings/java_case/test.desc similarity index 100% rename from regression/jbmc-strings/java_case/test.desc rename to jbmc/regression/jbmc-strings/java_case/test.desc diff --git a/regression/jbmc-strings/java_case/test_case.class b/jbmc/regression/jbmc-strings/java_case/test_case.class similarity index 100% rename from regression/jbmc-strings/java_case/test_case.class rename to jbmc/regression/jbmc-strings/java_case/test_case.class diff --git a/regression/jbmc-strings/java_case/test_case.java b/jbmc/regression/jbmc-strings/java_case/test_case.java similarity index 100% rename from regression/jbmc-strings/java_case/test_case.java rename to jbmc/regression/jbmc-strings/java_case/test_case.java diff --git a/regression/jbmc-strings/java_char_array/test.desc b/jbmc/regression/jbmc-strings/java_char_array/test.desc similarity index 100% rename from regression/jbmc-strings/java_char_array/test.desc rename to jbmc/regression/jbmc-strings/java_char_array/test.desc diff --git a/regression/jbmc-strings/java_char_array/test_char_array.class b/jbmc/regression/jbmc-strings/java_char_array/test_char_array.class similarity index 100% rename from regression/jbmc-strings/java_char_array/test_char_array.class rename to jbmc/regression/jbmc-strings/java_char_array/test_char_array.class diff --git a/regression/jbmc-strings/java_char_array/test_char_array.java b/jbmc/regression/jbmc-strings/java_char_array/test_char_array.java similarity index 100% rename from regression/jbmc-strings/java_char_array/test_char_array.java rename to jbmc/regression/jbmc-strings/java_char_array/test_char_array.java diff --git a/regression/jbmc-strings/java_char_array_init/test.desc b/jbmc/regression/jbmc-strings/java_char_array_init/test.desc similarity index 100% rename from regression/jbmc-strings/java_char_array_init/test.desc rename to jbmc/regression/jbmc-strings/java_char_array_init/test.desc diff --git a/regression/jbmc-strings/java_char_array_init/test_init.class b/jbmc/regression/jbmc-strings/java_char_array_init/test_init.class similarity index 100% rename from regression/jbmc-strings/java_char_array_init/test_init.class rename to jbmc/regression/jbmc-strings/java_char_array_init/test_init.class diff --git a/regression/jbmc-strings/java_char_array_init/test_init.java b/jbmc/regression/jbmc-strings/java_char_array_init/test_init.java similarity index 100% rename from regression/jbmc-strings/java_char_array_init/test_init.java rename to jbmc/regression/jbmc-strings/java_char_array_init/test_init.java diff --git a/regression/jbmc-strings/java_char_at/test.desc b/jbmc/regression/jbmc-strings/java_char_at/test.desc similarity index 100% rename from regression/jbmc-strings/java_char_at/test.desc rename to jbmc/regression/jbmc-strings/java_char_at/test.desc diff --git a/regression/jbmc-strings/java_char_at/test_char_at.class b/jbmc/regression/jbmc-strings/java_char_at/test_char_at.class similarity index 100% rename from regression/jbmc-strings/java_char_at/test_char_at.class rename to jbmc/regression/jbmc-strings/java_char_at/test_char_at.class diff --git a/regression/jbmc-strings/java_char_at/test_char_at.java b/jbmc/regression/jbmc-strings/java_char_at/test_char_at.java similarity index 100% rename from regression/jbmc-strings/java_char_at/test_char_at.java rename to jbmc/regression/jbmc-strings/java_char_at/test_char_at.java diff --git a/regression/jbmc-strings/java_code_point/test.desc b/jbmc/regression/jbmc-strings/java_code_point/test.desc similarity index 100% rename from regression/jbmc-strings/java_code_point/test.desc rename to jbmc/regression/jbmc-strings/java_code_point/test.desc diff --git a/regression/jbmc-strings/java_code_point/test_code_point.class b/jbmc/regression/jbmc-strings/java_code_point/test_code_point.class similarity index 100% rename from regression/jbmc-strings/java_code_point/test_code_point.class rename to jbmc/regression/jbmc-strings/java_code_point/test_code_point.class diff --git a/regression/jbmc-strings/java_code_point/test_code_point.java b/jbmc/regression/jbmc-strings/java_code_point/test_code_point.java similarity index 100% rename from regression/jbmc-strings/java_code_point/test_code_point.java rename to jbmc/regression/jbmc-strings/java_code_point/test_code_point.java diff --git a/regression/jbmc-strings/java_compare/test.desc b/jbmc/regression/jbmc-strings/java_compare/test.desc similarity index 100% rename from regression/jbmc-strings/java_compare/test.desc rename to jbmc/regression/jbmc-strings/java_compare/test.desc diff --git a/regression/jbmc-strings/java_compare/test_compare.class b/jbmc/regression/jbmc-strings/java_compare/test_compare.class similarity index 100% rename from regression/jbmc-strings/java_compare/test_compare.class rename to jbmc/regression/jbmc-strings/java_compare/test_compare.class diff --git a/regression/jbmc-strings/java_compare/test_compare.java b/jbmc/regression/jbmc-strings/java_compare/test_compare.java similarity index 100% rename from regression/jbmc-strings/java_compare/test_compare.java rename to jbmc/regression/jbmc-strings/java_compare/test_compare.java diff --git a/regression/jbmc-strings/java_concat/test.desc b/jbmc/regression/jbmc-strings/java_concat/test.desc similarity index 100% rename from regression/jbmc-strings/java_concat/test.desc rename to jbmc/regression/jbmc-strings/java_concat/test.desc diff --git a/regression/jbmc-strings/java_concat/test_concat.class b/jbmc/regression/jbmc-strings/java_concat/test_concat.class similarity index 100% rename from regression/jbmc-strings/java_concat/test_concat.class rename to jbmc/regression/jbmc-strings/java_concat/test_concat.class diff --git a/regression/jbmc-strings/java_concat/test_concat.java b/jbmc/regression/jbmc-strings/java_concat/test_concat.java similarity index 100% rename from regression/jbmc-strings/java_concat/test_concat.java rename to jbmc/regression/jbmc-strings/java_concat/test_concat.java diff --git a/regression/jbmc-strings/java_contains/test.desc b/jbmc/regression/jbmc-strings/java_contains/test.desc similarity index 100% rename from regression/jbmc-strings/java_contains/test.desc rename to jbmc/regression/jbmc-strings/java_contains/test.desc diff --git a/regression/jbmc-strings/java_contains/test_contains.class b/jbmc/regression/jbmc-strings/java_contains/test_contains.class similarity index 100% rename from regression/jbmc-strings/java_contains/test_contains.class rename to jbmc/regression/jbmc-strings/java_contains/test_contains.class diff --git a/regression/jbmc-strings/java_contains/test_contains.java b/jbmc/regression/jbmc-strings/java_contains/test_contains.java similarity index 100% rename from regression/jbmc-strings/java_contains/test_contains.java rename to jbmc/regression/jbmc-strings/java_contains/test_contains.java diff --git a/regression/jbmc-strings/java_delete/test.desc b/jbmc/regression/jbmc-strings/java_delete/test.desc similarity index 100% rename from regression/jbmc-strings/java_delete/test.desc rename to jbmc/regression/jbmc-strings/java_delete/test.desc diff --git a/regression/jbmc-strings/java_delete/test_delete.class b/jbmc/regression/jbmc-strings/java_delete/test_delete.class similarity index 100% rename from regression/jbmc-strings/java_delete/test_delete.class rename to jbmc/regression/jbmc-strings/java_delete/test_delete.class diff --git a/regression/jbmc-strings/java_delete/test_delete.java b/jbmc/regression/jbmc-strings/java_delete/test_delete.java similarity index 100% rename from regression/jbmc-strings/java_delete/test_delete.java rename to jbmc/regression/jbmc-strings/java_delete/test_delete.java diff --git a/regression/jbmc-strings/java_delete_char_at/test.desc b/jbmc/regression/jbmc-strings/java_delete_char_at/test.desc similarity index 100% rename from regression/jbmc-strings/java_delete_char_at/test.desc rename to jbmc/regression/jbmc-strings/java_delete_char_at/test.desc diff --git a/regression/jbmc-strings/java_delete_char_at/test_delete_char_at.class b/jbmc/regression/jbmc-strings/java_delete_char_at/test_delete_char_at.class similarity index 100% rename from regression/jbmc-strings/java_delete_char_at/test_delete_char_at.class rename to jbmc/regression/jbmc-strings/java_delete_char_at/test_delete_char_at.class diff --git a/regression/jbmc-strings/java_delete_char_at/test_delete_char_at.java b/jbmc/regression/jbmc-strings/java_delete_char_at/test_delete_char_at.java similarity index 100% rename from regression/jbmc-strings/java_delete_char_at/test_delete_char_at.java rename to jbmc/regression/jbmc-strings/java_delete_char_at/test_delete_char_at.java diff --git a/regression/jbmc-strings/java_easychair/easychair.class b/jbmc/regression/jbmc-strings/java_easychair/easychair.class similarity index 100% rename from regression/jbmc-strings/java_easychair/easychair.class rename to jbmc/regression/jbmc-strings/java_easychair/easychair.class diff --git a/regression/jbmc-strings/java_easychair/easychair.java b/jbmc/regression/jbmc-strings/java_easychair/easychair.java similarity index 100% rename from regression/jbmc-strings/java_easychair/easychair.java rename to jbmc/regression/jbmc-strings/java_easychair/easychair.java diff --git a/regression/jbmc-strings/java_easychair/test.desc b/jbmc/regression/jbmc-strings/java_easychair/test.desc similarity index 100% rename from regression/jbmc-strings/java_easychair/test.desc rename to jbmc/regression/jbmc-strings/java_easychair/test.desc diff --git a/regression/jbmc-strings/java_empty/test.desc b/jbmc/regression/jbmc-strings/java_empty/test.desc similarity index 100% rename from regression/jbmc-strings/java_empty/test.desc rename to jbmc/regression/jbmc-strings/java_empty/test.desc diff --git a/regression/jbmc-strings/java_empty/test_empty.class b/jbmc/regression/jbmc-strings/java_empty/test_empty.class similarity index 100% rename from regression/jbmc-strings/java_empty/test_empty.class rename to jbmc/regression/jbmc-strings/java_empty/test_empty.class diff --git a/regression/jbmc-strings/java_empty/test_empty.java b/jbmc/regression/jbmc-strings/java_empty/test_empty.java similarity index 100% rename from regression/jbmc-strings/java_empty/test_empty.java rename to jbmc/regression/jbmc-strings/java_empty/test_empty.java diff --git a/regression/jbmc-strings/java_endswith/test.desc b/jbmc/regression/jbmc-strings/java_endswith/test.desc similarity index 100% rename from regression/jbmc-strings/java_endswith/test.desc rename to jbmc/regression/jbmc-strings/java_endswith/test.desc diff --git a/regression/jbmc-strings/java_endswith/test_endswith.class b/jbmc/regression/jbmc-strings/java_endswith/test_endswith.class similarity index 100% rename from regression/jbmc-strings/java_endswith/test_endswith.class rename to jbmc/regression/jbmc-strings/java_endswith/test_endswith.class diff --git a/regression/jbmc-strings/java_endswith/test_endswith.java b/jbmc/regression/jbmc-strings/java_endswith/test_endswith.java similarity index 100% rename from regression/jbmc-strings/java_endswith/test_endswith.java rename to jbmc/regression/jbmc-strings/java_endswith/test_endswith.java diff --git a/regression/jbmc-strings/java_equal/test.desc b/jbmc/regression/jbmc-strings/java_equal/test.desc similarity index 100% rename from regression/jbmc-strings/java_equal/test.desc rename to jbmc/regression/jbmc-strings/java_equal/test.desc diff --git a/regression/jbmc-strings/java_equal/test_equal.class b/jbmc/regression/jbmc-strings/java_equal/test_equal.class similarity index 100% rename from regression/jbmc-strings/java_equal/test_equal.class rename to jbmc/regression/jbmc-strings/java_equal/test_equal.class diff --git a/regression/jbmc-strings/java_equal/test_equal.java b/jbmc/regression/jbmc-strings/java_equal/test_equal.java similarity index 100% rename from regression/jbmc-strings/java_equal/test_equal.java rename to jbmc/regression/jbmc-strings/java_equal/test_equal.java diff --git a/regression/jbmc-strings/java_float/test.desc b/jbmc/regression/jbmc-strings/java_float/test.desc similarity index 100% rename from regression/jbmc-strings/java_float/test.desc rename to jbmc/regression/jbmc-strings/java_float/test.desc diff --git a/regression/jbmc-strings/java_float/test_float.class b/jbmc/regression/jbmc-strings/java_float/test_float.class similarity index 100% rename from regression/jbmc-strings/java_float/test_float.class rename to jbmc/regression/jbmc-strings/java_float/test_float.class diff --git a/regression/jbmc-strings/java_float/test_float.java b/jbmc/regression/jbmc-strings/java_float/test_float.java similarity index 100% rename from regression/jbmc-strings/java_float/test_float.java rename to jbmc/regression/jbmc-strings/java_float/test_float.java diff --git a/regression/jbmc-strings/java_hash_code/test.desc b/jbmc/regression/jbmc-strings/java_hash_code/test.desc similarity index 100% rename from regression/jbmc-strings/java_hash_code/test.desc rename to jbmc/regression/jbmc-strings/java_hash_code/test.desc diff --git a/regression/jbmc-strings/java_hash_code/test_hash_code.class b/jbmc/regression/jbmc-strings/java_hash_code/test_hash_code.class similarity index 100% rename from regression/jbmc-strings/java_hash_code/test_hash_code.class rename to jbmc/regression/jbmc-strings/java_hash_code/test_hash_code.class diff --git a/regression/jbmc-strings/java_hash_code/test_hash_code.java b/jbmc/regression/jbmc-strings/java_hash_code/test_hash_code.java similarity index 100% rename from regression/jbmc-strings/java_hash_code/test_hash_code.java rename to jbmc/regression/jbmc-strings/java_hash_code/test_hash_code.java diff --git a/regression/jbmc-strings/java_index_of/test.desc b/jbmc/regression/jbmc-strings/java_index_of/test.desc similarity index 100% rename from regression/jbmc-strings/java_index_of/test.desc rename to jbmc/regression/jbmc-strings/java_index_of/test.desc diff --git a/regression/jbmc-strings/java_index_of/test_index_of.class b/jbmc/regression/jbmc-strings/java_index_of/test_index_of.class similarity index 100% rename from regression/jbmc-strings/java_index_of/test_index_of.class rename to jbmc/regression/jbmc-strings/java_index_of/test_index_of.class diff --git a/regression/jbmc-strings/java_index_of/test_index_of.java b/jbmc/regression/jbmc-strings/java_index_of/test_index_of.java similarity index 100% rename from regression/jbmc-strings/java_index_of/test_index_of.java rename to jbmc/regression/jbmc-strings/java_index_of/test_index_of.java diff --git a/regression/jbmc-strings/java_index_of_char/test.desc b/jbmc/regression/jbmc-strings/java_index_of_char/test.desc similarity index 100% rename from regression/jbmc-strings/java_index_of_char/test.desc rename to jbmc/regression/jbmc-strings/java_index_of_char/test.desc diff --git a/regression/jbmc-strings/java_index_of_char/test_index_of_char.class b/jbmc/regression/jbmc-strings/java_index_of_char/test_index_of_char.class similarity index 100% rename from regression/jbmc-strings/java_index_of_char/test_index_of_char.class rename to jbmc/regression/jbmc-strings/java_index_of_char/test_index_of_char.class diff --git a/regression/jbmc-strings/java_index_of_char/test_index_of_char.java b/jbmc/regression/jbmc-strings/java_index_of_char/test_index_of_char.java similarity index 100% rename from regression/jbmc-strings/java_index_of_char/test_index_of_char.java rename to jbmc/regression/jbmc-strings/java_index_of_char/test_index_of_char.java diff --git a/regression/jbmc-strings/java_insert_char/test.desc b/jbmc/regression/jbmc-strings/java_insert_char/test.desc similarity index 100% rename from regression/jbmc-strings/java_insert_char/test.desc rename to jbmc/regression/jbmc-strings/java_insert_char/test.desc diff --git a/regression/jbmc-strings/java_insert_char/test_insert_char.class b/jbmc/regression/jbmc-strings/java_insert_char/test_insert_char.class similarity index 100% rename from regression/jbmc-strings/java_insert_char/test_insert_char.class rename to jbmc/regression/jbmc-strings/java_insert_char/test_insert_char.class diff --git a/regression/jbmc-strings/java_insert_char/test_insert_char.java b/jbmc/regression/jbmc-strings/java_insert_char/test_insert_char.java similarity index 100% rename from regression/jbmc-strings/java_insert_char/test_insert_char.java rename to jbmc/regression/jbmc-strings/java_insert_char/test_insert_char.java diff --git a/regression/jbmc-strings/java_insert_char_array/test.desc b/jbmc/regression/jbmc-strings/java_insert_char_array/test.desc similarity index 100% rename from regression/jbmc-strings/java_insert_char_array/test.desc rename to jbmc/regression/jbmc-strings/java_insert_char_array/test.desc diff --git a/regression/jbmc-strings/java_insert_char_array/test_insert_char_array.class b/jbmc/regression/jbmc-strings/java_insert_char_array/test_insert_char_array.class similarity index 100% rename from regression/jbmc-strings/java_insert_char_array/test_insert_char_array.class rename to jbmc/regression/jbmc-strings/java_insert_char_array/test_insert_char_array.class diff --git a/regression/jbmc-strings/java_insert_char_array/test_insert_char_array.java b/jbmc/regression/jbmc-strings/java_insert_char_array/test_insert_char_array.java similarity index 100% rename from regression/jbmc-strings/java_insert_char_array/test_insert_char_array.java rename to jbmc/regression/jbmc-strings/java_insert_char_array/test_insert_char_array.java diff --git a/regression/jbmc-strings/java_insert_int/test.desc b/jbmc/regression/jbmc-strings/java_insert_int/test.desc similarity index 100% rename from regression/jbmc-strings/java_insert_int/test.desc rename to jbmc/regression/jbmc-strings/java_insert_int/test.desc diff --git a/regression/jbmc-strings/java_insert_int/test_insert_int.class b/jbmc/regression/jbmc-strings/java_insert_int/test_insert_int.class similarity index 100% rename from regression/jbmc-strings/java_insert_int/test_insert_int.class rename to jbmc/regression/jbmc-strings/java_insert_int/test_insert_int.class diff --git a/regression/jbmc-strings/java_insert_int/test_insert_int.java b/jbmc/regression/jbmc-strings/java_insert_int/test_insert_int.java similarity index 100% rename from regression/jbmc-strings/java_insert_int/test_insert_int.java rename to jbmc/regression/jbmc-strings/java_insert_int/test_insert_int.java diff --git a/regression/jbmc-strings/java_insert_multiple/test.desc b/jbmc/regression/jbmc-strings/java_insert_multiple/test.desc similarity index 100% rename from regression/jbmc-strings/java_insert_multiple/test.desc rename to jbmc/regression/jbmc-strings/java_insert_multiple/test.desc diff --git a/regression/jbmc-strings/java_insert_multiple/test_insert_multiple.class b/jbmc/regression/jbmc-strings/java_insert_multiple/test_insert_multiple.class similarity index 100% rename from regression/jbmc-strings/java_insert_multiple/test_insert_multiple.class rename to jbmc/regression/jbmc-strings/java_insert_multiple/test_insert_multiple.class diff --git a/regression/jbmc-strings/java_insert_multiple/test_insert_multiple.java b/jbmc/regression/jbmc-strings/java_insert_multiple/test_insert_multiple.java similarity index 100% rename from regression/jbmc-strings/java_insert_multiple/test_insert_multiple.java rename to jbmc/regression/jbmc-strings/java_insert_multiple/test_insert_multiple.java diff --git a/regression/jbmc-strings/java_insert_string/test.desc b/jbmc/regression/jbmc-strings/java_insert_string/test.desc similarity index 100% rename from regression/jbmc-strings/java_insert_string/test.desc rename to jbmc/regression/jbmc-strings/java_insert_string/test.desc diff --git a/regression/jbmc-strings/java_insert_string/test_insert_string.class b/jbmc/regression/jbmc-strings/java_insert_string/test_insert_string.class similarity index 100% rename from regression/jbmc-strings/java_insert_string/test_insert_string.class rename to jbmc/regression/jbmc-strings/java_insert_string/test_insert_string.class diff --git a/regression/jbmc-strings/java_insert_string/test_insert_string.java b/jbmc/regression/jbmc-strings/java_insert_string/test_insert_string.java similarity index 100% rename from regression/jbmc-strings/java_insert_string/test_insert_string.java rename to jbmc/regression/jbmc-strings/java_insert_string/test_insert_string.java diff --git a/regression/jbmc-strings/literal-length/Test.class b/jbmc/regression/jbmc-strings/literal-length/Test.class similarity index 100% rename from regression/jbmc-strings/literal-length/Test.class rename to jbmc/regression/jbmc-strings/literal-length/Test.class diff --git a/regression/jbmc-strings/literal-length/Test.java b/jbmc/regression/jbmc-strings/literal-length/Test.java similarity index 100% rename from regression/jbmc-strings/literal-length/Test.java rename to jbmc/regression/jbmc-strings/literal-length/Test.java diff --git a/regression/jbmc-strings/literal-length/test.desc b/jbmc/regression/jbmc-strings/literal-length/test.desc similarity index 100% rename from regression/jbmc-strings/literal-length/test.desc rename to jbmc/regression/jbmc-strings/literal-length/test.desc diff --git a/regression/jbmc-strings/long_string/Test.class b/jbmc/regression/jbmc-strings/long_string/Test.class similarity index 100% rename from regression/jbmc-strings/long_string/Test.class rename to jbmc/regression/jbmc-strings/long_string/Test.class diff --git a/regression/jbmc-strings/long_string/Test.java b/jbmc/regression/jbmc-strings/long_string/Test.java similarity index 100% rename from regression/jbmc-strings/long_string/Test.java rename to jbmc/regression/jbmc-strings/long_string/Test.java diff --git a/regression/jbmc-strings/long_string/test.desc b/jbmc/regression/jbmc-strings/long_string/test.desc similarity index 100% rename from regression/jbmc-strings/long_string/test.desc rename to jbmc/regression/jbmc-strings/long_string/test.desc diff --git a/regression/jbmc-strings/long_string/test_abort.desc b/jbmc/regression/jbmc-strings/long_string/test_abort.desc similarity index 100% rename from regression/jbmc-strings/long_string/test_abort.desc rename to jbmc/regression/jbmc-strings/long_string/test_abort.desc diff --git a/regression/jbmc-strings/max-length-generic-array/IntegerTests.class b/jbmc/regression/jbmc-strings/max-length-generic-array/IntegerTests.class similarity index 100% rename from regression/jbmc-strings/max-length-generic-array/IntegerTests.class rename to jbmc/regression/jbmc-strings/max-length-generic-array/IntegerTests.class diff --git a/regression/jbmc-strings/max-length-generic-array/IntegerTests.java b/jbmc/regression/jbmc-strings/max-length-generic-array/IntegerTests.java similarity index 100% rename from regression/jbmc-strings/max-length-generic-array/IntegerTests.java rename to jbmc/regression/jbmc-strings/max-length-generic-array/IntegerTests.java diff --git a/regression/jbmc-strings/max-length-generic-array/MyGenSet.class b/jbmc/regression/jbmc-strings/max-length-generic-array/MyGenSet.class similarity index 100% rename from regression/jbmc-strings/max-length-generic-array/MyGenSet.class rename to jbmc/regression/jbmc-strings/max-length-generic-array/MyGenSet.class diff --git a/regression/jbmc-strings/max-length-generic-array/MySet.class b/jbmc/regression/jbmc-strings/max-length-generic-array/MySet.class similarity index 100% rename from regression/jbmc-strings/max-length-generic-array/MySet.class rename to jbmc/regression/jbmc-strings/max-length-generic-array/MySet.class diff --git a/regression/jbmc-strings/max-length-generic-array/test.desc b/jbmc/regression/jbmc-strings/max-length-generic-array/test.desc similarity index 100% rename from regression/jbmc-strings/max-length-generic-array/test.desc rename to jbmc/regression/jbmc-strings/max-length-generic-array/test.desc diff --git a/regression/jbmc-strings/max-length-generic-array/test_gen.desc b/jbmc/regression/jbmc-strings/max-length-generic-array/test_gen.desc similarity index 100% rename from regression/jbmc-strings/max-length-generic-array/test_gen.desc rename to jbmc/regression/jbmc-strings/max-length-generic-array/test_gen.desc diff --git a/regression/jbmc-strings/max-length/Test.class b/jbmc/regression/jbmc-strings/max-length/Test.class similarity index 100% rename from regression/jbmc-strings/max-length/Test.class rename to jbmc/regression/jbmc-strings/max-length/Test.class diff --git a/regression/jbmc-strings/max-length/Test.java b/jbmc/regression/jbmc-strings/max-length/Test.java similarity index 100% rename from regression/jbmc-strings/max-length/Test.java rename to jbmc/regression/jbmc-strings/max-length/Test.java diff --git a/regression/jbmc-strings/max-length/test1.desc b/jbmc/regression/jbmc-strings/max-length/test1.desc similarity index 100% rename from regression/jbmc-strings/max-length/test1.desc rename to jbmc/regression/jbmc-strings/max-length/test1.desc diff --git a/regression/jbmc-strings/max-length/test2.desc b/jbmc/regression/jbmc-strings/max-length/test2.desc similarity index 100% rename from regression/jbmc-strings/max-length/test2.desc rename to jbmc/regression/jbmc-strings/max-length/test2.desc diff --git a/regression/jbmc-strings/max-length/test3.desc b/jbmc/regression/jbmc-strings/max-length/test3.desc similarity index 100% rename from regression/jbmc-strings/max-length/test3.desc rename to jbmc/regression/jbmc-strings/max-length/test3.desc diff --git a/regression/jbmc-strings/max-length/test4.desc b/jbmc/regression/jbmc-strings/max-length/test4.desc similarity index 100% rename from regression/jbmc-strings/max-length/test4.desc rename to jbmc/regression/jbmc-strings/max-length/test4.desc diff --git a/regression/cbmc-java/ArithmeticException1/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException1/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException1/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException1/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException1/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException1/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException1/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException1/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException1/test.desc b/jbmc/regression/jbmc/ArithmeticException1/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException1/test.desc rename to jbmc/regression/jbmc/ArithmeticException1/test.desc diff --git a/regression/cbmc-java/ArithmeticException2/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException2/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException2/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException2/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException2/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException2/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException2/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException2/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException2/test.desc b/jbmc/regression/jbmc/ArithmeticException2/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException2/test.desc rename to jbmc/regression/jbmc/ArithmeticException2/test.desc diff --git a/regression/cbmc-java/ArithmeticException3/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException3/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException3/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException3/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException3/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException3/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException3/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException3/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException3/test.desc b/jbmc/regression/jbmc/ArithmeticException3/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException3/test.desc rename to jbmc/regression/jbmc/ArithmeticException3/test.desc diff --git a/regression/cbmc-java/ArithmeticException4/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException4/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException4/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException4/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException4/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException4/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException4/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException4/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException4/test.desc b/jbmc/regression/jbmc/ArithmeticException4/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException4/test.desc rename to jbmc/regression/jbmc/ArithmeticException4/test.desc diff --git a/regression/cbmc-java/ArithmeticException5/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException5/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException5/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException5/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException5/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException5/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException5/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException5/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException5/test.desc b/jbmc/regression/jbmc/ArithmeticException5/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException5/test.desc rename to jbmc/regression/jbmc/ArithmeticException5/test.desc diff --git a/regression/cbmc-java/ArithmeticException6/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException6/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException6/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException6/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException6/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException6/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException6/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException6/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException6/test.desc b/jbmc/regression/jbmc/ArithmeticException6/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException6/test.desc rename to jbmc/regression/jbmc/ArithmeticException6/test.desc diff --git a/regression/cbmc-java/ArithmeticException7/ArithmeticExceptionTest.class b/jbmc/regression/jbmc/ArithmeticException7/ArithmeticExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArithmeticException7/ArithmeticExceptionTest.class rename to jbmc/regression/jbmc/ArithmeticException7/ArithmeticExceptionTest.class diff --git a/regression/cbmc-java/ArithmeticException7/ArithmeticExceptionTest.java b/jbmc/regression/jbmc/ArithmeticException7/ArithmeticExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArithmeticException7/ArithmeticExceptionTest.java rename to jbmc/regression/jbmc/ArithmeticException7/ArithmeticExceptionTest.java diff --git a/regression/cbmc-java/ArithmeticException7/java/lang/ArithmeticException.class b/jbmc/regression/jbmc/ArithmeticException7/java/lang/ArithmeticException.class similarity index 100% rename from regression/cbmc-java/ArithmeticException7/java/lang/ArithmeticException.class rename to jbmc/regression/jbmc/ArithmeticException7/java/lang/ArithmeticException.class diff --git a/regression/cbmc-java/ArithmeticException7/java/lang/ArithmeticException.java b/jbmc/regression/jbmc/ArithmeticException7/java/lang/ArithmeticException.java similarity index 100% rename from regression/cbmc-java/ArithmeticException7/java/lang/ArithmeticException.java rename to jbmc/regression/jbmc/ArithmeticException7/java/lang/ArithmeticException.java diff --git a/regression/cbmc-java/ArithmeticException7/java/lang/RuntimeException.class b/jbmc/regression/jbmc/ArithmeticException7/java/lang/RuntimeException.class similarity index 100% rename from regression/cbmc-java/ArithmeticException7/java/lang/RuntimeException.class rename to jbmc/regression/jbmc/ArithmeticException7/java/lang/RuntimeException.class diff --git a/regression/cbmc-java/ArithmeticException7/java/lang/RuntimeException.java b/jbmc/regression/jbmc/ArithmeticException7/java/lang/RuntimeException.java similarity index 100% rename from regression/cbmc-java/ArithmeticException7/java/lang/RuntimeException.java rename to jbmc/regression/jbmc/ArithmeticException7/java/lang/RuntimeException.java diff --git a/regression/cbmc-java/ArithmeticException7/test.desc b/jbmc/regression/jbmc/ArithmeticException7/test.desc similarity index 100% rename from regression/cbmc-java/ArithmeticException7/test.desc rename to jbmc/regression/jbmc/ArithmeticException7/test.desc diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.class b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.class rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.class diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.java b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.java rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException1/ArrayIndexOutOfBoundsExceptionTest.java diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException1/test.desc b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException1/test.desc similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException1/test.desc rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException1/test.desc diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.class b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.class rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.class diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.java b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.java rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException2/ArrayIndexOutOfBoundsExceptionTest.java diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException2/test.desc b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException2/test.desc similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException2/test.desc rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException2/test.desc diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.class b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.class similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.class rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.class diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.java b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.java similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.java rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/ArrayIndexOutOfBoundsExceptionTest.java diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.class b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.class similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.class rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.class diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.java b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.java similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.java rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/ArrayIndexOutOfBoundsException.java diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.class b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.class similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.class rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.class diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.java b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.java similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.java rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/IndexOutOfBoundsException.java diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.class b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.class similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.class rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.class diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.java b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.java similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.java rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/java/lang/RuntimeException.java diff --git a/regression/cbmc-java/ArrayIndexOutOfBoundsException3/test.desc b/jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/test.desc similarity index 100% rename from regression/cbmc-java/ArrayIndexOutOfBoundsException3/test.desc rename to jbmc/regression/jbmc/ArrayIndexOutOfBoundsException3/test.desc diff --git a/jbmc/regression/jbmc/CMakeLists.txt b/jbmc/regression/jbmc/CMakeLists.txt new file mode 100644 index 00000000000..2742f7ba078 --- /dev/null +++ b/jbmc/regression/jbmc/CMakeLists.txt @@ -0,0 +1,10 @@ +add_test_pl_tests( + "$" +) + +add_test_pl_profile( + "cbmc-java-symex-driven-lazy-loading" + "$ --symex-driven-lazy-loading" + "-C;-X;symex-driven-lazy-loading-expected-failure" + "CORE" +) diff --git a/regression/cbmc-java/ClassCastException1/A.class b/jbmc/regression/jbmc/ClassCastException1/A.class similarity index 100% rename from regression/cbmc-java/ClassCastException1/A.class rename to jbmc/regression/jbmc/ClassCastException1/A.class diff --git a/regression/cbmc-java/ClassCastException1/B.class b/jbmc/regression/jbmc/ClassCastException1/B.class similarity index 100% rename from regression/cbmc-java/ClassCastException1/B.class rename to jbmc/regression/jbmc/ClassCastException1/B.class diff --git a/regression/cbmc-java/ClassCastException1/ClassCastExceptionTest.class b/jbmc/regression/jbmc/ClassCastException1/ClassCastExceptionTest.class similarity index 100% rename from regression/cbmc-java/ClassCastException1/ClassCastExceptionTest.class rename to jbmc/regression/jbmc/ClassCastException1/ClassCastExceptionTest.class diff --git a/regression/cbmc-java/ClassCastException1/ClassCastExceptionTest.java b/jbmc/regression/jbmc/ClassCastException1/ClassCastExceptionTest.java similarity index 100% rename from regression/cbmc-java/ClassCastException1/ClassCastExceptionTest.java rename to jbmc/regression/jbmc/ClassCastException1/ClassCastExceptionTest.java diff --git a/regression/cbmc-java/ClassCastException1/test.desc b/jbmc/regression/jbmc/ClassCastException1/test.desc similarity index 100% rename from regression/cbmc-java/ClassCastException1/test.desc rename to jbmc/regression/jbmc/ClassCastException1/test.desc diff --git a/regression/cbmc-java/ClassCastException2/A.class b/jbmc/regression/jbmc/ClassCastException2/A.class similarity index 100% rename from regression/cbmc-java/ClassCastException2/A.class rename to jbmc/regression/jbmc/ClassCastException2/A.class diff --git a/regression/cbmc-java/ClassCastException2/B.class b/jbmc/regression/jbmc/ClassCastException2/B.class similarity index 100% rename from regression/cbmc-java/ClassCastException2/B.class rename to jbmc/regression/jbmc/ClassCastException2/B.class diff --git a/regression/cbmc-java/ClassCastException2/C.class b/jbmc/regression/jbmc/ClassCastException2/C.class similarity index 100% rename from regression/cbmc-java/ClassCastException2/C.class rename to jbmc/regression/jbmc/ClassCastException2/C.class diff --git a/regression/cbmc-java/ClassCastException2/ClassCastExceptionTest.class b/jbmc/regression/jbmc/ClassCastException2/ClassCastExceptionTest.class similarity index 100% rename from regression/cbmc-java/ClassCastException2/ClassCastExceptionTest.class rename to jbmc/regression/jbmc/ClassCastException2/ClassCastExceptionTest.class diff --git a/regression/cbmc-java/ClassCastException2/ClassCastExceptionTest.java b/jbmc/regression/jbmc/ClassCastException2/ClassCastExceptionTest.java similarity index 100% rename from regression/cbmc-java/ClassCastException2/ClassCastExceptionTest.java rename to jbmc/regression/jbmc/ClassCastException2/ClassCastExceptionTest.java diff --git a/regression/cbmc-java/ClassCastException2/test.desc b/jbmc/regression/jbmc/ClassCastException2/test.desc similarity index 100% rename from regression/cbmc-java/ClassCastException2/test.desc rename to jbmc/regression/jbmc/ClassCastException2/test.desc diff --git a/regression/cbmc-java/ClassCastException3/A.class b/jbmc/regression/jbmc/ClassCastException3/A.class similarity index 100% rename from regression/cbmc-java/ClassCastException3/A.class rename to jbmc/regression/jbmc/ClassCastException3/A.class diff --git a/regression/cbmc-java/ClassCastException3/B.class b/jbmc/regression/jbmc/ClassCastException3/B.class similarity index 100% rename from regression/cbmc-java/ClassCastException3/B.class rename to jbmc/regression/jbmc/ClassCastException3/B.class diff --git a/regression/cbmc-java/ClassCastException3/ClassCastExceptionTest.class b/jbmc/regression/jbmc/ClassCastException3/ClassCastExceptionTest.class similarity index 100% rename from regression/cbmc-java/ClassCastException3/ClassCastExceptionTest.class rename to jbmc/regression/jbmc/ClassCastException3/ClassCastExceptionTest.class diff --git a/regression/cbmc-java/ClassCastException3/ClassCastExceptionTest.java b/jbmc/regression/jbmc/ClassCastException3/ClassCastExceptionTest.java similarity index 100% rename from regression/cbmc-java/ClassCastException3/ClassCastExceptionTest.java rename to jbmc/regression/jbmc/ClassCastException3/ClassCastExceptionTest.java diff --git a/regression/cbmc-java/ClassCastException3/java/lang/ClassCastException.class b/jbmc/regression/jbmc/ClassCastException3/java/lang/ClassCastException.class similarity index 100% rename from regression/cbmc-java/ClassCastException3/java/lang/ClassCastException.class rename to jbmc/regression/jbmc/ClassCastException3/java/lang/ClassCastException.class diff --git a/regression/cbmc-java/ClassCastException3/java/lang/ClassCastException.java b/jbmc/regression/jbmc/ClassCastException3/java/lang/ClassCastException.java similarity index 100% rename from regression/cbmc-java/ClassCastException3/java/lang/ClassCastException.java rename to jbmc/regression/jbmc/ClassCastException3/java/lang/ClassCastException.java diff --git a/regression/cbmc-java/ClassCastException3/java/lang/RuntimeException.class b/jbmc/regression/jbmc/ClassCastException3/java/lang/RuntimeException.class similarity index 100% rename from regression/cbmc-java/ClassCastException3/java/lang/RuntimeException.class rename to jbmc/regression/jbmc/ClassCastException3/java/lang/RuntimeException.class diff --git a/regression/cbmc-java/ClassCastException3/java/lang/RuntimeException.java b/jbmc/regression/jbmc/ClassCastException3/java/lang/RuntimeException.java similarity index 100% rename from regression/cbmc-java/ClassCastException3/java/lang/RuntimeException.java rename to jbmc/regression/jbmc/ClassCastException3/java/lang/RuntimeException.java diff --git a/regression/cbmc-java/ClassCastException3/test.desc b/jbmc/regression/jbmc/ClassCastException3/test.desc similarity index 100% rename from regression/cbmc-java/ClassCastException3/test.desc rename to jbmc/regression/jbmc/ClassCastException3/test.desc diff --git a/regression/cbmc-java/Class_method1/Class_method1.class b/jbmc/regression/jbmc/Class_method1/Class_method1.class similarity index 100% rename from regression/cbmc-java/Class_method1/Class_method1.class rename to jbmc/regression/jbmc/Class_method1/Class_method1.class diff --git a/regression/cbmc-java/Class_method1/Class_method1.java b/jbmc/regression/jbmc/Class_method1/Class_method1.java similarity index 100% rename from regression/cbmc-java/Class_method1/Class_method1.java rename to jbmc/regression/jbmc/Class_method1/Class_method1.java diff --git a/regression/cbmc-java/Inheritance1/A1.class b/jbmc/regression/jbmc/Inheritance1/A1.class similarity index 100% rename from regression/cbmc-java/Inheritance1/A1.class rename to jbmc/regression/jbmc/Inheritance1/A1.class diff --git a/regression/cbmc-java/Inheritance1/A2.class b/jbmc/regression/jbmc/Inheritance1/A2.class similarity index 100% rename from regression/cbmc-java/Inheritance1/A2.class rename to jbmc/regression/jbmc/Inheritance1/A2.class diff --git a/regression/cbmc-java/Inheritance1/A3.class b/jbmc/regression/jbmc/Inheritance1/A3.class similarity index 100% rename from regression/cbmc-java/Inheritance1/A3.class rename to jbmc/regression/jbmc/Inheritance1/A3.class diff --git a/regression/cbmc-java/Inheritance1/Inheritance1.class b/jbmc/regression/jbmc/Inheritance1/Inheritance1.class similarity index 100% rename from regression/cbmc-java/Inheritance1/Inheritance1.class rename to jbmc/regression/jbmc/Inheritance1/Inheritance1.class diff --git a/regression/cbmc-java/Inheritance1/Inheritance1.java b/jbmc/regression/jbmc/Inheritance1/Inheritance1.java similarity index 100% rename from regression/cbmc-java/Inheritance1/Inheritance1.java rename to jbmc/regression/jbmc/Inheritance1/Inheritance1.java diff --git a/regression/cbmc-java/Inheritance1/test.desc b/jbmc/regression/jbmc/Inheritance1/test.desc similarity index 100% rename from regression/cbmc-java/Inheritance1/test.desc rename to jbmc/regression/jbmc/Inheritance1/test.desc diff --git a/regression/cbmc-java/LocalVarTable1/CtorLocalVar.class b/jbmc/regression/jbmc/LocalVarTable1/CtorLocalVar.class similarity index 100% rename from regression/cbmc-java/LocalVarTable1/CtorLocalVar.class rename to jbmc/regression/jbmc/LocalVarTable1/CtorLocalVar.class diff --git a/regression/cbmc-java/LocalVarTable1/CtorLocalVar.java b/jbmc/regression/jbmc/LocalVarTable1/CtorLocalVar.java similarity index 100% rename from regression/cbmc-java/LocalVarTable1/CtorLocalVar.java rename to jbmc/regression/jbmc/LocalVarTable1/CtorLocalVar.java diff --git a/regression/cbmc-java/LocalVarTable1/test.desc b/jbmc/regression/jbmc/LocalVarTable1/test.desc similarity index 100% rename from regression/cbmc-java/LocalVarTable1/test.desc rename to jbmc/regression/jbmc/LocalVarTable1/test.desc diff --git a/regression/cbmc-java/LocalVarTable2/LocalVarTable2.class b/jbmc/regression/jbmc/LocalVarTable2/LocalVarTable2.class similarity index 100% rename from regression/cbmc-java/LocalVarTable2/LocalVarTable2.class rename to jbmc/regression/jbmc/LocalVarTable2/LocalVarTable2.class diff --git a/regression/cbmc-java/LocalVarTable2/LocalVarTable2.java b/jbmc/regression/jbmc/LocalVarTable2/LocalVarTable2.java similarity index 100% rename from regression/cbmc-java/LocalVarTable2/LocalVarTable2.java rename to jbmc/regression/jbmc/LocalVarTable2/LocalVarTable2.java diff --git a/regression/cbmc-java/LocalVarTable2/test.desc b/jbmc/regression/jbmc/LocalVarTable2/test.desc similarity index 100% rename from regression/cbmc-java/LocalVarTable2/test.desc rename to jbmc/regression/jbmc/LocalVarTable2/test.desc diff --git a/regression/cbmc-java/LocalVarTable3/live_range_with_holes.class b/jbmc/regression/jbmc/LocalVarTable3/live_range_with_holes.class similarity index 100% rename from regression/cbmc-java/LocalVarTable3/live_range_with_holes.class rename to jbmc/regression/jbmc/LocalVarTable3/live_range_with_holes.class diff --git a/regression/cbmc-java/LocalVarTable3/live_range_with_holes.java b/jbmc/regression/jbmc/LocalVarTable3/live_range_with_holes.java similarity index 100% rename from regression/cbmc-java/LocalVarTable3/live_range_with_holes.java rename to jbmc/regression/jbmc/LocalVarTable3/live_range_with_holes.java diff --git a/regression/cbmc-java/LocalVarTable3/test.desc b/jbmc/regression/jbmc/LocalVarTable3/test.desc similarity index 100% rename from regression/cbmc-java/LocalVarTable3/test.desc rename to jbmc/regression/jbmc/LocalVarTable3/test.desc diff --git a/regression/cbmc-java/LocalVarTable4/live_range_exception.class b/jbmc/regression/jbmc/LocalVarTable4/live_range_exception.class similarity index 100% rename from regression/cbmc-java/LocalVarTable4/live_range_exception.class rename to jbmc/regression/jbmc/LocalVarTable4/live_range_exception.class diff --git a/regression/cbmc-java/LocalVarTable4/live_range_exception.java b/jbmc/regression/jbmc/LocalVarTable4/live_range_exception.java similarity index 100% rename from regression/cbmc-java/LocalVarTable4/live_range_exception.java rename to jbmc/regression/jbmc/LocalVarTable4/live_range_exception.java diff --git a/regression/cbmc-java/LocalVarTable4/test.desc b/jbmc/regression/jbmc/LocalVarTable4/test.desc similarity index 100% rename from regression/cbmc-java/LocalVarTable4/test.desc rename to jbmc/regression/jbmc/LocalVarTable4/test.desc diff --git a/regression/cbmc-java/LocalVarTable5/test.class b/jbmc/regression/jbmc/LocalVarTable5/test.class similarity index 100% rename from regression/cbmc-java/LocalVarTable5/test.class rename to jbmc/regression/jbmc/LocalVarTable5/test.class diff --git a/regression/cbmc-java/LocalVarTable5/test.desc b/jbmc/regression/jbmc/LocalVarTable5/test.desc similarity index 100% rename from regression/cbmc-java/LocalVarTable5/test.desc rename to jbmc/regression/jbmc/LocalVarTable5/test.desc diff --git a/regression/cbmc-java/LocalVarTable5/test.java b/jbmc/regression/jbmc/LocalVarTable5/test.java similarity index 100% rename from regression/cbmc-java/LocalVarTable5/test.java rename to jbmc/regression/jbmc/LocalVarTable5/test.java diff --git a/jbmc/regression/jbmc/Makefile b/jbmc/regression/jbmc/Makefile new file mode 100644 index 00000000000..04d5932c7b7 --- /dev/null +++ b/jbmc/regression/jbmc/Makefile @@ -0,0 +1,36 @@ +default: tests.log + +include ../../src/config.inc + +test: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + +show: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + vim -o "$$dir/*.java" "$$dir/*.out"; \ + fi; \ + done; + +clean: + find -name '*.out' -execdir $(RM) '{}' \; + find -name '*.gb' -execdir $(RM) '{}' \; + $(RM) tests.log + +%.class: %.java ../../src/org.cprover.jar + javac -g -cp ../../src/org.cprover.jar:. $< + +nondet_java_files := $(shell find . -name "Nondet*.java") +nondet_class_files := $(patsubst %.java, %.class, $(nondet_java_files)) + +.PHONY: nondet-class-files +nondet-class-files: $(nondet_class_files) + +.PHONY: clean-nondet-class-files +clean-nondet-class-files: + -rm $(nondet_class_files) diff --git a/regression/cbmc-java/NegativeArraySizeException1/NegativeArraySizeExceptionTest.class b/jbmc/regression/jbmc/NegativeArraySizeException1/NegativeArraySizeExceptionTest.class similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException1/NegativeArraySizeExceptionTest.class rename to jbmc/regression/jbmc/NegativeArraySizeException1/NegativeArraySizeExceptionTest.class diff --git a/regression/cbmc-java/NegativeArraySizeException1/NegativeArraySizeExceptionTest.java b/jbmc/regression/jbmc/NegativeArraySizeException1/NegativeArraySizeExceptionTest.java similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException1/NegativeArraySizeExceptionTest.java rename to jbmc/regression/jbmc/NegativeArraySizeException1/NegativeArraySizeExceptionTest.java diff --git a/regression/cbmc-java/NegativeArraySizeException1/test.desc b/jbmc/regression/jbmc/NegativeArraySizeException1/test.desc similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException1/test.desc rename to jbmc/regression/jbmc/NegativeArraySizeException1/test.desc diff --git a/regression/cbmc-java/NegativeArraySizeException2/NegativeArraySizeExceptionTest.class b/jbmc/regression/jbmc/NegativeArraySizeException2/NegativeArraySizeExceptionTest.class similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/NegativeArraySizeExceptionTest.class rename to jbmc/regression/jbmc/NegativeArraySizeException2/NegativeArraySizeExceptionTest.class diff --git a/regression/cbmc-java/NegativeArraySizeException2/NegativeArraySizeExceptionTest.java b/jbmc/regression/jbmc/NegativeArraySizeException2/NegativeArraySizeExceptionTest.java similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/NegativeArraySizeExceptionTest.java rename to jbmc/regression/jbmc/NegativeArraySizeException2/NegativeArraySizeExceptionTest.java diff --git a/regression/cbmc-java/NegativeArraySizeException2/java/lang/NegativeArraySizeException.class b/jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/NegativeArraySizeException.class similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/java/lang/NegativeArraySizeException.class rename to jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/NegativeArraySizeException.class diff --git a/regression/cbmc-java/NegativeArraySizeException2/java/lang/NegativeArraySizeException.java b/jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/NegativeArraySizeException.java similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/java/lang/NegativeArraySizeException.java rename to jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/NegativeArraySizeException.java diff --git a/regression/cbmc-java/NegativeArraySizeException2/java/lang/RuntimeException.class b/jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/RuntimeException.class similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/java/lang/RuntimeException.class rename to jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/RuntimeException.class diff --git a/regression/cbmc-java/NegativeArraySizeException2/java/lang/RuntimeException.java b/jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/RuntimeException.java similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/java/lang/RuntimeException.java rename to jbmc/regression/jbmc/NegativeArraySizeException2/java/lang/RuntimeException.java diff --git a/regression/cbmc-java/NegativeArraySizeException2/test.desc b/jbmc/regression/jbmc/NegativeArraySizeException2/test.desc similarity index 100% rename from regression/cbmc-java/NegativeArraySizeException2/test.desc rename to jbmc/regression/jbmc/NegativeArraySizeException2/test.desc diff --git a/regression/cbmc-java/NondetArray/NondetArray.class b/jbmc/regression/jbmc/NondetArray/NondetArray.class similarity index 100% rename from regression/cbmc-java/NondetArray/NondetArray.class rename to jbmc/regression/jbmc/NondetArray/NondetArray.class diff --git a/regression/cbmc-java/NondetArray/NondetArray.java b/jbmc/regression/jbmc/NondetArray/NondetArray.java similarity index 100% rename from regression/cbmc-java/NondetArray/NondetArray.java rename to jbmc/regression/jbmc/NondetArray/NondetArray.java diff --git a/regression/cbmc-java/NondetArray/test.desc b/jbmc/regression/jbmc/NondetArray/test.desc similarity index 100% rename from regression/cbmc-java/NondetArray/test.desc rename to jbmc/regression/jbmc/NondetArray/test.desc diff --git a/regression/cbmc-java/NondetArray2/NondetArray2.class b/jbmc/regression/jbmc/NondetArray2/NondetArray2.class similarity index 100% rename from regression/cbmc-java/NondetArray2/NondetArray2.class rename to jbmc/regression/jbmc/NondetArray2/NondetArray2.class diff --git a/regression/cbmc-java/NondetArray2/NondetArray2.java b/jbmc/regression/jbmc/NondetArray2/NondetArray2.java similarity index 100% rename from regression/cbmc-java/NondetArray2/NondetArray2.java rename to jbmc/regression/jbmc/NondetArray2/NondetArray2.java diff --git a/regression/cbmc-java/NondetArray2/test.desc b/jbmc/regression/jbmc/NondetArray2/test.desc similarity index 100% rename from regression/cbmc-java/NondetArray2/test.desc rename to jbmc/regression/jbmc/NondetArray2/test.desc diff --git a/regression/cbmc-java/NondetArray3/NondetArray3.class b/jbmc/regression/jbmc/NondetArray3/NondetArray3.class similarity index 100% rename from regression/cbmc-java/NondetArray3/NondetArray3.class rename to jbmc/regression/jbmc/NondetArray3/NondetArray3.class diff --git a/regression/cbmc-java/NondetArray3/NondetArray3.java b/jbmc/regression/jbmc/NondetArray3/NondetArray3.java similarity index 100% rename from regression/cbmc-java/NondetArray3/NondetArray3.java rename to jbmc/regression/jbmc/NondetArray3/NondetArray3.java diff --git a/regression/cbmc-java/NondetArray3/test.desc b/jbmc/regression/jbmc/NondetArray3/test.desc similarity index 100% rename from regression/cbmc-java/NondetArray3/test.desc rename to jbmc/regression/jbmc/NondetArray3/test.desc diff --git a/regression/cbmc-java/NondetArray4/NondetArray4.class b/jbmc/regression/jbmc/NondetArray4/NondetArray4.class similarity index 100% rename from regression/cbmc-java/NondetArray4/NondetArray4.class rename to jbmc/regression/jbmc/NondetArray4/NondetArray4.class diff --git a/regression/cbmc-java/NondetArray4/NondetArray4.java b/jbmc/regression/jbmc/NondetArray4/NondetArray4.java similarity index 100% rename from regression/cbmc-java/NondetArray4/NondetArray4.java rename to jbmc/regression/jbmc/NondetArray4/NondetArray4.java diff --git a/regression/cbmc-java/NondetArray4/test.desc b/jbmc/regression/jbmc/NondetArray4/test.desc similarity index 100% rename from regression/cbmc-java/NondetArray4/test.desc rename to jbmc/regression/jbmc/NondetArray4/test.desc diff --git a/regression/cbmc-java/NondetAssume1/NondetAssume1.class b/jbmc/regression/jbmc/NondetAssume1/NondetAssume1.class similarity index 100% rename from regression/cbmc-java/NondetAssume1/NondetAssume1.class rename to jbmc/regression/jbmc/NondetAssume1/NondetAssume1.class diff --git a/regression/cbmc-java/NondetAssume1/NondetAssume1.java b/jbmc/regression/jbmc/NondetAssume1/NondetAssume1.java similarity index 100% rename from regression/cbmc-java/NondetAssume1/NondetAssume1.java rename to jbmc/regression/jbmc/NondetAssume1/NondetAssume1.java diff --git a/regression/cbmc-java/NondetAssume1/test.desc b/jbmc/regression/jbmc/NondetAssume1/test.desc similarity index 100% rename from regression/cbmc-java/NondetAssume1/test.desc rename to jbmc/regression/jbmc/NondetAssume1/test.desc diff --git a/regression/cbmc-java/NondetAssume2/A.class b/jbmc/regression/jbmc/NondetAssume2/A.class similarity index 100% rename from regression/cbmc-java/NondetAssume2/A.class rename to jbmc/regression/jbmc/NondetAssume2/A.class diff --git a/regression/cbmc-java/NondetAssume2/B.class b/jbmc/regression/jbmc/NondetAssume2/B.class similarity index 100% rename from regression/cbmc-java/NondetAssume2/B.class rename to jbmc/regression/jbmc/NondetAssume2/B.class diff --git a/regression/cbmc-java/NondetAssume2/C.class b/jbmc/regression/jbmc/NondetAssume2/C.class similarity index 100% rename from regression/cbmc-java/NondetAssume2/C.class rename to jbmc/regression/jbmc/NondetAssume2/C.class diff --git a/regression/cbmc-java/NondetAssume2/NondetAssume2.class b/jbmc/regression/jbmc/NondetAssume2/NondetAssume2.class similarity index 100% rename from regression/cbmc-java/NondetAssume2/NondetAssume2.class rename to jbmc/regression/jbmc/NondetAssume2/NondetAssume2.class diff --git a/regression/cbmc-java/NondetAssume2/NondetAssume2.java b/jbmc/regression/jbmc/NondetAssume2/NondetAssume2.java similarity index 100% rename from regression/cbmc-java/NondetAssume2/NondetAssume2.java rename to jbmc/regression/jbmc/NondetAssume2/NondetAssume2.java diff --git a/regression/cbmc-java/NondetAssume2/test.desc b/jbmc/regression/jbmc/NondetAssume2/test.desc similarity index 100% rename from regression/cbmc-java/NondetAssume2/test.desc rename to jbmc/regression/jbmc/NondetAssume2/test.desc diff --git a/regression/cbmc-java/NondetBoolean/NondetBoolean.class b/jbmc/regression/jbmc/NondetBoolean/NondetBoolean.class similarity index 100% rename from regression/cbmc-java/NondetBoolean/NondetBoolean.class rename to jbmc/regression/jbmc/NondetBoolean/NondetBoolean.class diff --git a/regression/cbmc-java/NondetBoolean/NondetBoolean.java b/jbmc/regression/jbmc/NondetBoolean/NondetBoolean.java similarity index 100% rename from regression/cbmc-java/NondetBoolean/NondetBoolean.java rename to jbmc/regression/jbmc/NondetBoolean/NondetBoolean.java diff --git a/regression/cbmc-java/NondetBoolean/test.desc b/jbmc/regression/jbmc/NondetBoolean/test.desc similarity index 100% rename from regression/cbmc-java/NondetBoolean/test.desc rename to jbmc/regression/jbmc/NondetBoolean/test.desc diff --git a/regression/cbmc-java/NondetByte/NondetByte.class b/jbmc/regression/jbmc/NondetByte/NondetByte.class similarity index 100% rename from regression/cbmc-java/NondetByte/NondetByte.class rename to jbmc/regression/jbmc/NondetByte/NondetByte.class diff --git a/regression/cbmc-java/NondetByte/NondetByte.java b/jbmc/regression/jbmc/NondetByte/NondetByte.java similarity index 100% rename from regression/cbmc-java/NondetByte/NondetByte.java rename to jbmc/regression/jbmc/NondetByte/NondetByte.java diff --git a/regression/cbmc-java/NondetByte/test.desc b/jbmc/regression/jbmc/NondetByte/test.desc similarity index 100% rename from regression/cbmc-java/NondetByte/test.desc rename to jbmc/regression/jbmc/NondetByte/test.desc diff --git a/regression/cbmc-java/NondetCastToObject/NondetCastToObject.class b/jbmc/regression/jbmc/NondetCastToObject/NondetCastToObject.class similarity index 100% rename from regression/cbmc-java/NondetCastToObject/NondetCastToObject.class rename to jbmc/regression/jbmc/NondetCastToObject/NondetCastToObject.class diff --git a/regression/cbmc-java/NondetCastToObject/NondetCastToObject.java b/jbmc/regression/jbmc/NondetCastToObject/NondetCastToObject.java similarity index 100% rename from regression/cbmc-java/NondetCastToObject/NondetCastToObject.java rename to jbmc/regression/jbmc/NondetCastToObject/NondetCastToObject.java diff --git a/regression/cbmc-java/NondetCastToObject/test.desc b/jbmc/regression/jbmc/NondetCastToObject/test.desc similarity index 100% rename from regression/cbmc-java/NondetCastToObject/test.desc rename to jbmc/regression/jbmc/NondetCastToObject/test.desc diff --git a/regression/cbmc-java/NondetChar/NondetChar.class b/jbmc/regression/jbmc/NondetChar/NondetChar.class similarity index 100% rename from regression/cbmc-java/NondetChar/NondetChar.class rename to jbmc/regression/jbmc/NondetChar/NondetChar.class diff --git a/regression/cbmc-java/NondetChar/NondetChar.java b/jbmc/regression/jbmc/NondetChar/NondetChar.java similarity index 100% rename from regression/cbmc-java/NondetChar/NondetChar.java rename to jbmc/regression/jbmc/NondetChar/NondetChar.java diff --git a/regression/cbmc-java/NondetChar/test.desc b/jbmc/regression/jbmc/NondetChar/test.desc similarity index 100% rename from regression/cbmc-java/NondetChar/test.desc rename to jbmc/regression/jbmc/NondetChar/test.desc diff --git a/regression/cbmc-java/NondetDirectFromMethod/A.class b/jbmc/regression/jbmc/NondetDirectFromMethod/A.class similarity index 100% rename from regression/cbmc-java/NondetDirectFromMethod/A.class rename to jbmc/regression/jbmc/NondetDirectFromMethod/A.class diff --git a/regression/cbmc-java/NondetDirectFromMethod/NondetDirectFromMethod.class b/jbmc/regression/jbmc/NondetDirectFromMethod/NondetDirectFromMethod.class similarity index 100% rename from regression/cbmc-java/NondetDirectFromMethod/NondetDirectFromMethod.class rename to jbmc/regression/jbmc/NondetDirectFromMethod/NondetDirectFromMethod.class diff --git a/regression/cbmc-java/NondetDirectFromMethod/NondetDirectFromMethod.java b/jbmc/regression/jbmc/NondetDirectFromMethod/NondetDirectFromMethod.java similarity index 100% rename from regression/cbmc-java/NondetDirectFromMethod/NondetDirectFromMethod.java rename to jbmc/regression/jbmc/NondetDirectFromMethod/NondetDirectFromMethod.java diff --git a/regression/cbmc-java/NondetDirectFromMethod/test.desc b/jbmc/regression/jbmc/NondetDirectFromMethod/test.desc similarity index 100% rename from regression/cbmc-java/NondetDirectFromMethod/test.desc rename to jbmc/regression/jbmc/NondetDirectFromMethod/test.desc diff --git a/regression/cbmc-java/NondetDouble/NondetDouble.class b/jbmc/regression/jbmc/NondetDouble/NondetDouble.class similarity index 100% rename from regression/cbmc-java/NondetDouble/NondetDouble.class rename to jbmc/regression/jbmc/NondetDouble/NondetDouble.class diff --git a/regression/cbmc-java/NondetDouble/NondetDouble.java b/jbmc/regression/jbmc/NondetDouble/NondetDouble.java similarity index 100% rename from regression/cbmc-java/NondetDouble/NondetDouble.java rename to jbmc/regression/jbmc/NondetDouble/NondetDouble.java diff --git a/regression/cbmc-java/NondetDouble/test.desc b/jbmc/regression/jbmc/NondetDouble/test.desc similarity index 100% rename from regression/cbmc-java/NondetDouble/test.desc rename to jbmc/regression/jbmc/NondetDouble/test.desc diff --git a/regression/cbmc-java/NondetFloat/NondetFloat.class b/jbmc/regression/jbmc/NondetFloat/NondetFloat.class similarity index 100% rename from regression/cbmc-java/NondetFloat/NondetFloat.class rename to jbmc/regression/jbmc/NondetFloat/NondetFloat.class diff --git a/regression/cbmc-java/NondetFloat/NondetFloat.java b/jbmc/regression/jbmc/NondetFloat/NondetFloat.java similarity index 100% rename from regression/cbmc-java/NondetFloat/NondetFloat.java rename to jbmc/regression/jbmc/NondetFloat/NondetFloat.java diff --git a/regression/cbmc-java/NondetFloat/test.desc b/jbmc/regression/jbmc/NondetFloat/test.desc similarity index 100% rename from regression/cbmc-java/NondetFloat/test.desc rename to jbmc/regression/jbmc/NondetFloat/test.desc diff --git a/regression/cbmc-java/NondetGenericArray/A.class b/jbmc/regression/jbmc/NondetGenericArray/A.class similarity index 100% rename from regression/cbmc-java/NondetGenericArray/A.class rename to jbmc/regression/jbmc/NondetGenericArray/A.class diff --git a/regression/cbmc-java/NondetGenericArray/B.class b/jbmc/regression/jbmc/NondetGenericArray/B.class similarity index 100% rename from regression/cbmc-java/NondetGenericArray/B.class rename to jbmc/regression/jbmc/NondetGenericArray/B.class diff --git a/regression/cbmc-java/NondetGenericArray/C.class b/jbmc/regression/jbmc/NondetGenericArray/C.class similarity index 100% rename from regression/cbmc-java/NondetGenericArray/C.class rename to jbmc/regression/jbmc/NondetGenericArray/C.class diff --git a/regression/cbmc-java/NondetGenericArray/NondetGenericArray.class b/jbmc/regression/jbmc/NondetGenericArray/NondetGenericArray.class similarity index 100% rename from regression/cbmc-java/NondetGenericArray/NondetGenericArray.class rename to jbmc/regression/jbmc/NondetGenericArray/NondetGenericArray.class diff --git a/regression/cbmc-java/NondetGenericArray/NondetGenericArray.java b/jbmc/regression/jbmc/NondetGenericArray/NondetGenericArray.java similarity index 100% rename from regression/cbmc-java/NondetGenericArray/NondetGenericArray.java rename to jbmc/regression/jbmc/NondetGenericArray/NondetGenericArray.java diff --git a/regression/cbmc-java/NondetGenericArray/test.desc b/jbmc/regression/jbmc/NondetGenericArray/test.desc similarity index 100% rename from regression/cbmc-java/NondetGenericArray/test.desc rename to jbmc/regression/jbmc/NondetGenericArray/test.desc diff --git a/regression/cbmc-java/NondetGenericRecursive/A.class b/jbmc/regression/jbmc/NondetGenericRecursive/A.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive/A.class rename to jbmc/regression/jbmc/NondetGenericRecursive/A.class diff --git a/regression/cbmc-java/NondetGenericRecursive/B.class b/jbmc/regression/jbmc/NondetGenericRecursive/B.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive/B.class rename to jbmc/regression/jbmc/NondetGenericRecursive/B.class diff --git a/regression/cbmc-java/NondetGenericRecursive/C.class b/jbmc/regression/jbmc/NondetGenericRecursive/C.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive/C.class rename to jbmc/regression/jbmc/NondetGenericRecursive/C.class diff --git a/regression/cbmc-java/NondetGenericRecursive/NondetGenericRecursive.class b/jbmc/regression/jbmc/NondetGenericRecursive/NondetGenericRecursive.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive/NondetGenericRecursive.class rename to jbmc/regression/jbmc/NondetGenericRecursive/NondetGenericRecursive.class diff --git a/regression/cbmc-java/NondetGenericRecursive/NondetGenericRecursive.java b/jbmc/regression/jbmc/NondetGenericRecursive/NondetGenericRecursive.java similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive/NondetGenericRecursive.java rename to jbmc/regression/jbmc/NondetGenericRecursive/NondetGenericRecursive.java diff --git a/regression/cbmc-java/NondetGenericRecursive/test.desc b/jbmc/regression/jbmc/NondetGenericRecursive/test.desc similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive/test.desc rename to jbmc/regression/jbmc/NondetGenericRecursive/test.desc diff --git a/regression/cbmc-java/NondetGenericRecursive2/A.class b/jbmc/regression/jbmc/NondetGenericRecursive2/A.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive2/A.class rename to jbmc/regression/jbmc/NondetGenericRecursive2/A.class diff --git a/regression/cbmc-java/NondetGenericRecursive2/B.class b/jbmc/regression/jbmc/NondetGenericRecursive2/B.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive2/B.class rename to jbmc/regression/jbmc/NondetGenericRecursive2/B.class diff --git a/regression/cbmc-java/NondetGenericRecursive2/C.class b/jbmc/regression/jbmc/NondetGenericRecursive2/C.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive2/C.class rename to jbmc/regression/jbmc/NondetGenericRecursive2/C.class diff --git a/regression/cbmc-java/NondetGenericRecursive2/NondetGenericRecursive2.class b/jbmc/regression/jbmc/NondetGenericRecursive2/NondetGenericRecursive2.class similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive2/NondetGenericRecursive2.class rename to jbmc/regression/jbmc/NondetGenericRecursive2/NondetGenericRecursive2.class diff --git a/regression/cbmc-java/NondetGenericRecursive2/NondetGenericRecursive2.java b/jbmc/regression/jbmc/NondetGenericRecursive2/NondetGenericRecursive2.java similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive2/NondetGenericRecursive2.java rename to jbmc/regression/jbmc/NondetGenericRecursive2/NondetGenericRecursive2.java diff --git a/regression/cbmc-java/NondetGenericRecursive2/test.desc b/jbmc/regression/jbmc/NondetGenericRecursive2/test.desc similarity index 100% rename from regression/cbmc-java/NondetGenericRecursive2/test.desc rename to jbmc/regression/jbmc/NondetGenericRecursive2/test.desc diff --git a/regression/cbmc-java/NondetGenericWithNull/B.class b/jbmc/regression/jbmc/NondetGenericWithNull/B.class similarity index 100% rename from regression/cbmc-java/NondetGenericWithNull/B.class rename to jbmc/regression/jbmc/NondetGenericWithNull/B.class diff --git a/regression/cbmc-java/NondetGenericWithNull/NondetGenericWithNull.class b/jbmc/regression/jbmc/NondetGenericWithNull/NondetGenericWithNull.class similarity index 100% rename from regression/cbmc-java/NondetGenericWithNull/NondetGenericWithNull.class rename to jbmc/regression/jbmc/NondetGenericWithNull/NondetGenericWithNull.class diff --git a/regression/cbmc-java/NondetGenericWithNull/NondetGenericWithNull.java b/jbmc/regression/jbmc/NondetGenericWithNull/NondetGenericWithNull.java similarity index 100% rename from regression/cbmc-java/NondetGenericWithNull/NondetGenericWithNull.java rename to jbmc/regression/jbmc/NondetGenericWithNull/NondetGenericWithNull.java diff --git a/regression/cbmc-java/NondetGenericWithNull/test.desc b/jbmc/regression/jbmc/NondetGenericWithNull/test.desc similarity index 100% rename from regression/cbmc-java/NondetGenericWithNull/test.desc rename to jbmc/regression/jbmc/NondetGenericWithNull/test.desc diff --git a/regression/cbmc-java/NondetGenericWithoutNull/B.class b/jbmc/regression/jbmc/NondetGenericWithoutNull/B.class similarity index 100% rename from regression/cbmc-java/NondetGenericWithoutNull/B.class rename to jbmc/regression/jbmc/NondetGenericWithoutNull/B.class diff --git a/regression/cbmc-java/NondetGenericWithoutNull/NondetGenericWithoutNull.class b/jbmc/regression/jbmc/NondetGenericWithoutNull/NondetGenericWithoutNull.class similarity index 100% rename from regression/cbmc-java/NondetGenericWithoutNull/NondetGenericWithoutNull.class rename to jbmc/regression/jbmc/NondetGenericWithoutNull/NondetGenericWithoutNull.class diff --git a/regression/cbmc-java/NondetGenericWithoutNull/NondetGenericWithoutNull.java b/jbmc/regression/jbmc/NondetGenericWithoutNull/NondetGenericWithoutNull.java similarity index 100% rename from regression/cbmc-java/NondetGenericWithoutNull/NondetGenericWithoutNull.java rename to jbmc/regression/jbmc/NondetGenericWithoutNull/NondetGenericWithoutNull.java diff --git a/regression/cbmc-java/NondetGenericWithoutNull/test.desc b/jbmc/regression/jbmc/NondetGenericWithoutNull/test.desc similarity index 100% rename from regression/cbmc-java/NondetGenericWithoutNull/test.desc rename to jbmc/regression/jbmc/NondetGenericWithoutNull/test.desc diff --git a/regression/cbmc-java/NondetInit/Test.class b/jbmc/regression/jbmc/NondetInit/Test.class similarity index 100% rename from regression/cbmc-java/NondetInit/Test.class rename to jbmc/regression/jbmc/NondetInit/Test.class diff --git a/regression/cbmc-java/NondetInit/Test.java b/jbmc/regression/jbmc/NondetInit/Test.java similarity index 100% rename from regression/cbmc-java/NondetInit/Test.java rename to jbmc/regression/jbmc/NondetInit/Test.java diff --git a/regression/cbmc-java/NondetInit/test.desc b/jbmc/regression/jbmc/NondetInit/test.desc similarity index 100% rename from regression/cbmc-java/NondetInit/test.desc rename to jbmc/regression/jbmc/NondetInit/test.desc diff --git a/regression/cbmc-java/NondetInit/test_lazy.desc b/jbmc/regression/jbmc/NondetInit/test_lazy.desc similarity index 100% rename from regression/cbmc-java/NondetInit/test_lazy.desc rename to jbmc/regression/jbmc/NondetInit/test_lazy.desc diff --git a/regression/cbmc-java/NondetInit2/Test.class b/jbmc/regression/jbmc/NondetInit2/Test.class similarity index 100% rename from regression/cbmc-java/NondetInit2/Test.class rename to jbmc/regression/jbmc/NondetInit2/Test.class diff --git a/regression/cbmc-java/NondetInit2/Test.java b/jbmc/regression/jbmc/NondetInit2/Test.java similarity index 100% rename from regression/cbmc-java/NondetInit2/Test.java rename to jbmc/regression/jbmc/NondetInit2/Test.java diff --git a/regression/cbmc-java/NondetInit2/test.desc b/jbmc/regression/jbmc/NondetInit2/test.desc similarity index 100% rename from regression/cbmc-java/NondetInit2/test.desc rename to jbmc/regression/jbmc/NondetInit2/test.desc diff --git a/regression/cbmc-java/NondetInit3/Subclass.class b/jbmc/regression/jbmc/NondetInit3/Subclass.class similarity index 100% rename from regression/cbmc-java/NondetInit3/Subclass.class rename to jbmc/regression/jbmc/NondetInit3/Subclass.class diff --git a/regression/cbmc-java/NondetInit3/Test.class b/jbmc/regression/jbmc/NondetInit3/Test.class similarity index 100% rename from regression/cbmc-java/NondetInit3/Test.class rename to jbmc/regression/jbmc/NondetInit3/Test.class diff --git a/regression/cbmc-java/NondetInit3/Test.java b/jbmc/regression/jbmc/NondetInit3/Test.java similarity index 100% rename from regression/cbmc-java/NondetInit3/Test.java rename to jbmc/regression/jbmc/NondetInit3/Test.java diff --git a/regression/cbmc-java/NondetInit3/test.desc b/jbmc/regression/jbmc/NondetInit3/test.desc similarity index 100% rename from regression/cbmc-java/NondetInit3/test.desc rename to jbmc/regression/jbmc/NondetInit3/test.desc diff --git a/regression/cbmc-java/NondetInt/NondetInt.class b/jbmc/regression/jbmc/NondetInt/NondetInt.class similarity index 100% rename from regression/cbmc-java/NondetInt/NondetInt.class rename to jbmc/regression/jbmc/NondetInt/NondetInt.class diff --git a/regression/cbmc-java/NondetInt/NondetInt.java b/jbmc/regression/jbmc/NondetInt/NondetInt.java similarity index 100% rename from regression/cbmc-java/NondetInt/NondetInt.java rename to jbmc/regression/jbmc/NondetInt/NondetInt.java diff --git a/regression/cbmc-java/NondetInt/test.desc b/jbmc/regression/jbmc/NondetInt/test.desc similarity index 100% rename from regression/cbmc-java/NondetInt/test.desc rename to jbmc/regression/jbmc/NondetInt/test.desc diff --git a/regression/cbmc-java/NondetLong/NondetLong.class b/jbmc/regression/jbmc/NondetLong/NondetLong.class similarity index 100% rename from regression/cbmc-java/NondetLong/NondetLong.class rename to jbmc/regression/jbmc/NondetLong/NondetLong.class diff --git a/regression/cbmc-java/NondetLong/NondetLong.java b/jbmc/regression/jbmc/NondetLong/NondetLong.java similarity index 100% rename from regression/cbmc-java/NondetLong/NondetLong.java rename to jbmc/regression/jbmc/NondetLong/NondetLong.java diff --git a/regression/cbmc-java/NondetLong/test.desc b/jbmc/regression/jbmc/NondetLong/test.desc similarity index 100% rename from regression/cbmc-java/NondetLong/test.desc rename to jbmc/regression/jbmc/NondetLong/test.desc diff --git a/regression/cbmc-java/NondetShort/NondetShort.class b/jbmc/regression/jbmc/NondetShort/NondetShort.class similarity index 100% rename from regression/cbmc-java/NondetShort/NondetShort.class rename to jbmc/regression/jbmc/NondetShort/NondetShort.class diff --git a/regression/cbmc-java/NondetShort/NondetShort.java b/jbmc/regression/jbmc/NondetShort/NondetShort.java similarity index 100% rename from regression/cbmc-java/NondetShort/NondetShort.java rename to jbmc/regression/jbmc/NondetShort/NondetShort.java diff --git a/regression/cbmc-java/NondetShort/test.desc b/jbmc/regression/jbmc/NondetShort/test.desc similarity index 100% rename from regression/cbmc-java/NondetShort/test.desc rename to jbmc/regression/jbmc/NondetShort/test.desc diff --git a/regression/cbmc-java/NullPointer1/A.class b/jbmc/regression/jbmc/NullPointer1/A.class similarity index 100% rename from regression/cbmc-java/NullPointer1/A.class rename to jbmc/regression/jbmc/NullPointer1/A.class diff --git a/regression/cbmc-java/NullPointer1/B.class b/jbmc/regression/jbmc/NullPointer1/B.class similarity index 100% rename from regression/cbmc-java/NullPointer1/B.class rename to jbmc/regression/jbmc/NullPointer1/B.class diff --git a/regression/cbmc-java/NullPointer1/NullPointer1.class b/jbmc/regression/jbmc/NullPointer1/NullPointer1.class similarity index 100% rename from regression/cbmc-java/NullPointer1/NullPointer1.class rename to jbmc/regression/jbmc/NullPointer1/NullPointer1.class diff --git a/regression/cbmc-java/NullPointer1/NullPointer1.java b/jbmc/regression/jbmc/NullPointer1/NullPointer1.java similarity index 100% rename from regression/cbmc-java/NullPointer1/NullPointer1.java rename to jbmc/regression/jbmc/NullPointer1/NullPointer1.java diff --git a/regression/cbmc-java/NullPointer1/test.desc b/jbmc/regression/jbmc/NullPointer1/test.desc similarity index 100% rename from regression/cbmc-java/NullPointer1/test.desc rename to jbmc/regression/jbmc/NullPointer1/test.desc diff --git a/regression/cbmc-java/NullPointer2/NullPointer2.class b/jbmc/regression/jbmc/NullPointer2/NullPointer2.class similarity index 100% rename from regression/cbmc-java/NullPointer2/NullPointer2.class rename to jbmc/regression/jbmc/NullPointer2/NullPointer2.class diff --git a/regression/cbmc-java/NullPointer2/NullPointer2.java b/jbmc/regression/jbmc/NullPointer2/NullPointer2.java similarity index 100% rename from regression/cbmc-java/NullPointer2/NullPointer2.java rename to jbmc/regression/jbmc/NullPointer2/NullPointer2.java diff --git a/regression/cbmc-java/NullPointer2/test.desc b/jbmc/regression/jbmc/NullPointer2/test.desc similarity index 100% rename from regression/cbmc-java/NullPointer2/test.desc rename to jbmc/regression/jbmc/NullPointer2/test.desc diff --git a/regression/cbmc-java/NullPointer3/NullPointer3.class b/jbmc/regression/jbmc/NullPointer3/NullPointer3.class similarity index 100% rename from regression/cbmc-java/NullPointer3/NullPointer3.class rename to jbmc/regression/jbmc/NullPointer3/NullPointer3.class diff --git a/regression/cbmc-java/NullPointer3/NullPointer3.java b/jbmc/regression/jbmc/NullPointer3/NullPointer3.java similarity index 100% rename from regression/cbmc-java/NullPointer3/NullPointer3.java rename to jbmc/regression/jbmc/NullPointer3/NullPointer3.java diff --git a/regression/cbmc-java/NullPointer3/test.desc b/jbmc/regression/jbmc/NullPointer3/test.desc similarity index 100% rename from regression/cbmc-java/NullPointer3/test.desc rename to jbmc/regression/jbmc/NullPointer3/test.desc diff --git a/regression/cbmc-java/NullPointer4/NullPointer4.class b/jbmc/regression/jbmc/NullPointer4/NullPointer4.class similarity index 100% rename from regression/cbmc-java/NullPointer4/NullPointer4.class rename to jbmc/regression/jbmc/NullPointer4/NullPointer4.class diff --git a/regression/cbmc-java/NullPointer4/NullPointer4.java b/jbmc/regression/jbmc/NullPointer4/NullPointer4.java similarity index 100% rename from regression/cbmc-java/NullPointer4/NullPointer4.java rename to jbmc/regression/jbmc/NullPointer4/NullPointer4.java diff --git a/regression/cbmc-java/NullPointer4/test.desc b/jbmc/regression/jbmc/NullPointer4/test.desc similarity index 100% rename from regression/cbmc-java/NullPointer4/test.desc rename to jbmc/regression/jbmc/NullPointer4/test.desc diff --git a/regression/cbmc-java/NullPointerException1/Main.class b/jbmc/regression/jbmc/NullPointerException1/Main.class similarity index 100% rename from regression/cbmc-java/NullPointerException1/Main.class rename to jbmc/regression/jbmc/NullPointerException1/Main.class diff --git a/regression/cbmc-java/NullPointerException1/Main.java b/jbmc/regression/jbmc/NullPointerException1/Main.java similarity index 100% rename from regression/cbmc-java/NullPointerException1/Main.java rename to jbmc/regression/jbmc/NullPointerException1/Main.java diff --git a/regression/cbmc-java/NullPointerException1/test.desc b/jbmc/regression/jbmc/NullPointerException1/test.desc similarity index 100% rename from regression/cbmc-java/NullPointerException1/test.desc rename to jbmc/regression/jbmc/NullPointerException1/test.desc diff --git a/regression/cbmc-java/NullPointerException2/A.class b/jbmc/regression/jbmc/NullPointerException2/A.class similarity index 100% rename from regression/cbmc-java/NullPointerException2/A.class rename to jbmc/regression/jbmc/NullPointerException2/A.class diff --git a/regression/cbmc-java/NullPointerException2/B.class b/jbmc/regression/jbmc/NullPointerException2/B.class similarity index 100% rename from regression/cbmc-java/NullPointerException2/B.class rename to jbmc/regression/jbmc/NullPointerException2/B.class diff --git a/regression/cbmc-java/NullPointerException2/Test.class b/jbmc/regression/jbmc/NullPointerException2/Test.class similarity index 100% rename from regression/cbmc-java/NullPointerException2/Test.class rename to jbmc/regression/jbmc/NullPointerException2/Test.class diff --git a/regression/cbmc-java/NullPointerException2/Test.java b/jbmc/regression/jbmc/NullPointerException2/Test.java similarity index 100% rename from regression/cbmc-java/NullPointerException2/Test.java rename to jbmc/regression/jbmc/NullPointerException2/Test.java diff --git a/regression/cbmc-java/NullPointerException2/test.desc b/jbmc/regression/jbmc/NullPointerException2/test.desc similarity index 100% rename from regression/cbmc-java/NullPointerException2/test.desc rename to jbmc/regression/jbmc/NullPointerException2/test.desc diff --git a/regression/cbmc-java/NullPointerException3/A.class b/jbmc/regression/jbmc/NullPointerException3/A.class similarity index 100% rename from regression/cbmc-java/NullPointerException3/A.class rename to jbmc/regression/jbmc/NullPointerException3/A.class diff --git a/regression/cbmc-java/NullPointerException3/B.class b/jbmc/regression/jbmc/NullPointerException3/B.class similarity index 100% rename from regression/cbmc-java/NullPointerException3/B.class rename to jbmc/regression/jbmc/NullPointerException3/B.class diff --git a/regression/cbmc-java/NullPointerException3/Test.class b/jbmc/regression/jbmc/NullPointerException3/Test.class similarity index 100% rename from regression/cbmc-java/NullPointerException3/Test.class rename to jbmc/regression/jbmc/NullPointerException3/Test.class diff --git a/regression/cbmc-java/NullPointerException3/Test.java b/jbmc/regression/jbmc/NullPointerException3/Test.java similarity index 100% rename from regression/cbmc-java/NullPointerException3/Test.java rename to jbmc/regression/jbmc/NullPointerException3/Test.java diff --git a/regression/cbmc-java/NullPointerException3/test.desc b/jbmc/regression/jbmc/NullPointerException3/test.desc similarity index 100% rename from regression/cbmc-java/NullPointerException3/test.desc rename to jbmc/regression/jbmc/NullPointerException3/test.desc diff --git a/regression/cbmc-java/NullPointerException4/A.class b/jbmc/regression/jbmc/NullPointerException4/A.class similarity index 100% rename from regression/cbmc-java/NullPointerException4/A.class rename to jbmc/regression/jbmc/NullPointerException4/A.class diff --git a/regression/cbmc-java/NullPointerException4/Test.class b/jbmc/regression/jbmc/NullPointerException4/Test.class similarity index 100% rename from regression/cbmc-java/NullPointerException4/Test.class rename to jbmc/regression/jbmc/NullPointerException4/Test.class diff --git a/regression/cbmc-java/NullPointerException4/Test.java b/jbmc/regression/jbmc/NullPointerException4/Test.java similarity index 100% rename from regression/cbmc-java/NullPointerException4/Test.java rename to jbmc/regression/jbmc/NullPointerException4/Test.java diff --git a/regression/cbmc-java/NullPointerException4/java/lang/NullPointerException.class b/jbmc/regression/jbmc/NullPointerException4/java/lang/NullPointerException.class similarity index 100% rename from regression/cbmc-java/NullPointerException4/java/lang/NullPointerException.class rename to jbmc/regression/jbmc/NullPointerException4/java/lang/NullPointerException.class diff --git a/regression/cbmc-java/NullPointerException4/java/lang/NullPointerException.java b/jbmc/regression/jbmc/NullPointerException4/java/lang/NullPointerException.java similarity index 100% rename from regression/cbmc-java/NullPointerException4/java/lang/NullPointerException.java rename to jbmc/regression/jbmc/NullPointerException4/java/lang/NullPointerException.java diff --git a/regression/cbmc-java/NullPointerException4/java/lang/RuntimeException.class b/jbmc/regression/jbmc/NullPointerException4/java/lang/RuntimeException.class similarity index 100% rename from regression/cbmc-java/NullPointerException4/java/lang/RuntimeException.class rename to jbmc/regression/jbmc/NullPointerException4/java/lang/RuntimeException.class diff --git a/regression/cbmc-java/NullPointerException4/java/lang/RuntimeException.java b/jbmc/regression/jbmc/NullPointerException4/java/lang/RuntimeException.java similarity index 100% rename from regression/cbmc-java/NullPointerException4/java/lang/RuntimeException.java rename to jbmc/regression/jbmc/NullPointerException4/java/lang/RuntimeException.java diff --git a/regression/cbmc-java/NullPointerException4/test.desc b/jbmc/regression/jbmc/NullPointerException4/test.desc similarity index 100% rename from regression/cbmc-java/NullPointerException4/test.desc rename to jbmc/regression/jbmc/NullPointerException4/test.desc diff --git a/regression/cbmc-java/VarLengthArrayTrace1/Container.class b/jbmc/regression/jbmc/VarLengthArrayTrace1/Container.class similarity index 100% rename from regression/cbmc-java/VarLengthArrayTrace1/Container.class rename to jbmc/regression/jbmc/VarLengthArrayTrace1/Container.class diff --git a/regression/cbmc-java/VarLengthArrayTrace1/VarLengthArrayTrace1.class b/jbmc/regression/jbmc/VarLengthArrayTrace1/VarLengthArrayTrace1.class similarity index 100% rename from regression/cbmc-java/VarLengthArrayTrace1/VarLengthArrayTrace1.class rename to jbmc/regression/jbmc/VarLengthArrayTrace1/VarLengthArrayTrace1.class diff --git a/regression/cbmc-java/VarLengthArrayTrace1/VarLengthArrayTrace1.java b/jbmc/regression/jbmc/VarLengthArrayTrace1/VarLengthArrayTrace1.java similarity index 100% rename from regression/cbmc-java/VarLengthArrayTrace1/VarLengthArrayTrace1.java rename to jbmc/regression/jbmc/VarLengthArrayTrace1/VarLengthArrayTrace1.java diff --git a/regression/cbmc-java/VarLengthArrayTrace1/test.desc b/jbmc/regression/jbmc/VarLengthArrayTrace1/test.desc similarity index 100% rename from regression/cbmc-java/VarLengthArrayTrace1/test.desc rename to jbmc/regression/jbmc/VarLengthArrayTrace1/test.desc diff --git a/regression/cbmc-java/aastore_aaload1/A.class b/jbmc/regression/jbmc/aastore_aaload1/A.class similarity index 100% rename from regression/cbmc-java/aastore_aaload1/A.class rename to jbmc/regression/jbmc/aastore_aaload1/A.class diff --git a/regression/cbmc-java/aastore_aaload1/aastore_aaload1.class b/jbmc/regression/jbmc/aastore_aaload1/aastore_aaload1.class similarity index 100% rename from regression/cbmc-java/aastore_aaload1/aastore_aaload1.class rename to jbmc/regression/jbmc/aastore_aaload1/aastore_aaload1.class diff --git a/regression/cbmc-java/aastore_aaload1/aastore_aaload1.java b/jbmc/regression/jbmc/aastore_aaload1/aastore_aaload1.java similarity index 100% rename from regression/cbmc-java/aastore_aaload1/aastore_aaload1.java rename to jbmc/regression/jbmc/aastore_aaload1/aastore_aaload1.java diff --git a/regression/cbmc-java/aastore_aaload1/test.desc b/jbmc/regression/jbmc/aastore_aaload1/test.desc similarity index 100% rename from regression/cbmc-java/aastore_aaload1/test.desc rename to jbmc/regression/jbmc/aastore_aaload1/test.desc diff --git a/regression/cbmc-java/address_space_size_limit1/Test.class b/jbmc/regression/jbmc/address_space_size_limit1/Test.class similarity index 100% rename from regression/cbmc-java/address_space_size_limit1/Test.class rename to jbmc/regression/jbmc/address_space_size_limit1/Test.class diff --git a/regression/cbmc-java/address_space_size_limit1/Test.java b/jbmc/regression/jbmc/address_space_size_limit1/Test.java similarity index 100% rename from regression/cbmc-java/address_space_size_limit1/Test.java rename to jbmc/regression/jbmc/address_space_size_limit1/Test.java diff --git a/regression/cbmc-java/address_space_size_limit1/test.desc b/jbmc/regression/jbmc/address_space_size_limit1/test.desc similarity index 100% rename from regression/cbmc-java/address_space_size_limit1/test.desc rename to jbmc/regression/jbmc/address_space_size_limit1/test.desc diff --git a/regression/cbmc-java/address_space_size_limit2/Test.class b/jbmc/regression/jbmc/address_space_size_limit2/Test.class similarity index 100% rename from regression/cbmc-java/address_space_size_limit2/Test.class rename to jbmc/regression/jbmc/address_space_size_limit2/Test.class diff --git a/regression/cbmc-java/address_space_size_limit2/Test.java b/jbmc/regression/jbmc/address_space_size_limit2/Test.java similarity index 100% rename from regression/cbmc-java/address_space_size_limit2/Test.java rename to jbmc/regression/jbmc/address_space_size_limit2/Test.java diff --git a/regression/cbmc-java/address_space_size_limit2/test.desc b/jbmc/regression/jbmc/address_space_size_limit2/test.desc similarity index 100% rename from regression/cbmc-java/address_space_size_limit2/test.desc rename to jbmc/regression/jbmc/address_space_size_limit2/test.desc diff --git a/regression/cbmc-java/annotations1/ClassAnnotation.class b/jbmc/regression/jbmc/annotations1/ClassAnnotation.class similarity index 100% rename from regression/cbmc-java/annotations1/ClassAnnotation.class rename to jbmc/regression/jbmc/annotations1/ClassAnnotation.class diff --git a/regression/cbmc-java/annotations1/FieldAnnotation.class b/jbmc/regression/jbmc/annotations1/FieldAnnotation.class similarity index 100% rename from regression/cbmc-java/annotations1/FieldAnnotation.class rename to jbmc/regression/jbmc/annotations1/FieldAnnotation.class diff --git a/regression/cbmc-java/annotations1/MethodAnnotation.class b/jbmc/regression/jbmc/annotations1/MethodAnnotation.class similarity index 100% rename from regression/cbmc-java/annotations1/MethodAnnotation.class rename to jbmc/regression/jbmc/annotations1/MethodAnnotation.class diff --git a/regression/cbmc-java/annotations1/annotations.class b/jbmc/regression/jbmc/annotations1/annotations.class similarity index 100% rename from regression/cbmc-java/annotations1/annotations.class rename to jbmc/regression/jbmc/annotations1/annotations.class diff --git a/regression/cbmc-java/annotations1/annotations.java b/jbmc/regression/jbmc/annotations1/annotations.java similarity index 100% rename from regression/cbmc-java/annotations1/annotations.java rename to jbmc/regression/jbmc/annotations1/annotations.java diff --git a/regression/cbmc-java/annotations1/show_annotation_symbol.desc b/jbmc/regression/jbmc/annotations1/show_annotation_symbol.desc similarity index 100% rename from regression/cbmc-java/annotations1/show_annotation_symbol.desc rename to jbmc/regression/jbmc/annotations1/show_annotation_symbol.desc diff --git a/regression/cbmc-java/annotations2/FieldAnnotation.class b/jbmc/regression/jbmc/annotations2/FieldAnnotation.class similarity index 100% rename from regression/cbmc-java/annotations2/FieldAnnotation.class rename to jbmc/regression/jbmc/annotations2/FieldAnnotation.class diff --git a/regression/cbmc-java/annotations2/Test.class b/jbmc/regression/jbmc/annotations2/Test.class similarity index 100% rename from regression/cbmc-java/annotations2/Test.class rename to jbmc/regression/jbmc/annotations2/Test.class diff --git a/regression/cbmc-java/annotations2/Test.java b/jbmc/regression/jbmc/annotations2/Test.java similarity index 100% rename from regression/cbmc-java/annotations2/Test.java rename to jbmc/regression/jbmc/annotations2/Test.java diff --git a/regression/cbmc-java/annotations2/test.desc b/jbmc/regression/jbmc/annotations2/test.desc similarity index 100% rename from regression/cbmc-java/annotations2/test.desc rename to jbmc/regression/jbmc/annotations2/test.desc diff --git a/regression/cbmc-java/array1/array1.class b/jbmc/regression/jbmc/array1/array1.class similarity index 100% rename from regression/cbmc-java/array1/array1.class rename to jbmc/regression/jbmc/array1/array1.class diff --git a/regression/cbmc-java/array1/array1.java b/jbmc/regression/jbmc/array1/array1.java similarity index 100% rename from regression/cbmc-java/array1/array1.java rename to jbmc/regression/jbmc/array1/array1.java diff --git a/regression/cbmc-java/array1/test.desc b/jbmc/regression/jbmc/array1/test.desc similarity index 100% rename from regression/cbmc-java/array1/test.desc rename to jbmc/regression/jbmc/array1/test.desc diff --git a/regression/cbmc-java/array1/what_not.class b/jbmc/regression/jbmc/array1/what_not.class similarity index 100% rename from regression/cbmc-java/array1/what_not.class rename to jbmc/regression/jbmc/array1/what_not.class diff --git a/regression/cbmc-java/array1/what_not.java b/jbmc/regression/jbmc/array1/what_not.java similarity index 100% rename from regression/cbmc-java/array1/what_not.java rename to jbmc/regression/jbmc/array1/what_not.java diff --git a/regression/cbmc-java/array2/test.class b/jbmc/regression/jbmc/array2/test.class similarity index 100% rename from regression/cbmc-java/array2/test.class rename to jbmc/regression/jbmc/array2/test.class diff --git a/regression/cbmc-java/array2/test.desc b/jbmc/regression/jbmc/array2/test.desc similarity index 100% rename from regression/cbmc-java/array2/test.desc rename to jbmc/regression/jbmc/array2/test.desc diff --git a/regression/cbmc-java/array2/test.java b/jbmc/regression/jbmc/array2/test.java similarity index 100% rename from regression/cbmc-java/array2/test.java rename to jbmc/regression/jbmc/array2/test.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/A.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/A.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/A.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/A.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/A.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/A.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/A.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/A.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim1.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim1.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim1.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim1.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim1.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim1.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim1.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim1.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim2.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim2.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim2.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim2.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim2.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim2.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/FloatMultidim2.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/FloatMultidim2.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim1.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim1.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim1.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim1.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim1.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim1.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim1.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim1.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim2.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim2.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim2.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim2.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim2.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim2.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidim2.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidim2.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidimConstsize.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidimConstsize.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidimConstsize.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidimConstsize.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidimConstsize.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidimConstsize.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefMultidimConstsize.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefMultidimConstsize.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefSingledim.class b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefSingledim.class similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefSingledim.class rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefSingledim.class diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/RefSingledim.java b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefSingledim.java similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/RefSingledim.java rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/RefSingledim.java diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/test_float_multidim_1.desc b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_float_multidim_1.desc similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/test_float_multidim_1.desc rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_float_multidim_1.desc diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/test_float_multidim_2.desc b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_float_multidim_2.desc similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/test_float_multidim_2.desc rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_float_multidim_2.desc diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_multidim_1.desc b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_multidim_1.desc similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_multidim_1.desc rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_multidim_1.desc diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_multidim_2.desc b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_multidim_2.desc similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_multidim_2.desc rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_multidim_2.desc diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_multidim_constsize.desc b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_multidim_constsize.desc similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_multidim_constsize.desc rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_multidim_constsize.desc diff --git a/regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_singledim.desc b/jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_singledim.desc similarity index 100% rename from regression/cbmc-java/array_nonconstsize_nonconstaccess/test_ref_singledim.desc rename to jbmc/regression/jbmc/array_nonconstsize_nonconstaccess/test_ref_singledim.desc diff --git a/regression/cbmc-java/arraylength1/arraylength1.class b/jbmc/regression/jbmc/arraylength1/arraylength1.class similarity index 100% rename from regression/cbmc-java/arraylength1/arraylength1.class rename to jbmc/regression/jbmc/arraylength1/arraylength1.class diff --git a/regression/cbmc-java/arraylength1/arraylength1.java b/jbmc/regression/jbmc/arraylength1/arraylength1.java similarity index 100% rename from regression/cbmc-java/arraylength1/arraylength1.java rename to jbmc/regression/jbmc/arraylength1/arraylength1.java diff --git a/regression/cbmc-java/arraylength1/test.desc b/jbmc/regression/jbmc/arraylength1/test.desc similarity index 100% rename from regression/cbmc-java/arraylength1/test.desc rename to jbmc/regression/jbmc/arraylength1/test.desc diff --git a/regression/cbmc-java/arrayread1/arrayread1.class b/jbmc/regression/jbmc/arrayread1/arrayread1.class similarity index 100% rename from regression/cbmc-java/arrayread1/arrayread1.class rename to jbmc/regression/jbmc/arrayread1/arrayread1.class diff --git a/regression/cbmc-java/arrayread1/arrayread1.java b/jbmc/regression/jbmc/arrayread1/arrayread1.java similarity index 100% rename from regression/cbmc-java/arrayread1/arrayread1.java rename to jbmc/regression/jbmc/arrayread1/arrayread1.java diff --git a/regression/cbmc-java/arrayread1/test.desc b/jbmc/regression/jbmc/arrayread1/test.desc similarity index 100% rename from regression/cbmc-java/arrayread1/test.desc rename to jbmc/regression/jbmc/arrayread1/test.desc diff --git a/regression/cbmc-java/assert1/assert1.class b/jbmc/regression/jbmc/assert1/assert1.class similarity index 100% rename from regression/cbmc-java/assert1/assert1.class rename to jbmc/regression/jbmc/assert1/assert1.class diff --git a/regression/cbmc-java/assert1/assert1.java b/jbmc/regression/jbmc/assert1/assert1.java similarity index 100% rename from regression/cbmc-java/assert1/assert1.java rename to jbmc/regression/jbmc/assert1/assert1.java diff --git a/regression/cbmc-java/assert1/test.desc b/jbmc/regression/jbmc/assert1/test.desc similarity index 100% rename from regression/cbmc-java/assert1/test.desc rename to jbmc/regression/jbmc/assert1/test.desc diff --git a/regression/cbmc-java/assert2/assert2.class b/jbmc/regression/jbmc/assert2/assert2.class similarity index 100% rename from regression/cbmc-java/assert2/assert2.class rename to jbmc/regression/jbmc/assert2/assert2.class diff --git a/regression/cbmc-java/assert2/assert2.java b/jbmc/regression/jbmc/assert2/assert2.java similarity index 100% rename from regression/cbmc-java/assert2/assert2.java rename to jbmc/regression/jbmc/assert2/assert2.java diff --git a/regression/cbmc-java/assert2/test.desc b/jbmc/regression/jbmc/assert2/test.desc similarity index 100% rename from regression/cbmc-java/assert2/test.desc rename to jbmc/regression/jbmc/assert2/test.desc diff --git a/regression/cbmc-java/assert3/assert3.class b/jbmc/regression/jbmc/assert3/assert3.class similarity index 100% rename from regression/cbmc-java/assert3/assert3.class rename to jbmc/regression/jbmc/assert3/assert3.class diff --git a/regression/cbmc-java/assert3/assert3.java b/jbmc/regression/jbmc/assert3/assert3.java similarity index 100% rename from regression/cbmc-java/assert3/assert3.java rename to jbmc/regression/jbmc/assert3/assert3.java diff --git a/regression/cbmc-java/assert3/test.desc b/jbmc/regression/jbmc/assert3/test.desc similarity index 100% rename from regression/cbmc-java/assert3/test.desc rename to jbmc/regression/jbmc/assert3/test.desc diff --git a/regression/cbmc-java/assert4/assert4.class b/jbmc/regression/jbmc/assert4/assert4.class similarity index 100% rename from regression/cbmc-java/assert4/assert4.class rename to jbmc/regression/jbmc/assert4/assert4.class diff --git a/regression/cbmc-java/assert4/assert4.java b/jbmc/regression/jbmc/assert4/assert4.java similarity index 100% rename from regression/cbmc-java/assert4/assert4.java rename to jbmc/regression/jbmc/assert4/assert4.java diff --git a/regression/cbmc-java/assert4/test.desc b/jbmc/regression/jbmc/assert4/test.desc similarity index 100% rename from regression/cbmc-java/assert4/test.desc rename to jbmc/regression/jbmc/assert4/test.desc diff --git a/regression/cbmc-java/assert5/assert5.class b/jbmc/regression/jbmc/assert5/assert5.class similarity index 100% rename from regression/cbmc-java/assert5/assert5.class rename to jbmc/regression/jbmc/assert5/assert5.class diff --git a/regression/cbmc-java/assert5/assert5.java b/jbmc/regression/jbmc/assert5/assert5.java similarity index 100% rename from regression/cbmc-java/assert5/assert5.java rename to jbmc/regression/jbmc/assert5/assert5.java diff --git a/regression/cbmc-java/assert5/test.desc b/jbmc/regression/jbmc/assert5/test.desc similarity index 100% rename from regression/cbmc-java/assert5/test.desc rename to jbmc/regression/jbmc/assert5/test.desc diff --git a/regression/cbmc-java/assert6/assert6.class b/jbmc/regression/jbmc/assert6/assert6.class similarity index 100% rename from regression/cbmc-java/assert6/assert6.class rename to jbmc/regression/jbmc/assert6/assert6.class diff --git a/regression/cbmc-java/assert6/assert6.java b/jbmc/regression/jbmc/assert6/assert6.java similarity index 100% rename from regression/cbmc-java/assert6/assert6.java rename to jbmc/regression/jbmc/assert6/assert6.java diff --git a/regression/cbmc-java/assert6/test.desc b/jbmc/regression/jbmc/assert6/test.desc similarity index 100% rename from regression/cbmc-java/assert6/test.desc rename to jbmc/regression/jbmc/assert6/test.desc diff --git a/regression/cbmc-java/assertion_error_constructors/AssertionIssue.class b/jbmc/regression/jbmc/assertion_error_constructors/AssertionIssue.class similarity index 100% rename from regression/cbmc-java/assertion_error_constructors/AssertionIssue.class rename to jbmc/regression/jbmc/assertion_error_constructors/AssertionIssue.class diff --git a/regression/cbmc-java/assertion_error_constructors/AssertionIssue.java b/jbmc/regression/jbmc/assertion_error_constructors/AssertionIssue.java similarity index 100% rename from regression/cbmc-java/assertion_error_constructors/AssertionIssue.java rename to jbmc/regression/jbmc/assertion_error_constructors/AssertionIssue.java diff --git a/regression/cbmc-java/assertion_error_constructors/test.desc b/jbmc/regression/jbmc/assertion_error_constructors/test.desc similarity index 100% rename from regression/cbmc-java/assertion_error_constructors/test.desc rename to jbmc/regression/jbmc/assertion_error_constructors/test.desc diff --git a/regression/cbmc-java/assume1/Assume1.class b/jbmc/regression/jbmc/assume1/Assume1.class similarity index 100% rename from regression/cbmc-java/assume1/Assume1.class rename to jbmc/regression/jbmc/assume1/Assume1.class diff --git a/regression/cbmc-java/assume1/Assume1.java b/jbmc/regression/jbmc/assume1/Assume1.java similarity index 100% rename from regression/cbmc-java/assume1/Assume1.java rename to jbmc/regression/jbmc/assume1/Assume1.java diff --git a/regression/cbmc-java/assume1/test.desc b/jbmc/regression/jbmc/assume1/test.desc similarity index 100% rename from regression/cbmc-java/assume1/test.desc rename to jbmc/regression/jbmc/assume1/test.desc diff --git a/regression/cbmc-java/assume2/Assume2.class b/jbmc/regression/jbmc/assume2/Assume2.class similarity index 100% rename from regression/cbmc-java/assume2/Assume2.class rename to jbmc/regression/jbmc/assume2/Assume2.class diff --git a/regression/cbmc-java/assume2/Assume2.java b/jbmc/regression/jbmc/assume2/Assume2.java similarity index 100% rename from regression/cbmc-java/assume2/Assume2.java rename to jbmc/regression/jbmc/assume2/Assume2.java diff --git a/regression/cbmc-java/assume2/test.desc b/jbmc/regression/jbmc/assume2/test.desc similarity index 100% rename from regression/cbmc-java/assume2/test.desc rename to jbmc/regression/jbmc/assume2/test.desc diff --git a/regression/cbmc-java/assume3/Assume3.class b/jbmc/regression/jbmc/assume3/Assume3.class similarity index 100% rename from regression/cbmc-java/assume3/Assume3.class rename to jbmc/regression/jbmc/assume3/Assume3.class diff --git a/regression/cbmc-java/assume3/Assume3.java b/jbmc/regression/jbmc/assume3/Assume3.java similarity index 100% rename from regression/cbmc-java/assume3/Assume3.java rename to jbmc/regression/jbmc/assume3/Assume3.java diff --git a/regression/cbmc-java/assume3/test.desc b/jbmc/regression/jbmc/assume3/test.desc similarity index 100% rename from regression/cbmc-java/assume3/test.desc rename to jbmc/regression/jbmc/assume3/test.desc diff --git a/regression/cbmc-java/astore_aload1/astore_aload1.class b/jbmc/regression/jbmc/astore_aload1/astore_aload1.class similarity index 100% rename from regression/cbmc-java/astore_aload1/astore_aload1.class rename to jbmc/regression/jbmc/astore_aload1/astore_aload1.class diff --git a/regression/cbmc-java/astore_aload1/astore_aload1.java b/jbmc/regression/jbmc/astore_aload1/astore_aload1.java similarity index 100% rename from regression/cbmc-java/astore_aload1/astore_aload1.java rename to jbmc/regression/jbmc/astore_aload1/astore_aload1.java diff --git a/regression/cbmc-java/astore_aload1/test.desc b/jbmc/regression/jbmc/astore_aload1/test.desc similarity index 100% rename from regression/cbmc-java/astore_aload1/test.desc rename to jbmc/regression/jbmc/astore_aload1/test.desc diff --git a/regression/cbmc-java/athrow1/A.class b/jbmc/regression/jbmc/athrow1/A.class similarity index 100% rename from regression/cbmc-java/athrow1/A.class rename to jbmc/regression/jbmc/athrow1/A.class diff --git a/regression/cbmc-java/athrow1/athrow1.class b/jbmc/regression/jbmc/athrow1/athrow1.class similarity index 100% rename from regression/cbmc-java/athrow1/athrow1.class rename to jbmc/regression/jbmc/athrow1/athrow1.class diff --git a/regression/cbmc-java/athrow1/athrow1.java b/jbmc/regression/jbmc/athrow1/athrow1.java similarity index 100% rename from regression/cbmc-java/athrow1/athrow1.java rename to jbmc/regression/jbmc/athrow1/athrow1.java diff --git a/regression/cbmc-java/athrow1/test.desc b/jbmc/regression/jbmc/athrow1/test.desc similarity index 100% rename from regression/cbmc-java/athrow1/test.desc rename to jbmc/regression/jbmc/athrow1/test.desc diff --git a/regression/cbmc-java/basic1/helloworld.class b/jbmc/regression/jbmc/basic1/helloworld.class similarity index 100% rename from regression/cbmc-java/basic1/helloworld.class rename to jbmc/regression/jbmc/basic1/helloworld.class diff --git a/regression/cbmc-java/basic1/helloworld.java b/jbmc/regression/jbmc/basic1/helloworld.java similarity index 100% rename from regression/cbmc-java/basic1/helloworld.java rename to jbmc/regression/jbmc/basic1/helloworld.java diff --git a/regression/cbmc-java/basic1/test.desc b/jbmc/regression/jbmc/basic1/test.desc similarity index 100% rename from regression/cbmc-java/basic1/test.desc rename to jbmc/regression/jbmc/basic1/test.desc diff --git a/regression/cbmc-java/basic2/basic.class b/jbmc/regression/jbmc/basic2/basic.class similarity index 100% rename from regression/cbmc-java/basic2/basic.class rename to jbmc/regression/jbmc/basic2/basic.class diff --git a/regression/cbmc-java/basic2/basic.java b/jbmc/regression/jbmc/basic2/basic.java similarity index 100% rename from regression/cbmc-java/basic2/basic.java rename to jbmc/regression/jbmc/basic2/basic.java diff --git a/regression/cbmc-java/basic2/basic2.class b/jbmc/regression/jbmc/basic2/basic2.class similarity index 100% rename from regression/cbmc-java/basic2/basic2.class rename to jbmc/regression/jbmc/basic2/basic2.class diff --git a/regression/cbmc-java/basic2/test.desc b/jbmc/regression/jbmc/basic2/test.desc similarity index 100% rename from regression/cbmc-java/basic2/test.desc rename to jbmc/regression/jbmc/basic2/test.desc diff --git a/regression/cbmc-java/bitwise1/bitwise1.class b/jbmc/regression/jbmc/bitwise1/bitwise1.class similarity index 100% rename from regression/cbmc-java/bitwise1/bitwise1.class rename to jbmc/regression/jbmc/bitwise1/bitwise1.class diff --git a/regression/cbmc-java/bitwise1/bitwise1.java b/jbmc/regression/jbmc/bitwise1/bitwise1.java similarity index 100% rename from regression/cbmc-java/bitwise1/bitwise1.java rename to jbmc/regression/jbmc/bitwise1/bitwise1.java diff --git a/regression/cbmc-java/bitwise1/test.desc b/jbmc/regression/jbmc/bitwise1/test.desc similarity index 100% rename from regression/cbmc-java/bitwise1/test.desc rename to jbmc/regression/jbmc/bitwise1/test.desc diff --git a/regression/cbmc-java/boolean1/boolean1.class b/jbmc/regression/jbmc/boolean1/boolean1.class similarity index 100% rename from regression/cbmc-java/boolean1/boolean1.class rename to jbmc/regression/jbmc/boolean1/boolean1.class diff --git a/regression/cbmc-java/boolean1/boolean1.java b/jbmc/regression/jbmc/boolean1/boolean1.java similarity index 100% rename from regression/cbmc-java/boolean1/boolean1.java rename to jbmc/regression/jbmc/boolean1/boolean1.java diff --git a/regression/cbmc-java/boolean1/test.desc b/jbmc/regression/jbmc/boolean1/test.desc similarity index 100% rename from regression/cbmc-java/boolean1/test.desc rename to jbmc/regression/jbmc/boolean1/test.desc diff --git a/regression/cbmc-java/boolean2/boolean2.class b/jbmc/regression/jbmc/boolean2/boolean2.class similarity index 100% rename from regression/cbmc-java/boolean2/boolean2.class rename to jbmc/regression/jbmc/boolean2/boolean2.class diff --git a/regression/cbmc-java/boolean2/boolean2.java b/jbmc/regression/jbmc/boolean2/boolean2.java similarity index 100% rename from regression/cbmc-java/boolean2/boolean2.java rename to jbmc/regression/jbmc/boolean2/boolean2.java diff --git a/regression/cbmc-java/boolean2/test.desc b/jbmc/regression/jbmc/boolean2/test.desc similarity index 100% rename from regression/cbmc-java/boolean2/test.desc rename to jbmc/regression/jbmc/boolean2/test.desc diff --git a/regression/cbmc-java/cast1/cast1.class b/jbmc/regression/jbmc/cast1/cast1.class similarity index 100% rename from regression/cbmc-java/cast1/cast1.class rename to jbmc/regression/jbmc/cast1/cast1.class diff --git a/regression/cbmc-java/cast1/cast1.java b/jbmc/regression/jbmc/cast1/cast1.java similarity index 100% rename from regression/cbmc-java/cast1/cast1.java rename to jbmc/regression/jbmc/cast1/cast1.java diff --git a/regression/cbmc-java/cast1/test.desc b/jbmc/regression/jbmc/cast1/test.desc similarity index 100% rename from regression/cbmc-java/cast1/test.desc rename to jbmc/regression/jbmc/cast1/test.desc diff --git a/regression/cbmc-java/cast_null1/test.class b/jbmc/regression/jbmc/cast_null1/test.class similarity index 100% rename from regression/cbmc-java/cast_null1/test.class rename to jbmc/regression/jbmc/cast_null1/test.class diff --git a/regression/cbmc-java/cast_null1/test.desc b/jbmc/regression/jbmc/cast_null1/test.desc similarity index 100% rename from regression/cbmc-java/cast_null1/test.desc rename to jbmc/regression/jbmc/cast_null1/test.desc diff --git a/regression/cbmc-java/cast_null1/test.java b/jbmc/regression/jbmc/cast_null1/test.java similarity index 100% rename from regression/cbmc-java/cast_null1/test.java rename to jbmc/regression/jbmc/cast_null1/test.java diff --git a/regression/cbmc-java/cast_null2/test.class b/jbmc/regression/jbmc/cast_null2/test.class similarity index 100% rename from regression/cbmc-java/cast_null2/test.class rename to jbmc/regression/jbmc/cast_null2/test.class diff --git a/regression/cbmc-java/cast_null2/test.desc b/jbmc/regression/jbmc/cast_null2/test.desc similarity index 100% rename from regression/cbmc-java/cast_null2/test.desc rename to jbmc/regression/jbmc/cast_null2/test.desc diff --git a/regression/cbmc-java/cast_null2/test.java b/jbmc/regression/jbmc/cast_null2/test.java similarity index 100% rename from regression/cbmc-java/cast_null2/test.java rename to jbmc/regression/jbmc/cast_null2/test.java diff --git a/regression/cbmc-java/catch1/catch1.class b/jbmc/regression/jbmc/catch1/catch1.class similarity index 100% rename from regression/cbmc-java/catch1/catch1.class rename to jbmc/regression/jbmc/catch1/catch1.class diff --git a/regression/cbmc-java/catch1/catch1.java b/jbmc/regression/jbmc/catch1/catch1.java similarity index 100% rename from regression/cbmc-java/catch1/catch1.java rename to jbmc/regression/jbmc/catch1/catch1.java diff --git a/regression/cbmc-java/catch1/test.desc b/jbmc/regression/jbmc/catch1/test.desc similarity index 100% rename from regression/cbmc-java/catch1/test.desc rename to jbmc/regression/jbmc/catch1/test.desc diff --git a/regression/cbmc-java/char1/char1.class b/jbmc/regression/jbmc/char1/char1.class similarity index 100% rename from regression/cbmc-java/char1/char1.class rename to jbmc/regression/jbmc/char1/char1.class diff --git a/regression/cbmc-java/char1/char1.java b/jbmc/regression/jbmc/char1/char1.java similarity index 100% rename from regression/cbmc-java/char1/char1.java rename to jbmc/regression/jbmc/char1/char1.java diff --git a/regression/cbmc-java/char1/test.desc b/jbmc/regression/jbmc/char1/test.desc similarity index 100% rename from regression/cbmc-java/char1/test.desc rename to jbmc/regression/jbmc/char1/test.desc diff --git a/regression/cbmc-java/classpath1/my_cp/test2.class b/jbmc/regression/jbmc/classpath1/my_cp/test2.class similarity index 100% rename from regression/cbmc-java/classpath1/my_cp/test2.class rename to jbmc/regression/jbmc/classpath1/my_cp/test2.class diff --git a/regression/cbmc-java/classpath1/my_cp/test2.java b/jbmc/regression/jbmc/classpath1/my_cp/test2.java similarity index 100% rename from regression/cbmc-java/classpath1/my_cp/test2.java rename to jbmc/regression/jbmc/classpath1/my_cp/test2.java diff --git a/regression/cbmc-java/classpath1/test.class b/jbmc/regression/jbmc/classpath1/test.class similarity index 100% rename from regression/cbmc-java/classpath1/test.class rename to jbmc/regression/jbmc/classpath1/test.class diff --git a/regression/cbmc-java/classpath1/test.desc b/jbmc/regression/jbmc/classpath1/test.desc similarity index 100% rename from regression/cbmc-java/classpath1/test.desc rename to jbmc/regression/jbmc/classpath1/test.desc diff --git a/regression/cbmc-java/classpath1/test.java b/jbmc/regression/jbmc/classpath1/test.java similarity index 100% rename from regression/cbmc-java/classpath1/test.java rename to jbmc/regression/jbmc/classpath1/test.java diff --git a/regression/cbmc-java/classpath2/jarfile3$A.class b/jbmc/regression/jbmc/classpath2/jarfile3$A.class similarity index 100% rename from regression/cbmc-java/classpath2/jarfile3$A.class rename to jbmc/regression/jbmc/classpath2/jarfile3$A.class diff --git a/regression/cbmc-java/classpath2/jarfile3$B.class b/jbmc/regression/jbmc/classpath2/jarfile3$B.class similarity index 100% rename from regression/cbmc-java/classpath2/jarfile3$B.class rename to jbmc/regression/jbmc/classpath2/jarfile3$B.class diff --git a/regression/cbmc-java/classpath2/jarfile3.class b/jbmc/regression/jbmc/classpath2/jarfile3.class similarity index 100% rename from regression/cbmc-java/classpath2/jarfile3.class rename to jbmc/regression/jbmc/classpath2/jarfile3.class diff --git a/regression/cbmc-java/classpath2/jarfile3.java b/jbmc/regression/jbmc/classpath2/jarfile3.java similarity index 100% rename from regression/cbmc-java/classpath2/jarfile3.java rename to jbmc/regression/jbmc/classpath2/jarfile3.java diff --git a/regression/cbmc-java/classpath2/test.desc b/jbmc/regression/jbmc/classpath2/test.desc similarity index 100% rename from regression/cbmc-java/classpath2/test.desc rename to jbmc/regression/jbmc/classpath2/test.desc diff --git a/regression/cbmc-java/classtest1/classtest1.class b/jbmc/regression/jbmc/classtest1/classtest1.class similarity index 100% rename from regression/cbmc-java/classtest1/classtest1.class rename to jbmc/regression/jbmc/classtest1/classtest1.class diff --git a/regression/cbmc-java/classtest1/classtest1.java b/jbmc/regression/jbmc/classtest1/classtest1.java similarity index 100% rename from regression/cbmc-java/classtest1/classtest1.java rename to jbmc/regression/jbmc/classtest1/classtest1.java diff --git a/regression/cbmc-java/classtest1/test.desc b/jbmc/regression/jbmc/classtest1/test.desc similarity index 100% rename from regression/cbmc-java/classtest1/test.desc rename to jbmc/regression/jbmc/classtest1/test.desc diff --git a/regression/cbmc-java/const1/const1.class b/jbmc/regression/jbmc/const1/const1.class similarity index 100% rename from regression/cbmc-java/const1/const1.class rename to jbmc/regression/jbmc/const1/const1.class diff --git a/regression/cbmc-java/const1/const1.java b/jbmc/regression/jbmc/const1/const1.java similarity index 100% rename from regression/cbmc-java/const1/const1.java rename to jbmc/regression/jbmc/const1/const1.java diff --git a/regression/cbmc-java/const1/test.desc b/jbmc/regression/jbmc/const1/test.desc similarity index 100% rename from regression/cbmc-java/const1/test.desc rename to jbmc/regression/jbmc/const1/test.desc diff --git a/regression/cbmc-java/constructor1/A.class b/jbmc/regression/jbmc/constructor1/A.class similarity index 100% rename from regression/cbmc-java/constructor1/A.class rename to jbmc/regression/jbmc/constructor1/A.class diff --git a/regression/cbmc-java/constructor1/constructor1.class b/jbmc/regression/jbmc/constructor1/constructor1.class similarity index 100% rename from regression/cbmc-java/constructor1/constructor1.class rename to jbmc/regression/jbmc/constructor1/constructor1.class diff --git a/regression/cbmc-java/constructor1/constructor1.java b/jbmc/regression/jbmc/constructor1/constructor1.java similarity index 100% rename from regression/cbmc-java/constructor1/constructor1.java rename to jbmc/regression/jbmc/constructor1/constructor1.java diff --git a/regression/cbmc-java/constructor1/sub.class b/jbmc/regression/jbmc/constructor1/sub.class similarity index 100% rename from regression/cbmc-java/constructor1/sub.class rename to jbmc/regression/jbmc/constructor1/sub.class diff --git a/regression/cbmc-java/constructor1/test.desc b/jbmc/regression/jbmc/constructor1/test.desc similarity index 100% rename from regression/cbmc-java/constructor1/test.desc rename to jbmc/regression/jbmc/constructor1/test.desc diff --git a/regression/cbmc-java/coreModels/test.class b/jbmc/regression/jbmc/coreModels/test.class similarity index 100% rename from regression/cbmc-java/coreModels/test.class rename to jbmc/regression/jbmc/coreModels/test.class diff --git a/regression/cbmc-java/coreModels/test.desc b/jbmc/regression/jbmc/coreModels/test.desc similarity index 100% rename from regression/cbmc-java/coreModels/test.desc rename to jbmc/regression/jbmc/coreModels/test.desc diff --git a/regression/cbmc-java/coreModels/test.java b/jbmc/regression/jbmc/coreModels/test.java similarity index 100% rename from regression/cbmc-java/coreModels/test.java rename to jbmc/regression/jbmc/coreModels/test.java diff --git a/regression/cbmc-java/covered1/covered1.class b/jbmc/regression/jbmc/covered1/covered1.class similarity index 100% rename from regression/cbmc-java/covered1/covered1.class rename to jbmc/regression/jbmc/covered1/covered1.class diff --git a/regression/cbmc-java/covered1/covered1.java b/jbmc/regression/jbmc/covered1/covered1.java similarity index 100% rename from regression/cbmc-java/covered1/covered1.java rename to jbmc/regression/jbmc/covered1/covered1.java diff --git a/regression/cbmc-java/covered1/test.desc b/jbmc/regression/jbmc/covered1/test.desc similarity index 100% rename from regression/cbmc-java/covered1/test.desc rename to jbmc/regression/jbmc/covered1/test.desc diff --git a/regression/cbmc-java/destructor1/Break.class b/jbmc/regression/jbmc/destructor1/Break.class similarity index 100% rename from regression/cbmc-java/destructor1/Break.class rename to jbmc/regression/jbmc/destructor1/Break.class diff --git a/regression/cbmc-java/destructor1/Break.java b/jbmc/regression/jbmc/destructor1/Break.java similarity index 100% rename from regression/cbmc-java/destructor1/Break.java rename to jbmc/regression/jbmc/destructor1/Break.java diff --git a/regression/cbmc-java/destructor1/test.desc b/jbmc/regression/jbmc/destructor1/test.desc similarity index 100% rename from regression/cbmc-java/destructor1/test.desc rename to jbmc/regression/jbmc/destructor1/test.desc diff --git a/regression/cbmc-java/divide_by_zero/DivideByZero.class b/jbmc/regression/jbmc/divide_by_zero/DivideByZero.class similarity index 100% rename from regression/cbmc-java/divide_by_zero/DivideByZero.class rename to jbmc/regression/jbmc/divide_by_zero/DivideByZero.class diff --git a/regression/cbmc-java/divide_by_zero/DivideByZero.java b/jbmc/regression/jbmc/divide_by_zero/DivideByZero.java similarity index 100% rename from regression/cbmc-java/divide_by_zero/DivideByZero.java rename to jbmc/regression/jbmc/divide_by_zero/DivideByZero.java diff --git a/regression/cbmc-java/divide_by_zero/test.desc b/jbmc/regression/jbmc/divide_by_zero/test.desc similarity index 100% rename from regression/cbmc-java/divide_by_zero/test.desc rename to jbmc/regression/jbmc/divide_by_zero/test.desc diff --git a/regression/cbmc-java/double1/double1.class b/jbmc/regression/jbmc/double1/double1.class similarity index 100% rename from regression/cbmc-java/double1/double1.class rename to jbmc/regression/jbmc/double1/double1.class diff --git a/regression/cbmc-java/double1/double1.java b/jbmc/regression/jbmc/double1/double1.java similarity index 100% rename from regression/cbmc-java/double1/double1.java rename to jbmc/regression/jbmc/double1/double1.java diff --git a/regression/cbmc-java/double1/test.desc b/jbmc/regression/jbmc/double1/test.desc similarity index 100% rename from regression/cbmc-java/double1/test.desc rename to jbmc/regression/jbmc/double1/test.desc diff --git a/regression/cbmc-java/dynamic-multi-dimensional-array/TestClass.class b/jbmc/regression/jbmc/dynamic-multi-dimensional-array/TestClass.class similarity index 100% rename from regression/cbmc-java/dynamic-multi-dimensional-array/TestClass.class rename to jbmc/regression/jbmc/dynamic-multi-dimensional-array/TestClass.class diff --git a/regression/cbmc-java/dynamic-multi-dimensional-array/TestClass.java b/jbmc/regression/jbmc/dynamic-multi-dimensional-array/TestClass.java similarity index 100% rename from regression/cbmc-java/dynamic-multi-dimensional-array/TestClass.java rename to jbmc/regression/jbmc/dynamic-multi-dimensional-array/TestClass.java diff --git a/regression/cbmc-java/dynamic-multi-dimensional-array/test.desc b/jbmc/regression/jbmc/dynamic-multi-dimensional-array/test.desc similarity index 100% rename from regression/cbmc-java/dynamic-multi-dimensional-array/test.desc rename to jbmc/regression/jbmc/dynamic-multi-dimensional-array/test.desc diff --git a/regression/cbmc-java/enum1/enum1.class b/jbmc/regression/jbmc/enum1/enum1.class similarity index 100% rename from regression/cbmc-java/enum1/enum1.class rename to jbmc/regression/jbmc/enum1/enum1.class diff --git a/regression/cbmc-java/enum1/enum1.java b/jbmc/regression/jbmc/enum1/enum1.java similarity index 100% rename from regression/cbmc-java/enum1/enum1.java rename to jbmc/regression/jbmc/enum1/enum1.java diff --git a/regression/cbmc-java/enum1/test.desc b/jbmc/regression/jbmc/enum1/test.desc similarity index 100% rename from regression/cbmc-java/enum1/test.desc rename to jbmc/regression/jbmc/enum1/test.desc diff --git a/regression/cbmc-java/environment1/Main.class b/jbmc/regression/jbmc/environment1/Main.class similarity index 100% rename from regression/cbmc-java/environment1/Main.class rename to jbmc/regression/jbmc/environment1/Main.class diff --git a/regression/cbmc-java/environment1/Main.java b/jbmc/regression/jbmc/environment1/Main.java similarity index 100% rename from regression/cbmc-java/environment1/Main.java rename to jbmc/regression/jbmc/environment1/Main.java diff --git a/regression/cbmc-java/environment1/test.desc b/jbmc/regression/jbmc/environment1/test.desc similarity index 100% rename from regression/cbmc-java/environment1/test.desc rename to jbmc/regression/jbmc/environment1/test.desc diff --git a/regression/cbmc-java/exceptions1/A.class b/jbmc/regression/jbmc/exceptions1/A.class similarity index 100% rename from regression/cbmc-java/exceptions1/A.class rename to jbmc/regression/jbmc/exceptions1/A.class diff --git a/regression/cbmc-java/exceptions1/B.class b/jbmc/regression/jbmc/exceptions1/B.class similarity index 100% rename from regression/cbmc-java/exceptions1/B.class rename to jbmc/regression/jbmc/exceptions1/B.class diff --git a/regression/cbmc-java/exceptions1/C.class b/jbmc/regression/jbmc/exceptions1/C.class similarity index 100% rename from regression/cbmc-java/exceptions1/C.class rename to jbmc/regression/jbmc/exceptions1/C.class diff --git a/regression/cbmc-java/exceptions1/D.class b/jbmc/regression/jbmc/exceptions1/D.class similarity index 100% rename from regression/cbmc-java/exceptions1/D.class rename to jbmc/regression/jbmc/exceptions1/D.class diff --git a/regression/cbmc-java/exceptions1/test.class b/jbmc/regression/jbmc/exceptions1/test.class similarity index 100% rename from regression/cbmc-java/exceptions1/test.class rename to jbmc/regression/jbmc/exceptions1/test.class diff --git a/regression/cbmc-java/exceptions1/test.desc b/jbmc/regression/jbmc/exceptions1/test.desc similarity index 100% rename from regression/cbmc-java/exceptions1/test.desc rename to jbmc/regression/jbmc/exceptions1/test.desc diff --git a/regression/cbmc-java/exceptions1/test.java b/jbmc/regression/jbmc/exceptions1/test.java similarity index 100% rename from regression/cbmc-java/exceptions1/test.java rename to jbmc/regression/jbmc/exceptions1/test.java diff --git a/regression/cbmc-java/exceptions10/A.class b/jbmc/regression/jbmc/exceptions10/A.class similarity index 100% rename from regression/cbmc-java/exceptions10/A.class rename to jbmc/regression/jbmc/exceptions10/A.class diff --git a/regression/cbmc-java/exceptions10/B.class b/jbmc/regression/jbmc/exceptions10/B.class similarity index 100% rename from regression/cbmc-java/exceptions10/B.class rename to jbmc/regression/jbmc/exceptions10/B.class diff --git a/regression/cbmc-java/exceptions10/C.class b/jbmc/regression/jbmc/exceptions10/C.class similarity index 100% rename from regression/cbmc-java/exceptions10/C.class rename to jbmc/regression/jbmc/exceptions10/C.class diff --git a/regression/cbmc-java/exceptions10/test.class b/jbmc/regression/jbmc/exceptions10/test.class similarity index 100% rename from regression/cbmc-java/exceptions10/test.class rename to jbmc/regression/jbmc/exceptions10/test.class diff --git a/regression/cbmc-java/exceptions10/test.desc b/jbmc/regression/jbmc/exceptions10/test.desc similarity index 100% rename from regression/cbmc-java/exceptions10/test.desc rename to jbmc/regression/jbmc/exceptions10/test.desc diff --git a/regression/cbmc-java/exceptions10/test.java b/jbmc/regression/jbmc/exceptions10/test.java similarity index 100% rename from regression/cbmc-java/exceptions10/test.java rename to jbmc/regression/jbmc/exceptions10/test.java diff --git a/regression/cbmc-java/exceptions11/A.class b/jbmc/regression/jbmc/exceptions11/A.class similarity index 100% rename from regression/cbmc-java/exceptions11/A.class rename to jbmc/regression/jbmc/exceptions11/A.class diff --git a/regression/cbmc-java/exceptions11/B.class b/jbmc/regression/jbmc/exceptions11/B.class similarity index 100% rename from regression/cbmc-java/exceptions11/B.class rename to jbmc/regression/jbmc/exceptions11/B.class diff --git a/regression/cbmc-java/exceptions11/test.class b/jbmc/regression/jbmc/exceptions11/test.class similarity index 100% rename from regression/cbmc-java/exceptions11/test.class rename to jbmc/regression/jbmc/exceptions11/test.class diff --git a/regression/cbmc-java/exceptions11/test.desc b/jbmc/regression/jbmc/exceptions11/test.desc similarity index 100% rename from regression/cbmc-java/exceptions11/test.desc rename to jbmc/regression/jbmc/exceptions11/test.desc diff --git a/regression/cbmc-java/exceptions11/test.java b/jbmc/regression/jbmc/exceptions11/test.java similarity index 100% rename from regression/cbmc-java/exceptions11/test.java rename to jbmc/regression/jbmc/exceptions11/test.java diff --git a/regression/cbmc-java/exceptions12/A.class b/jbmc/regression/jbmc/exceptions12/A.class similarity index 100% rename from regression/cbmc-java/exceptions12/A.class rename to jbmc/regression/jbmc/exceptions12/A.class diff --git a/regression/cbmc-java/exceptions12/B.class b/jbmc/regression/jbmc/exceptions12/B.class similarity index 100% rename from regression/cbmc-java/exceptions12/B.class rename to jbmc/regression/jbmc/exceptions12/B.class diff --git a/regression/cbmc-java/exceptions12/C.class b/jbmc/regression/jbmc/exceptions12/C.class similarity index 100% rename from regression/cbmc-java/exceptions12/C.class rename to jbmc/regression/jbmc/exceptions12/C.class diff --git a/regression/cbmc-java/exceptions12/F.class b/jbmc/regression/jbmc/exceptions12/F.class similarity index 100% rename from regression/cbmc-java/exceptions12/F.class rename to jbmc/regression/jbmc/exceptions12/F.class diff --git a/regression/cbmc-java/exceptions12/test.class b/jbmc/regression/jbmc/exceptions12/test.class similarity index 100% rename from regression/cbmc-java/exceptions12/test.class rename to jbmc/regression/jbmc/exceptions12/test.class diff --git a/regression/cbmc-java/exceptions12/test.desc b/jbmc/regression/jbmc/exceptions12/test.desc similarity index 100% rename from regression/cbmc-java/exceptions12/test.desc rename to jbmc/regression/jbmc/exceptions12/test.desc diff --git a/regression/cbmc-java/exceptions12/test.java b/jbmc/regression/jbmc/exceptions12/test.java similarity index 100% rename from regression/cbmc-java/exceptions12/test.java rename to jbmc/regression/jbmc/exceptions12/test.java diff --git a/regression/cbmc-java/exceptions13/A.class b/jbmc/regression/jbmc/exceptions13/A.class similarity index 100% rename from regression/cbmc-java/exceptions13/A.class rename to jbmc/regression/jbmc/exceptions13/A.class diff --git a/regression/cbmc-java/exceptions13/B.class b/jbmc/regression/jbmc/exceptions13/B.class similarity index 100% rename from regression/cbmc-java/exceptions13/B.class rename to jbmc/regression/jbmc/exceptions13/B.class diff --git a/regression/cbmc-java/exceptions13/C.class b/jbmc/regression/jbmc/exceptions13/C.class similarity index 100% rename from regression/cbmc-java/exceptions13/C.class rename to jbmc/regression/jbmc/exceptions13/C.class diff --git a/regression/cbmc-java/exceptions13/F.class b/jbmc/regression/jbmc/exceptions13/F.class similarity index 100% rename from regression/cbmc-java/exceptions13/F.class rename to jbmc/regression/jbmc/exceptions13/F.class diff --git a/regression/cbmc-java/exceptions13/test.class b/jbmc/regression/jbmc/exceptions13/test.class similarity index 100% rename from regression/cbmc-java/exceptions13/test.class rename to jbmc/regression/jbmc/exceptions13/test.class diff --git a/regression/cbmc-java/exceptions13/test.desc b/jbmc/regression/jbmc/exceptions13/test.desc similarity index 100% rename from regression/cbmc-java/exceptions13/test.desc rename to jbmc/regression/jbmc/exceptions13/test.desc diff --git a/regression/cbmc-java/exceptions13/test.java b/jbmc/regression/jbmc/exceptions13/test.java similarity index 100% rename from regression/cbmc-java/exceptions13/test.java rename to jbmc/regression/jbmc/exceptions13/test.java diff --git a/regression/cbmc-java/exceptions14/A.class b/jbmc/regression/jbmc/exceptions14/A.class similarity index 100% rename from regression/cbmc-java/exceptions14/A.class rename to jbmc/regression/jbmc/exceptions14/A.class diff --git a/regression/cbmc-java/exceptions14/B.class b/jbmc/regression/jbmc/exceptions14/B.class similarity index 100% rename from regression/cbmc-java/exceptions14/B.class rename to jbmc/regression/jbmc/exceptions14/B.class diff --git a/regression/cbmc-java/exceptions14/C.class b/jbmc/regression/jbmc/exceptions14/C.class similarity index 100% rename from regression/cbmc-java/exceptions14/C.class rename to jbmc/regression/jbmc/exceptions14/C.class diff --git a/regression/cbmc-java/exceptions14/test.class b/jbmc/regression/jbmc/exceptions14/test.class similarity index 100% rename from regression/cbmc-java/exceptions14/test.class rename to jbmc/regression/jbmc/exceptions14/test.class diff --git a/regression/cbmc-java/exceptions14/test.desc b/jbmc/regression/jbmc/exceptions14/test.desc similarity index 100% rename from regression/cbmc-java/exceptions14/test.desc rename to jbmc/regression/jbmc/exceptions14/test.desc diff --git a/regression/cbmc-java/exceptions14/test.java b/jbmc/regression/jbmc/exceptions14/test.java similarity index 100% rename from regression/cbmc-java/exceptions14/test.java rename to jbmc/regression/jbmc/exceptions14/test.java diff --git a/regression/cbmc-java/exceptions15/InetAddress.class b/jbmc/regression/jbmc/exceptions15/InetAddress.class similarity index 100% rename from regression/cbmc-java/exceptions15/InetAddress.class rename to jbmc/regression/jbmc/exceptions15/InetAddress.class diff --git a/regression/cbmc-java/exceptions15/InetSocketAddress.class b/jbmc/regression/jbmc/exceptions15/InetSocketAddress.class similarity index 100% rename from regression/cbmc-java/exceptions15/InetSocketAddress.class rename to jbmc/regression/jbmc/exceptions15/InetSocketAddress.class diff --git a/regression/cbmc-java/exceptions15/test.class b/jbmc/regression/jbmc/exceptions15/test.class similarity index 100% rename from regression/cbmc-java/exceptions15/test.class rename to jbmc/regression/jbmc/exceptions15/test.class diff --git a/regression/cbmc-java/exceptions15/test.desc b/jbmc/regression/jbmc/exceptions15/test.desc similarity index 100% rename from regression/cbmc-java/exceptions15/test.desc rename to jbmc/regression/jbmc/exceptions15/test.desc diff --git a/regression/cbmc-java/exceptions15/test.java b/jbmc/regression/jbmc/exceptions15/test.java similarity index 100% rename from regression/cbmc-java/exceptions15/test.java rename to jbmc/regression/jbmc/exceptions15/test.java diff --git a/regression/cbmc-java/exceptions16/A.class b/jbmc/regression/jbmc/exceptions16/A.class similarity index 100% rename from regression/cbmc-java/exceptions16/A.class rename to jbmc/regression/jbmc/exceptions16/A.class diff --git a/regression/cbmc-java/exceptions16/B.class b/jbmc/regression/jbmc/exceptions16/B.class similarity index 100% rename from regression/cbmc-java/exceptions16/B.class rename to jbmc/regression/jbmc/exceptions16/B.class diff --git a/regression/cbmc-java/exceptions16/C.class b/jbmc/regression/jbmc/exceptions16/C.class similarity index 100% rename from regression/cbmc-java/exceptions16/C.class rename to jbmc/regression/jbmc/exceptions16/C.class diff --git a/regression/cbmc-java/exceptions16/test.class b/jbmc/regression/jbmc/exceptions16/test.class similarity index 100% rename from regression/cbmc-java/exceptions16/test.class rename to jbmc/regression/jbmc/exceptions16/test.class diff --git a/regression/cbmc-java/exceptions16/test.desc b/jbmc/regression/jbmc/exceptions16/test.desc similarity index 100% rename from regression/cbmc-java/exceptions16/test.desc rename to jbmc/regression/jbmc/exceptions16/test.desc diff --git a/regression/cbmc-java/exceptions16/test.java b/jbmc/regression/jbmc/exceptions16/test.java similarity index 100% rename from regression/cbmc-java/exceptions16/test.java rename to jbmc/regression/jbmc/exceptions16/test.java diff --git a/regression/cbmc-java/exceptions18/A.class b/jbmc/regression/jbmc/exceptions18/A.class similarity index 100% rename from regression/cbmc-java/exceptions18/A.class rename to jbmc/regression/jbmc/exceptions18/A.class diff --git a/regression/cbmc-java/exceptions18/Test.class b/jbmc/regression/jbmc/exceptions18/Test.class similarity index 100% rename from regression/cbmc-java/exceptions18/Test.class rename to jbmc/regression/jbmc/exceptions18/Test.class diff --git a/regression/cbmc-java/exceptions18/Test.java b/jbmc/regression/jbmc/exceptions18/Test.java similarity index 100% rename from regression/cbmc-java/exceptions18/Test.java rename to jbmc/regression/jbmc/exceptions18/Test.java diff --git a/regression/cbmc-java/exceptions18/test.desc b/jbmc/regression/jbmc/exceptions18/test.desc similarity index 100% rename from regression/cbmc-java/exceptions18/test.desc rename to jbmc/regression/jbmc/exceptions18/test.desc diff --git a/regression/cbmc-java/exceptions19/exception_handler.class b/jbmc/regression/jbmc/exceptions19/exception_handler.class similarity index 100% rename from regression/cbmc-java/exceptions19/exception_handler.class rename to jbmc/regression/jbmc/exceptions19/exception_handler.class diff --git a/regression/cbmc-java/exceptions19/exception_handler.j b/jbmc/regression/jbmc/exceptions19/exception_handler.j similarity index 100% rename from regression/cbmc-java/exceptions19/exception_handler.j rename to jbmc/regression/jbmc/exceptions19/exception_handler.j diff --git a/regression/cbmc-java/exceptions19/test.desc b/jbmc/regression/jbmc/exceptions19/test.desc similarity index 100% rename from regression/cbmc-java/exceptions19/test.desc rename to jbmc/regression/jbmc/exceptions19/test.desc diff --git a/regression/cbmc-java/exceptions2/A.class b/jbmc/regression/jbmc/exceptions2/A.class similarity index 100% rename from regression/cbmc-java/exceptions2/A.class rename to jbmc/regression/jbmc/exceptions2/A.class diff --git a/regression/cbmc-java/exceptions2/B.class b/jbmc/regression/jbmc/exceptions2/B.class similarity index 100% rename from regression/cbmc-java/exceptions2/B.class rename to jbmc/regression/jbmc/exceptions2/B.class diff --git a/regression/cbmc-java/exceptions2/C.class b/jbmc/regression/jbmc/exceptions2/C.class similarity index 100% rename from regression/cbmc-java/exceptions2/C.class rename to jbmc/regression/jbmc/exceptions2/C.class diff --git a/regression/cbmc-java/exceptions2/test.class b/jbmc/regression/jbmc/exceptions2/test.class similarity index 100% rename from regression/cbmc-java/exceptions2/test.class rename to jbmc/regression/jbmc/exceptions2/test.class diff --git a/regression/cbmc-java/exceptions2/test.desc b/jbmc/regression/jbmc/exceptions2/test.desc similarity index 100% rename from regression/cbmc-java/exceptions2/test.desc rename to jbmc/regression/jbmc/exceptions2/test.desc diff --git a/regression/cbmc-java/exceptions2/test.java b/jbmc/regression/jbmc/exceptions2/test.java similarity index 100% rename from regression/cbmc-java/exceptions2/test.java rename to jbmc/regression/jbmc/exceptions2/test.java diff --git a/regression/cbmc-java/exceptions20/A.class b/jbmc/regression/jbmc/exceptions20/A.class similarity index 100% rename from regression/cbmc-java/exceptions20/A.class rename to jbmc/regression/jbmc/exceptions20/A.class diff --git a/regression/cbmc-java/exceptions20/B.class b/jbmc/regression/jbmc/exceptions20/B.class similarity index 100% rename from regression/cbmc-java/exceptions20/B.class rename to jbmc/regression/jbmc/exceptions20/B.class diff --git a/regression/cbmc-java/exceptions20/C.class b/jbmc/regression/jbmc/exceptions20/C.class similarity index 100% rename from regression/cbmc-java/exceptions20/C.class rename to jbmc/regression/jbmc/exceptions20/C.class diff --git a/regression/cbmc-java/exceptions20/D.class b/jbmc/regression/jbmc/exceptions20/D.class similarity index 100% rename from regression/cbmc-java/exceptions20/D.class rename to jbmc/regression/jbmc/exceptions20/D.class diff --git a/regression/cbmc-java/exceptions20/test.class b/jbmc/regression/jbmc/exceptions20/test.class similarity index 100% rename from regression/cbmc-java/exceptions20/test.class rename to jbmc/regression/jbmc/exceptions20/test.class diff --git a/regression/cbmc-java/exceptions20/test.desc b/jbmc/regression/jbmc/exceptions20/test.desc similarity index 100% rename from regression/cbmc-java/exceptions20/test.desc rename to jbmc/regression/jbmc/exceptions20/test.desc diff --git a/regression/cbmc-java/exceptions20/test.java b/jbmc/regression/jbmc/exceptions20/test.java similarity index 100% rename from regression/cbmc-java/exceptions20/test.java rename to jbmc/regression/jbmc/exceptions20/test.java diff --git a/regression/cbmc-java/exceptions21/test.class b/jbmc/regression/jbmc/exceptions21/test.class similarity index 100% rename from regression/cbmc-java/exceptions21/test.class rename to jbmc/regression/jbmc/exceptions21/test.class diff --git a/regression/cbmc-java/exceptions21/test.desc b/jbmc/regression/jbmc/exceptions21/test.desc similarity index 100% rename from regression/cbmc-java/exceptions21/test.desc rename to jbmc/regression/jbmc/exceptions21/test.desc diff --git a/regression/cbmc-java/exceptions21/test.java b/jbmc/regression/jbmc/exceptions21/test.java similarity index 100% rename from regression/cbmc-java/exceptions21/test.java rename to jbmc/regression/jbmc/exceptions21/test.java diff --git a/regression/cbmc-java/exceptions22/test.class b/jbmc/regression/jbmc/exceptions22/test.class similarity index 100% rename from regression/cbmc-java/exceptions22/test.class rename to jbmc/regression/jbmc/exceptions22/test.class diff --git a/regression/cbmc-java/exceptions22/test.desc b/jbmc/regression/jbmc/exceptions22/test.desc similarity index 100% rename from regression/cbmc-java/exceptions22/test.desc rename to jbmc/regression/jbmc/exceptions22/test.desc diff --git a/regression/cbmc-java/exceptions22/test.java b/jbmc/regression/jbmc/exceptions22/test.java similarity index 100% rename from regression/cbmc-java/exceptions22/test.java rename to jbmc/regression/jbmc/exceptions22/test.java diff --git a/regression/cbmc-java/exceptions23/test.class b/jbmc/regression/jbmc/exceptions23/test.class similarity index 100% rename from regression/cbmc-java/exceptions23/test.class rename to jbmc/regression/jbmc/exceptions23/test.class diff --git a/regression/cbmc-java/exceptions23/test.desc b/jbmc/regression/jbmc/exceptions23/test.desc similarity index 100% rename from regression/cbmc-java/exceptions23/test.desc rename to jbmc/regression/jbmc/exceptions23/test.desc diff --git a/regression/cbmc-java/exceptions23/test.java b/jbmc/regression/jbmc/exceptions23/test.java similarity index 100% rename from regression/cbmc-java/exceptions23/test.java rename to jbmc/regression/jbmc/exceptions23/test.java diff --git a/regression/cbmc-java/exceptions24/A.class b/jbmc/regression/jbmc/exceptions24/A.class similarity index 100% rename from regression/cbmc-java/exceptions24/A.class rename to jbmc/regression/jbmc/exceptions24/A.class diff --git a/regression/cbmc-java/exceptions24/test.class b/jbmc/regression/jbmc/exceptions24/test.class similarity index 100% rename from regression/cbmc-java/exceptions24/test.class rename to jbmc/regression/jbmc/exceptions24/test.class diff --git a/regression/cbmc-java/exceptions24/test.desc b/jbmc/regression/jbmc/exceptions24/test.desc similarity index 100% rename from regression/cbmc-java/exceptions24/test.desc rename to jbmc/regression/jbmc/exceptions24/test.desc diff --git a/regression/cbmc-java/exceptions24/test.java b/jbmc/regression/jbmc/exceptions24/test.java similarity index 100% rename from regression/cbmc-java/exceptions24/test.java rename to jbmc/regression/jbmc/exceptions24/test.java diff --git a/regression/cbmc-java/exceptions26/A.class b/jbmc/regression/jbmc/exceptions26/A.class similarity index 100% rename from regression/cbmc-java/exceptions26/A.class rename to jbmc/regression/jbmc/exceptions26/A.class diff --git a/regression/cbmc-java/exceptions26/B.class b/jbmc/regression/jbmc/exceptions26/B.class similarity index 100% rename from regression/cbmc-java/exceptions26/B.class rename to jbmc/regression/jbmc/exceptions26/B.class diff --git a/regression/cbmc-java/exceptions26/test.class b/jbmc/regression/jbmc/exceptions26/test.class similarity index 100% rename from regression/cbmc-java/exceptions26/test.class rename to jbmc/regression/jbmc/exceptions26/test.class diff --git a/regression/cbmc-java/exceptions26/test.desc b/jbmc/regression/jbmc/exceptions26/test.desc similarity index 100% rename from regression/cbmc-java/exceptions26/test.desc rename to jbmc/regression/jbmc/exceptions26/test.desc diff --git a/regression/cbmc-java/exceptions26/test.java b/jbmc/regression/jbmc/exceptions26/test.java similarity index 100% rename from regression/cbmc-java/exceptions26/test.java rename to jbmc/regression/jbmc/exceptions26/test.java diff --git a/regression/cbmc-java/exceptions27/A.class b/jbmc/regression/jbmc/exceptions27/A.class similarity index 100% rename from regression/cbmc-java/exceptions27/A.class rename to jbmc/regression/jbmc/exceptions27/A.class diff --git a/regression/cbmc-java/exceptions27/B.class b/jbmc/regression/jbmc/exceptions27/B.class similarity index 100% rename from regression/cbmc-java/exceptions27/B.class rename to jbmc/regression/jbmc/exceptions27/B.class diff --git a/regression/cbmc-java/exceptions27/test.class b/jbmc/regression/jbmc/exceptions27/test.class similarity index 100% rename from regression/cbmc-java/exceptions27/test.class rename to jbmc/regression/jbmc/exceptions27/test.class diff --git a/regression/cbmc-java/exceptions27/test.desc b/jbmc/regression/jbmc/exceptions27/test.desc similarity index 100% rename from regression/cbmc-java/exceptions27/test.desc rename to jbmc/regression/jbmc/exceptions27/test.desc diff --git a/regression/cbmc-java/exceptions27/test.java b/jbmc/regression/jbmc/exceptions27/test.java similarity index 100% rename from regression/cbmc-java/exceptions27/test.java rename to jbmc/regression/jbmc/exceptions27/test.java diff --git a/regression/cbmc-java/exceptions3/A.class b/jbmc/regression/jbmc/exceptions3/A.class similarity index 100% rename from regression/cbmc-java/exceptions3/A.class rename to jbmc/regression/jbmc/exceptions3/A.class diff --git a/regression/cbmc-java/exceptions3/B.class b/jbmc/regression/jbmc/exceptions3/B.class similarity index 100% rename from regression/cbmc-java/exceptions3/B.class rename to jbmc/regression/jbmc/exceptions3/B.class diff --git a/regression/cbmc-java/exceptions3/C.class b/jbmc/regression/jbmc/exceptions3/C.class similarity index 100% rename from regression/cbmc-java/exceptions3/C.class rename to jbmc/regression/jbmc/exceptions3/C.class diff --git a/regression/cbmc-java/exceptions3/test.class b/jbmc/regression/jbmc/exceptions3/test.class similarity index 100% rename from regression/cbmc-java/exceptions3/test.class rename to jbmc/regression/jbmc/exceptions3/test.class diff --git a/regression/cbmc-java/exceptions3/test.desc b/jbmc/regression/jbmc/exceptions3/test.desc similarity index 100% rename from regression/cbmc-java/exceptions3/test.desc rename to jbmc/regression/jbmc/exceptions3/test.desc diff --git a/regression/cbmc-java/exceptions3/test.java b/jbmc/regression/jbmc/exceptions3/test.java similarity index 100% rename from regression/cbmc-java/exceptions3/test.java rename to jbmc/regression/jbmc/exceptions3/test.java diff --git a/regression/cbmc-java/exceptions4/A.class b/jbmc/regression/jbmc/exceptions4/A.class similarity index 100% rename from regression/cbmc-java/exceptions4/A.class rename to jbmc/regression/jbmc/exceptions4/A.class diff --git a/regression/cbmc-java/exceptions4/B.class b/jbmc/regression/jbmc/exceptions4/B.class similarity index 100% rename from regression/cbmc-java/exceptions4/B.class rename to jbmc/regression/jbmc/exceptions4/B.class diff --git a/regression/cbmc-java/exceptions4/C.class b/jbmc/regression/jbmc/exceptions4/C.class similarity index 100% rename from regression/cbmc-java/exceptions4/C.class rename to jbmc/regression/jbmc/exceptions4/C.class diff --git a/regression/cbmc-java/exceptions4/test.class b/jbmc/regression/jbmc/exceptions4/test.class similarity index 100% rename from regression/cbmc-java/exceptions4/test.class rename to jbmc/regression/jbmc/exceptions4/test.class diff --git a/regression/cbmc-java/exceptions4/test.desc b/jbmc/regression/jbmc/exceptions4/test.desc similarity index 100% rename from regression/cbmc-java/exceptions4/test.desc rename to jbmc/regression/jbmc/exceptions4/test.desc diff --git a/regression/cbmc-java/exceptions4/test.java b/jbmc/regression/jbmc/exceptions4/test.java similarity index 100% rename from regression/cbmc-java/exceptions4/test.java rename to jbmc/regression/jbmc/exceptions4/test.java diff --git a/regression/cbmc-java/exceptions5/A.class b/jbmc/regression/jbmc/exceptions5/A.class similarity index 100% rename from regression/cbmc-java/exceptions5/A.class rename to jbmc/regression/jbmc/exceptions5/A.class diff --git a/regression/cbmc-java/exceptions5/B.class b/jbmc/regression/jbmc/exceptions5/B.class similarity index 100% rename from regression/cbmc-java/exceptions5/B.class rename to jbmc/regression/jbmc/exceptions5/B.class diff --git a/regression/cbmc-java/exceptions5/C.class b/jbmc/regression/jbmc/exceptions5/C.class similarity index 100% rename from regression/cbmc-java/exceptions5/C.class rename to jbmc/regression/jbmc/exceptions5/C.class diff --git a/regression/cbmc-java/exceptions5/D.class b/jbmc/regression/jbmc/exceptions5/D.class similarity index 100% rename from regression/cbmc-java/exceptions5/D.class rename to jbmc/regression/jbmc/exceptions5/D.class diff --git a/regression/cbmc-java/exceptions5/test.class b/jbmc/regression/jbmc/exceptions5/test.class similarity index 100% rename from regression/cbmc-java/exceptions5/test.class rename to jbmc/regression/jbmc/exceptions5/test.class diff --git a/regression/cbmc-java/exceptions5/test.desc b/jbmc/regression/jbmc/exceptions5/test.desc similarity index 100% rename from regression/cbmc-java/exceptions5/test.desc rename to jbmc/regression/jbmc/exceptions5/test.desc diff --git a/regression/cbmc-java/exceptions5/test.java b/jbmc/regression/jbmc/exceptions5/test.java similarity index 100% rename from regression/cbmc-java/exceptions5/test.java rename to jbmc/regression/jbmc/exceptions5/test.java diff --git a/regression/cbmc-java/exceptions6/A.class b/jbmc/regression/jbmc/exceptions6/A.class similarity index 100% rename from regression/cbmc-java/exceptions6/A.class rename to jbmc/regression/jbmc/exceptions6/A.class diff --git a/regression/cbmc-java/exceptions6/B.class b/jbmc/regression/jbmc/exceptions6/B.class similarity index 100% rename from regression/cbmc-java/exceptions6/B.class rename to jbmc/regression/jbmc/exceptions6/B.class diff --git a/regression/cbmc-java/exceptions6/C.class b/jbmc/regression/jbmc/exceptions6/C.class similarity index 100% rename from regression/cbmc-java/exceptions6/C.class rename to jbmc/regression/jbmc/exceptions6/C.class diff --git a/regression/cbmc-java/exceptions6/D.class b/jbmc/regression/jbmc/exceptions6/D.class similarity index 100% rename from regression/cbmc-java/exceptions6/D.class rename to jbmc/regression/jbmc/exceptions6/D.class diff --git a/regression/cbmc-java/exceptions6/test.class b/jbmc/regression/jbmc/exceptions6/test.class similarity index 100% rename from regression/cbmc-java/exceptions6/test.class rename to jbmc/regression/jbmc/exceptions6/test.class diff --git a/regression/cbmc-java/exceptions6/test.desc b/jbmc/regression/jbmc/exceptions6/test.desc similarity index 100% rename from regression/cbmc-java/exceptions6/test.desc rename to jbmc/regression/jbmc/exceptions6/test.desc diff --git a/regression/cbmc-java/exceptions6/test.java b/jbmc/regression/jbmc/exceptions6/test.java similarity index 100% rename from regression/cbmc-java/exceptions6/test.java rename to jbmc/regression/jbmc/exceptions6/test.java diff --git a/regression/cbmc-java/exceptions7/A.class b/jbmc/regression/jbmc/exceptions7/A.class similarity index 100% rename from regression/cbmc-java/exceptions7/A.class rename to jbmc/regression/jbmc/exceptions7/A.class diff --git a/regression/cbmc-java/exceptions7/B.class b/jbmc/regression/jbmc/exceptions7/B.class similarity index 100% rename from regression/cbmc-java/exceptions7/B.class rename to jbmc/regression/jbmc/exceptions7/B.class diff --git a/regression/cbmc-java/exceptions7/C.class b/jbmc/regression/jbmc/exceptions7/C.class similarity index 100% rename from regression/cbmc-java/exceptions7/C.class rename to jbmc/regression/jbmc/exceptions7/C.class diff --git a/regression/cbmc-java/exceptions7/test.class b/jbmc/regression/jbmc/exceptions7/test.class similarity index 100% rename from regression/cbmc-java/exceptions7/test.class rename to jbmc/regression/jbmc/exceptions7/test.class diff --git a/regression/cbmc-java/exceptions7/test.desc b/jbmc/regression/jbmc/exceptions7/test.desc similarity index 100% rename from regression/cbmc-java/exceptions7/test.desc rename to jbmc/regression/jbmc/exceptions7/test.desc diff --git a/regression/cbmc-java/exceptions7/test.java b/jbmc/regression/jbmc/exceptions7/test.java similarity index 100% rename from regression/cbmc-java/exceptions7/test.java rename to jbmc/regression/jbmc/exceptions7/test.java diff --git a/regression/cbmc-java/exceptions8/A.class b/jbmc/regression/jbmc/exceptions8/A.class similarity index 100% rename from regression/cbmc-java/exceptions8/A.class rename to jbmc/regression/jbmc/exceptions8/A.class diff --git a/regression/cbmc-java/exceptions8/B.class b/jbmc/regression/jbmc/exceptions8/B.class similarity index 100% rename from regression/cbmc-java/exceptions8/B.class rename to jbmc/regression/jbmc/exceptions8/B.class diff --git a/regression/cbmc-java/exceptions8/C.class b/jbmc/regression/jbmc/exceptions8/C.class similarity index 100% rename from regression/cbmc-java/exceptions8/C.class rename to jbmc/regression/jbmc/exceptions8/C.class diff --git a/regression/cbmc-java/exceptions8/test.class b/jbmc/regression/jbmc/exceptions8/test.class similarity index 100% rename from regression/cbmc-java/exceptions8/test.class rename to jbmc/regression/jbmc/exceptions8/test.class diff --git a/regression/cbmc-java/exceptions8/test.desc b/jbmc/regression/jbmc/exceptions8/test.desc similarity index 100% rename from regression/cbmc-java/exceptions8/test.desc rename to jbmc/regression/jbmc/exceptions8/test.desc diff --git a/regression/cbmc-java/exceptions8/test.java b/jbmc/regression/jbmc/exceptions8/test.java similarity index 100% rename from regression/cbmc-java/exceptions8/test.java rename to jbmc/regression/jbmc/exceptions8/test.java diff --git a/regression/cbmc-java/exceptions9/A.class b/jbmc/regression/jbmc/exceptions9/A.class similarity index 100% rename from regression/cbmc-java/exceptions9/A.class rename to jbmc/regression/jbmc/exceptions9/A.class diff --git a/regression/cbmc-java/exceptions9/B.class b/jbmc/regression/jbmc/exceptions9/B.class similarity index 100% rename from regression/cbmc-java/exceptions9/B.class rename to jbmc/regression/jbmc/exceptions9/B.class diff --git a/regression/cbmc-java/exceptions9/C.class b/jbmc/regression/jbmc/exceptions9/C.class similarity index 100% rename from regression/cbmc-java/exceptions9/C.class rename to jbmc/regression/jbmc/exceptions9/C.class diff --git a/regression/cbmc-java/exceptions9/test.class b/jbmc/regression/jbmc/exceptions9/test.class similarity index 100% rename from regression/cbmc-java/exceptions9/test.class rename to jbmc/regression/jbmc/exceptions9/test.class diff --git a/regression/cbmc-java/exceptions9/test.desc b/jbmc/regression/jbmc/exceptions9/test.desc similarity index 100% rename from regression/cbmc-java/exceptions9/test.desc rename to jbmc/regression/jbmc/exceptions9/test.desc diff --git a/regression/cbmc-java/exceptions9/test.java b/jbmc/regression/jbmc/exceptions9/test.java similarity index 100% rename from regression/cbmc-java/exceptions9/test.java rename to jbmc/regression/jbmc/exceptions9/test.java diff --git a/regression/cbmc-java/external_getstatic1/test.class b/jbmc/regression/jbmc/external_getstatic1/test.class similarity index 100% rename from regression/cbmc-java/external_getstatic1/test.class rename to jbmc/regression/jbmc/external_getstatic1/test.class diff --git a/regression/cbmc-java/external_getstatic1/test.desc b/jbmc/regression/jbmc/external_getstatic1/test.desc similarity index 100% rename from regression/cbmc-java/external_getstatic1/test.desc rename to jbmc/regression/jbmc/external_getstatic1/test.desc diff --git a/regression/cbmc-java/external_getstatic1/test.java b/jbmc/regression/jbmc/external_getstatic1/test.java similarity index 100% rename from regression/cbmc-java/external_getstatic1/test.java rename to jbmc/regression/jbmc/external_getstatic1/test.java diff --git a/regression/cbmc-java/farith1/__CPROVER.class b/jbmc/regression/jbmc/farith1/__CPROVER.class similarity index 100% rename from regression/cbmc-java/farith1/__CPROVER.class rename to jbmc/regression/jbmc/farith1/__CPROVER.class diff --git a/regression/cbmc-java/farith1/farith1.class b/jbmc/regression/jbmc/farith1/farith1.class similarity index 100% rename from regression/cbmc-java/farith1/farith1.class rename to jbmc/regression/jbmc/farith1/farith1.class diff --git a/regression/cbmc-java/farith1/farith1.java b/jbmc/regression/jbmc/farith1/farith1.java similarity index 100% rename from regression/cbmc-java/farith1/farith1.java rename to jbmc/regression/jbmc/farith1/farith1.java diff --git a/regression/cbmc-java/farith1/test.desc b/jbmc/regression/jbmc/farith1/test.desc similarity index 100% rename from regression/cbmc-java/farith1/test.desc rename to jbmc/regression/jbmc/farith1/test.desc diff --git a/regression/cbmc-java/fcmpx_dcmpx1/fcmpx_dcmpx1.class b/jbmc/regression/jbmc/fcmpx_dcmpx1/fcmpx_dcmpx1.class similarity index 100% rename from regression/cbmc-java/fcmpx_dcmpx1/fcmpx_dcmpx1.class rename to jbmc/regression/jbmc/fcmpx_dcmpx1/fcmpx_dcmpx1.class diff --git a/regression/cbmc-java/fcmpx_dcmpx1/fcmpx_dcmpx1.java b/jbmc/regression/jbmc/fcmpx_dcmpx1/fcmpx_dcmpx1.java similarity index 100% rename from regression/cbmc-java/fcmpx_dcmpx1/fcmpx_dcmpx1.java rename to jbmc/regression/jbmc/fcmpx_dcmpx1/fcmpx_dcmpx1.java diff --git a/regression/cbmc-java/fcmpx_dcmpx1/test.desc b/jbmc/regression/jbmc/fcmpx_dcmpx1/test.desc similarity index 100% rename from regression/cbmc-java/fcmpx_dcmpx1/test.desc rename to jbmc/regression/jbmc/fcmpx_dcmpx1/test.desc diff --git a/regression/cbmc-java/finally1/test.class b/jbmc/regression/jbmc/finally1/test.class similarity index 100% rename from regression/cbmc-java/finally1/test.class rename to jbmc/regression/jbmc/finally1/test.class diff --git a/regression/cbmc-java/finally1/test.desc b/jbmc/regression/jbmc/finally1/test.desc similarity index 100% rename from regression/cbmc-java/finally1/test.desc rename to jbmc/regression/jbmc/finally1/test.desc diff --git a/regression/cbmc-java/finally1/test.java b/jbmc/regression/jbmc/finally1/test.java similarity index 100% rename from regression/cbmc-java/finally1/test.java rename to jbmc/regression/jbmc/finally1/test.java diff --git a/regression/cbmc-java/finally2/test.class b/jbmc/regression/jbmc/finally2/test.class similarity index 100% rename from regression/cbmc-java/finally2/test.class rename to jbmc/regression/jbmc/finally2/test.class diff --git a/regression/cbmc-java/finally2/test.desc b/jbmc/regression/jbmc/finally2/test.desc similarity index 100% rename from regression/cbmc-java/finally2/test.desc rename to jbmc/regression/jbmc/finally2/test.desc diff --git a/regression/cbmc-java/finally2/test.java b/jbmc/regression/jbmc/finally2/test.java similarity index 100% rename from regression/cbmc-java/finally2/test.java rename to jbmc/regression/jbmc/finally2/test.java diff --git a/regression/cbmc-java/finally3/test.class b/jbmc/regression/jbmc/finally3/test.class similarity index 100% rename from regression/cbmc-java/finally3/test.class rename to jbmc/regression/jbmc/finally3/test.class diff --git a/regression/cbmc-java/finally3/test.desc b/jbmc/regression/jbmc/finally3/test.desc similarity index 100% rename from regression/cbmc-java/finally3/test.desc rename to jbmc/regression/jbmc/finally3/test.desc diff --git a/regression/cbmc-java/finally3/test.java b/jbmc/regression/jbmc/finally3/test.java similarity index 100% rename from regression/cbmc-java/finally3/test.java rename to jbmc/regression/jbmc/finally3/test.java diff --git a/regression/cbmc-java/finally4/test.class b/jbmc/regression/jbmc/finally4/test.class similarity index 100% rename from regression/cbmc-java/finally4/test.class rename to jbmc/regression/jbmc/finally4/test.class diff --git a/regression/cbmc-java/finally4/test.desc b/jbmc/regression/jbmc/finally4/test.desc similarity index 100% rename from regression/cbmc-java/finally4/test.desc rename to jbmc/regression/jbmc/finally4/test.desc diff --git a/regression/cbmc-java/finally4/test.java b/jbmc/regression/jbmc/finally4/test.java similarity index 100% rename from regression/cbmc-java/finally4/test.java rename to jbmc/regression/jbmc/finally4/test.java diff --git a/regression/cbmc-java/finally5/test.class b/jbmc/regression/jbmc/finally5/test.class similarity index 100% rename from regression/cbmc-java/finally5/test.class rename to jbmc/regression/jbmc/finally5/test.class diff --git a/regression/cbmc-java/finally5/test.desc b/jbmc/regression/jbmc/finally5/test.desc similarity index 100% rename from regression/cbmc-java/finally5/test.desc rename to jbmc/regression/jbmc/finally5/test.desc diff --git a/regression/cbmc-java/finally5/test.java b/jbmc/regression/jbmc/finally5/test.java similarity index 100% rename from regression/cbmc-java/finally5/test.java rename to jbmc/regression/jbmc/finally5/test.java diff --git a/regression/cbmc-java/finally6/test.class b/jbmc/regression/jbmc/finally6/test.class similarity index 100% rename from regression/cbmc-java/finally6/test.class rename to jbmc/regression/jbmc/finally6/test.class diff --git a/regression/cbmc-java/finally6/test.desc b/jbmc/regression/jbmc/finally6/test.desc similarity index 100% rename from regression/cbmc-java/finally6/test.desc rename to jbmc/regression/jbmc/finally6/test.desc diff --git a/regression/cbmc-java/finally6/test.java b/jbmc/regression/jbmc/finally6/test.java similarity index 100% rename from regression/cbmc-java/finally6/test.java rename to jbmc/regression/jbmc/finally6/test.java diff --git a/regression/cbmc-java/finally7/test.class b/jbmc/regression/jbmc/finally7/test.class similarity index 100% rename from regression/cbmc-java/finally7/test.class rename to jbmc/regression/jbmc/finally7/test.class diff --git a/regression/cbmc-java/finally7/test.desc b/jbmc/regression/jbmc/finally7/test.desc similarity index 100% rename from regression/cbmc-java/finally7/test.desc rename to jbmc/regression/jbmc/finally7/test.desc diff --git a/regression/cbmc-java/finally7/test.java b/jbmc/regression/jbmc/finally7/test.java similarity index 100% rename from regression/cbmc-java/finally7/test.java rename to jbmc/regression/jbmc/finally7/test.java diff --git a/regression/cbmc-java/float1/float1.class b/jbmc/regression/jbmc/float1/float1.class similarity index 100% rename from regression/cbmc-java/float1/float1.class rename to jbmc/regression/jbmc/float1/float1.class diff --git a/regression/cbmc-java/float1/float1.java b/jbmc/regression/jbmc/float1/float1.java similarity index 100% rename from regression/cbmc-java/float1/float1.java rename to jbmc/regression/jbmc/float1/float1.java diff --git a/regression/cbmc-java/float1/test.desc b/jbmc/regression/jbmc/float1/test.desc similarity index 100% rename from regression/cbmc-java/float1/test.desc rename to jbmc/regression/jbmc/float1/test.desc diff --git a/regression/cbmc-java/function1/Main.class b/jbmc/regression/jbmc/function1/Main.class similarity index 100% rename from regression/cbmc-java/function1/Main.class rename to jbmc/regression/jbmc/function1/Main.class diff --git a/regression/cbmc-java/function1/Main.java b/jbmc/regression/jbmc/function1/Main.java similarity index 100% rename from regression/cbmc-java/function1/Main.java rename to jbmc/regression/jbmc/function1/Main.java diff --git a/regression/cbmc-java/function1/Other.class b/jbmc/regression/jbmc/function1/Other.class similarity index 100% rename from regression/cbmc-java/function1/Other.class rename to jbmc/regression/jbmc/function1/Other.class diff --git a/regression/cbmc-java/function1/test.desc b/jbmc/regression/jbmc/function1/test.desc similarity index 100% rename from regression/cbmc-java/function1/test.desc rename to jbmc/regression/jbmc/function1/test.desc diff --git a/regression/cbmc-java/function2/A.class b/jbmc/regression/jbmc/function2/A.class similarity index 100% rename from regression/cbmc-java/function2/A.class rename to jbmc/regression/jbmc/function2/A.class diff --git a/regression/cbmc-java/function2/B.class b/jbmc/regression/jbmc/function2/B.class similarity index 100% rename from regression/cbmc-java/function2/B.class rename to jbmc/regression/jbmc/function2/B.class diff --git a/regression/cbmc-java/function2/C.class b/jbmc/regression/jbmc/function2/C.class similarity index 100% rename from regression/cbmc-java/function2/C.class rename to jbmc/regression/jbmc/function2/C.class diff --git a/regression/cbmc-java/function2/D.class b/jbmc/regression/jbmc/function2/D.class similarity index 100% rename from regression/cbmc-java/function2/D.class rename to jbmc/regression/jbmc/function2/D.class diff --git a/regression/cbmc-java/function2/Main.class b/jbmc/regression/jbmc/function2/Main.class similarity index 100% rename from regression/cbmc-java/function2/Main.class rename to jbmc/regression/jbmc/function2/Main.class diff --git a/regression/cbmc-java/function2/Main.java b/jbmc/regression/jbmc/function2/Main.java similarity index 100% rename from regression/cbmc-java/function2/Main.java rename to jbmc/regression/jbmc/function2/Main.java diff --git a/regression/cbmc-java/function2/test.desc b/jbmc/regression/jbmc/function2/test.desc similarity index 100% rename from regression/cbmc-java/function2/test.desc rename to jbmc/regression/jbmc/function2/test.desc diff --git a/regression/cbmc-java/function3/A.class b/jbmc/regression/jbmc/function3/A.class similarity index 100% rename from regression/cbmc-java/function3/A.class rename to jbmc/regression/jbmc/function3/A.class diff --git a/regression/cbmc-java/function3/B.class b/jbmc/regression/jbmc/function3/B.class similarity index 100% rename from regression/cbmc-java/function3/B.class rename to jbmc/regression/jbmc/function3/B.class diff --git a/regression/cbmc-java/function3/Main.class b/jbmc/regression/jbmc/function3/Main.class similarity index 100% rename from regression/cbmc-java/function3/Main.class rename to jbmc/regression/jbmc/function3/Main.class diff --git a/regression/cbmc-java/function3/Main.java b/jbmc/regression/jbmc/function3/Main.java similarity index 100% rename from regression/cbmc-java/function3/Main.java rename to jbmc/regression/jbmc/function3/Main.java diff --git a/regression/cbmc-java/function3/test.desc b/jbmc/regression/jbmc/function3/test.desc similarity index 100% rename from regression/cbmc-java/function3/test.desc rename to jbmc/regression/jbmc/function3/test.desc diff --git a/regression/cbmc-java/function4/Main.class b/jbmc/regression/jbmc/function4/Main.class similarity index 100% rename from regression/cbmc-java/function4/Main.class rename to jbmc/regression/jbmc/function4/Main.class diff --git a/regression/cbmc-java/function4/Main.java b/jbmc/regression/jbmc/function4/Main.java similarity index 100% rename from regression/cbmc-java/function4/Main.java rename to jbmc/regression/jbmc/function4/Main.java diff --git a/regression/cbmc-java/function4/Other.class b/jbmc/regression/jbmc/function4/Other.class similarity index 100% rename from regression/cbmc-java/function4/Other.class rename to jbmc/regression/jbmc/function4/Other.class diff --git a/regression/cbmc-java/function4/test.desc b/jbmc/regression/jbmc/function4/test.desc similarity index 100% rename from regression/cbmc-java/function4/test.desc rename to jbmc/regression/jbmc/function4/test.desc diff --git a/regression/cbmc-java/generic_class_bound1/A.class b/jbmc/regression/jbmc/generic_class_bound1/A.class similarity index 100% rename from regression/cbmc-java/generic_class_bound1/A.class rename to jbmc/regression/jbmc/generic_class_bound1/A.class diff --git a/regression/cbmc-java/generic_class_bound1/B.class b/jbmc/regression/jbmc/generic_class_bound1/B.class similarity index 100% rename from regression/cbmc-java/generic_class_bound1/B.class rename to jbmc/regression/jbmc/generic_class_bound1/B.class diff --git a/regression/cbmc-java/generic_class_bound1/C.class b/jbmc/regression/jbmc/generic_class_bound1/C.class similarity index 100% rename from regression/cbmc-java/generic_class_bound1/C.class rename to jbmc/regression/jbmc/generic_class_bound1/C.class diff --git a/regression/cbmc-java/generic_class_bound1/Gn.class b/jbmc/regression/jbmc/generic_class_bound1/Gn.class similarity index 100% rename from regression/cbmc-java/generic_class_bound1/Gn.class rename to jbmc/regression/jbmc/generic_class_bound1/Gn.class diff --git a/regression/cbmc-java/generic_class_bound1/Gn.java b/jbmc/regression/jbmc/generic_class_bound1/Gn.java similarity index 100% rename from regression/cbmc-java/generic_class_bound1/Gn.java rename to jbmc/regression/jbmc/generic_class_bound1/Gn.java diff --git a/regression/cbmc-java/generic_class_bound1/L.class b/jbmc/regression/jbmc/generic_class_bound1/L.class similarity index 100% rename from regression/cbmc-java/generic_class_bound1/L.class rename to jbmc/regression/jbmc/generic_class_bound1/L.class diff --git a/regression/cbmc-java/generic_class_bound1/test.desc b/jbmc/regression/jbmc/generic_class_bound1/test.desc similarity index 100% rename from regression/cbmc-java/generic_class_bound1/test.desc rename to jbmc/regression/jbmc/generic_class_bound1/test.desc diff --git a/regression/cbmc-java/generics_type_param/AWrapper.class b/jbmc/regression/jbmc/generics_type_param/AWrapper.class similarity index 100% rename from regression/cbmc-java/generics_type_param/AWrapper.class rename to jbmc/regression/jbmc/generics_type_param/AWrapper.class diff --git a/regression/cbmc-java/generics_type_param/FWrapper.class b/jbmc/regression/jbmc/generics_type_param/FWrapper.class similarity index 100% rename from regression/cbmc-java/generics_type_param/FWrapper.class rename to jbmc/regression/jbmc/generics_type_param/FWrapper.class diff --git a/regression/cbmc-java/generics_type_param/GenericFields$SimpleGenericField.class b/jbmc/regression/jbmc/generics_type_param/GenericFields$SimpleGenericField.class similarity index 100% rename from regression/cbmc-java/generics_type_param/GenericFields$SimpleGenericField.class rename to jbmc/regression/jbmc/generics_type_param/GenericFields$SimpleGenericField.class diff --git a/regression/cbmc-java/generics_type_param/GenericFields.class b/jbmc/regression/jbmc/generics_type_param/GenericFields.class similarity index 100% rename from regression/cbmc-java/generics_type_param/GenericFields.class rename to jbmc/regression/jbmc/generics_type_param/GenericFields.class diff --git a/regression/cbmc-java/generics_type_param/GenericFields.java b/jbmc/regression/jbmc/generics_type_param/GenericFields.java similarity index 100% rename from regression/cbmc-java/generics_type_param/GenericFields.java rename to jbmc/regression/jbmc/generics_type_param/GenericFields.java diff --git a/regression/cbmc-java/generics_type_param/IWrapper.class b/jbmc/regression/jbmc/generics_type_param/IWrapper.class similarity index 100% rename from regression/cbmc-java/generics_type_param/IWrapper.class rename to jbmc/regression/jbmc/generics_type_param/IWrapper.class diff --git a/regression/cbmc-java/generics_type_param/SimpleWrapper.class b/jbmc/regression/jbmc/generics_type_param/SimpleWrapper.class similarity index 100% rename from regression/cbmc-java/generics_type_param/SimpleWrapper.class rename to jbmc/regression/jbmc/generics_type_param/SimpleWrapper.class diff --git a/regression/cbmc-java/generics_type_param/test.desc b/jbmc/regression/jbmc/generics_type_param/test.desc similarity index 100% rename from regression/cbmc-java/generics_type_param/test.desc rename to jbmc/regression/jbmc/generics_type_param/test.desc diff --git a/regression/cbmc-java/iarith1/iarith1.class b/jbmc/regression/jbmc/iarith1/iarith1.class similarity index 100% rename from regression/cbmc-java/iarith1/iarith1.class rename to jbmc/regression/jbmc/iarith1/iarith1.class diff --git a/regression/cbmc-java/iarith1/iarith1.java b/jbmc/regression/jbmc/iarith1/iarith1.java similarity index 100% rename from regression/cbmc-java/iarith1/iarith1.java rename to jbmc/regression/jbmc/iarith1/iarith1.java diff --git a/regression/cbmc-java/iarith1/test.desc b/jbmc/regression/jbmc/iarith1/test.desc similarity index 100% rename from regression/cbmc-java/iarith1/test.desc rename to jbmc/regression/jbmc/iarith1/test.desc diff --git a/regression/cbmc-java/iarith2/iarith2.class b/jbmc/regression/jbmc/iarith2/iarith2.class similarity index 100% rename from regression/cbmc-java/iarith2/iarith2.class rename to jbmc/regression/jbmc/iarith2/iarith2.class diff --git a/regression/cbmc-java/iarith2/iarith2.java b/jbmc/regression/jbmc/iarith2/iarith2.java similarity index 100% rename from regression/cbmc-java/iarith2/iarith2.java rename to jbmc/regression/jbmc/iarith2/iarith2.java diff --git a/regression/cbmc-java/iarith2/test.desc b/jbmc/regression/jbmc/iarith2/test.desc similarity index 100% rename from regression/cbmc-java/iarith2/test.desc rename to jbmc/regression/jbmc/iarith2/test.desc diff --git a/regression/cbmc-java/if_acmp1/A.class b/jbmc/regression/jbmc/if_acmp1/A.class similarity index 100% rename from regression/cbmc-java/if_acmp1/A.class rename to jbmc/regression/jbmc/if_acmp1/A.class diff --git a/regression/cbmc-java/if_acmp1/B.class b/jbmc/regression/jbmc/if_acmp1/B.class similarity index 100% rename from regression/cbmc-java/if_acmp1/B.class rename to jbmc/regression/jbmc/if_acmp1/B.class diff --git a/regression/cbmc-java/if_acmp1/if_acmp1.class b/jbmc/regression/jbmc/if_acmp1/if_acmp1.class similarity index 100% rename from regression/cbmc-java/if_acmp1/if_acmp1.class rename to jbmc/regression/jbmc/if_acmp1/if_acmp1.class diff --git a/regression/cbmc-java/if_acmp1/if_acmp1.java b/jbmc/regression/jbmc/if_acmp1/if_acmp1.java similarity index 100% rename from regression/cbmc-java/if_acmp1/if_acmp1.java rename to jbmc/regression/jbmc/if_acmp1/if_acmp1.java diff --git a/regression/cbmc-java/if_acmp1/test.desc b/jbmc/regression/jbmc/if_acmp1/test.desc similarity index 100% rename from regression/cbmc-java/if_acmp1/test.desc rename to jbmc/regression/jbmc/if_acmp1/test.desc diff --git a/regression/cbmc-java/if_expr1/if_expr1.class b/jbmc/regression/jbmc/if_expr1/if_expr1.class similarity index 100% rename from regression/cbmc-java/if_expr1/if_expr1.class rename to jbmc/regression/jbmc/if_expr1/if_expr1.class diff --git a/regression/cbmc-java/if_expr1/if_expr1.java b/jbmc/regression/jbmc/if_expr1/if_expr1.java similarity index 100% rename from regression/cbmc-java/if_expr1/if_expr1.java rename to jbmc/regression/jbmc/if_expr1/if_expr1.java diff --git a/regression/cbmc-java/if_expr1/test.desc b/jbmc/regression/jbmc/if_expr1/test.desc similarity index 100% rename from regression/cbmc-java/if_expr1/test.desc rename to jbmc/regression/jbmc/if_expr1/test.desc diff --git a/regression/cbmc-java/if_icmp1/if_icmp1.class b/jbmc/regression/jbmc/if_icmp1/if_icmp1.class similarity index 100% rename from regression/cbmc-java/if_icmp1/if_icmp1.class rename to jbmc/regression/jbmc/if_icmp1/if_icmp1.class diff --git a/regression/cbmc-java/if_icmp1/if_icmp1.java b/jbmc/regression/jbmc/if_icmp1/if_icmp1.java similarity index 100% rename from regression/cbmc-java/if_icmp1/if_icmp1.java rename to jbmc/regression/jbmc/if_icmp1/if_icmp1.java diff --git a/regression/cbmc-java/if_icmp1/test.desc b/jbmc/regression/jbmc/if_icmp1/test.desc similarity index 100% rename from regression/cbmc-java/if_icmp1/test.desc rename to jbmc/regression/jbmc/if_icmp1/test.desc diff --git a/regression/cbmc-java/ifxx1/ifxx1.class b/jbmc/regression/jbmc/ifxx1/ifxx1.class similarity index 100% rename from regression/cbmc-java/ifxx1/ifxx1.class rename to jbmc/regression/jbmc/ifxx1/ifxx1.class diff --git a/regression/cbmc-java/ifxx1/ifxx1.java b/jbmc/regression/jbmc/ifxx1/ifxx1.java similarity index 100% rename from regression/cbmc-java/ifxx1/ifxx1.java rename to jbmc/regression/jbmc/ifxx1/ifxx1.java diff --git a/regression/cbmc-java/ifxx1/test.desc b/jbmc/regression/jbmc/ifxx1/test.desc similarity index 100% rename from regression/cbmc-java/ifxx1/test.desc rename to jbmc/regression/jbmc/ifxx1/test.desc diff --git a/regression/cbmc-java/inferlexicalscope1/test.class b/jbmc/regression/jbmc/inferlexicalscope1/test.class similarity index 100% rename from regression/cbmc-java/inferlexicalscope1/test.class rename to jbmc/regression/jbmc/inferlexicalscope1/test.class diff --git a/regression/cbmc-java/inferlexicalscope1/test.desc b/jbmc/regression/jbmc/inferlexicalscope1/test.desc similarity index 100% rename from regression/cbmc-java/inferlexicalscope1/test.desc rename to jbmc/regression/jbmc/inferlexicalscope1/test.desc diff --git a/regression/cbmc-java/inferlexicalscope1/test.java b/jbmc/regression/jbmc/inferlexicalscope1/test.java similarity index 100% rename from regression/cbmc-java/inferlexicalscope1/test.java rename to jbmc/regression/jbmc/inferlexicalscope1/test.java diff --git a/regression/cbmc-java/inherited_static_field1/Parent.class b/jbmc/regression/jbmc/inherited_static_field1/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field1/Parent.class rename to jbmc/regression/jbmc/inherited_static_field1/Parent.class diff --git a/regression/cbmc-java/inherited_static_field1/Test.class b/jbmc/regression/jbmc/inherited_static_field1/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field1/Test.class rename to jbmc/regression/jbmc/inherited_static_field1/Test.class diff --git a/regression/cbmc-java/inherited_static_field1/Test.java b/jbmc/regression/jbmc/inherited_static_field1/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field1/Test.java rename to jbmc/regression/jbmc/inherited_static_field1/Test.java diff --git a/regression/cbmc-java/inherited_static_field1/test.desc b/jbmc/regression/jbmc/inherited_static_field1/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field1/test.desc rename to jbmc/regression/jbmc/inherited_static_field1/test.desc diff --git a/regression/cbmc-java/inherited_static_field10/Parent.class b/jbmc/regression/jbmc/inherited_static_field10/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field10/Parent.class rename to jbmc/regression/jbmc/inherited_static_field10/Parent.class diff --git a/regression/cbmc-java/inherited_static_field10/Parent.java b/jbmc/regression/jbmc/inherited_static_field10/Parent.java similarity index 100% rename from regression/cbmc-java/inherited_static_field10/Parent.java rename to jbmc/regression/jbmc/inherited_static_field10/Parent.java diff --git a/regression/cbmc-java/inherited_static_field10/Test.class b/jbmc/regression/jbmc/inherited_static_field10/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field10/Test.class rename to jbmc/regression/jbmc/inherited_static_field10/Test.class diff --git a/regression/cbmc-java/inherited_static_field10/Test.java b/jbmc/regression/jbmc/inherited_static_field10/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field10/Test.java rename to jbmc/regression/jbmc/inherited_static_field10/Test.java diff --git a/regression/cbmc-java/inherited_static_field10/compile_against/Parent.class b/jbmc/regression/jbmc/inherited_static_field10/compile_against/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field10/compile_against/Parent.class rename to jbmc/regression/jbmc/inherited_static_field10/compile_against/Parent.class diff --git a/regression/cbmc-java/inherited_static_field10/compile_against/Parent.java b/jbmc/regression/jbmc/inherited_static_field10/compile_against/Parent.java similarity index 100% rename from regression/cbmc-java/inherited_static_field10/compile_against/Parent.java rename to jbmc/regression/jbmc/inherited_static_field10/compile_against/Parent.java diff --git a/regression/cbmc-java/inherited_static_field10/test.desc b/jbmc/regression/jbmc/inherited_static_field10/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field10/test.desc rename to jbmc/regression/jbmc/inherited_static_field10/test.desc diff --git a/regression/cbmc-java/inherited_static_field2/InterfaceWithStatic.class b/jbmc/regression/jbmc/inherited_static_field2/InterfaceWithStatic.class similarity index 100% rename from regression/cbmc-java/inherited_static_field2/InterfaceWithStatic.class rename to jbmc/regression/jbmc/inherited_static_field2/InterfaceWithStatic.class diff --git a/regression/cbmc-java/inherited_static_field2/InterfaceWithStatic.java b/jbmc/regression/jbmc/inherited_static_field2/InterfaceWithStatic.java similarity index 100% rename from regression/cbmc-java/inherited_static_field2/InterfaceWithStatic.java rename to jbmc/regression/jbmc/inherited_static_field2/InterfaceWithStatic.java diff --git a/regression/cbmc-java/inherited_static_field2/Parent.class b/jbmc/regression/jbmc/inherited_static_field2/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field2/Parent.class rename to jbmc/regression/jbmc/inherited_static_field2/Parent.class diff --git a/regression/cbmc-java/inherited_static_field2/Test.class b/jbmc/regression/jbmc/inherited_static_field2/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field2/Test.class rename to jbmc/regression/jbmc/inherited_static_field2/Test.class diff --git a/regression/cbmc-java/inherited_static_field2/Test.java b/jbmc/regression/jbmc/inherited_static_field2/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field2/Test.java rename to jbmc/regression/jbmc/inherited_static_field2/Test.java diff --git a/regression/cbmc-java/inherited_static_field2/test.desc b/jbmc/regression/jbmc/inherited_static_field2/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field2/test.desc rename to jbmc/regression/jbmc/inherited_static_field2/test.desc diff --git a/regression/cbmc-java/inherited_static_field3/Test.class b/jbmc/regression/jbmc/inherited_static_field3/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field3/Test.class rename to jbmc/regression/jbmc/inherited_static_field3/Test.class diff --git a/regression/cbmc-java/inherited_static_field3/Test.java b/jbmc/regression/jbmc/inherited_static_field3/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field3/Test.java rename to jbmc/regression/jbmc/inherited_static_field3/Test.java diff --git a/regression/cbmc-java/inherited_static_field3/test.desc b/jbmc/regression/jbmc/inherited_static_field3/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field3/test.desc rename to jbmc/regression/jbmc/inherited_static_field3/test.desc diff --git a/regression/cbmc-java/inherited_static_field4/Grandparent.class b/jbmc/regression/jbmc/inherited_static_field4/Grandparent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field4/Grandparent.class rename to jbmc/regression/jbmc/inherited_static_field4/Grandparent.class diff --git a/regression/cbmc-java/inherited_static_field4/Parent.class b/jbmc/regression/jbmc/inherited_static_field4/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field4/Parent.class rename to jbmc/regression/jbmc/inherited_static_field4/Parent.class diff --git a/regression/cbmc-java/inherited_static_field4/Test.class b/jbmc/regression/jbmc/inherited_static_field4/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field4/Test.class rename to jbmc/regression/jbmc/inherited_static_field4/Test.class diff --git a/regression/cbmc-java/inherited_static_field4/Test.java b/jbmc/regression/jbmc/inherited_static_field4/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field4/Test.java rename to jbmc/regression/jbmc/inherited_static_field4/Test.java diff --git a/regression/cbmc-java/inherited_static_field4/test.desc b/jbmc/regression/jbmc/inherited_static_field4/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field4/test.desc rename to jbmc/regression/jbmc/inherited_static_field4/test.desc diff --git a/regression/cbmc-java/inherited_static_field5/InterfaceWithStatic.class b/jbmc/regression/jbmc/inherited_static_field5/InterfaceWithStatic.class similarity index 100% rename from regression/cbmc-java/inherited_static_field5/InterfaceWithStatic.class rename to jbmc/regression/jbmc/inherited_static_field5/InterfaceWithStatic.class diff --git a/regression/cbmc-java/inherited_static_field5/InterfaceWithStatic.java b/jbmc/regression/jbmc/inherited_static_field5/InterfaceWithStatic.java similarity index 100% rename from regression/cbmc-java/inherited_static_field5/InterfaceWithStatic.java rename to jbmc/regression/jbmc/inherited_static_field5/InterfaceWithStatic.java diff --git a/regression/cbmc-java/inherited_static_field5/Test.class b/jbmc/regression/jbmc/inherited_static_field5/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field5/Test.class rename to jbmc/regression/jbmc/inherited_static_field5/Test.class diff --git a/regression/cbmc-java/inherited_static_field5/Test.java b/jbmc/regression/jbmc/inherited_static_field5/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field5/Test.java rename to jbmc/regression/jbmc/inherited_static_field5/Test.java diff --git a/regression/cbmc-java/inherited_static_field5/test.desc b/jbmc/regression/jbmc/inherited_static_field5/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field5/test.desc rename to jbmc/regression/jbmc/inherited_static_field5/test.desc diff --git a/regression/cbmc-java/inherited_static_field6/Grandparent.class b/jbmc/regression/jbmc/inherited_static_field6/Grandparent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field6/Grandparent.class rename to jbmc/regression/jbmc/inherited_static_field6/Grandparent.class diff --git a/regression/cbmc-java/inherited_static_field6/Test.class b/jbmc/regression/jbmc/inherited_static_field6/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field6/Test.class rename to jbmc/regression/jbmc/inherited_static_field6/Test.class diff --git a/regression/cbmc-java/inherited_static_field6/Test.java b/jbmc/regression/jbmc/inherited_static_field6/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field6/Test.java rename to jbmc/regression/jbmc/inherited_static_field6/Test.java diff --git a/regression/cbmc-java/inherited_static_field6/test.desc b/jbmc/regression/jbmc/inherited_static_field6/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field6/test.desc rename to jbmc/regression/jbmc/inherited_static_field6/test.desc diff --git a/regression/cbmc-java/inherited_static_field7/OpaqueInterfaceWithStatic.java b/jbmc/regression/jbmc/inherited_static_field7/OpaqueInterfaceWithStatic.java similarity index 100% rename from regression/cbmc-java/inherited_static_field7/OpaqueInterfaceWithStatic.java rename to jbmc/regression/jbmc/inherited_static_field7/OpaqueInterfaceWithStatic.java diff --git a/regression/cbmc-java/inherited_static_field7/Test.class b/jbmc/regression/jbmc/inherited_static_field7/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field7/Test.class rename to jbmc/regression/jbmc/inherited_static_field7/Test.class diff --git a/regression/cbmc-java/inherited_static_field7/Test.java b/jbmc/regression/jbmc/inherited_static_field7/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field7/Test.java rename to jbmc/regression/jbmc/inherited_static_field7/Test.java diff --git a/regression/cbmc-java/inherited_static_field7/test.desc b/jbmc/regression/jbmc/inherited_static_field7/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field7/test.desc rename to jbmc/regression/jbmc/inherited_static_field7/test.desc diff --git a/regression/cbmc-java/inherited_static_field8/Parent.class b/jbmc/regression/jbmc/inherited_static_field8/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field8/Parent.class rename to jbmc/regression/jbmc/inherited_static_field8/Parent.class diff --git a/regression/cbmc-java/inherited_static_field8/Test.class b/jbmc/regression/jbmc/inherited_static_field8/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field8/Test.class rename to jbmc/regression/jbmc/inherited_static_field8/Test.class diff --git a/regression/cbmc-java/inherited_static_field8/Test.java b/jbmc/regression/jbmc/inherited_static_field8/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field8/Test.java rename to jbmc/regression/jbmc/inherited_static_field8/Test.java diff --git a/regression/cbmc-java/inherited_static_field8/test.desc b/jbmc/regression/jbmc/inherited_static_field8/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field8/test.desc rename to jbmc/regression/jbmc/inherited_static_field8/test.desc diff --git a/regression/cbmc-java/inherited_static_field9/Parent.class b/jbmc/regression/jbmc/inherited_static_field9/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field9/Parent.class rename to jbmc/regression/jbmc/inherited_static_field9/Parent.class diff --git a/regression/cbmc-java/inherited_static_field9/Parent.java b/jbmc/regression/jbmc/inherited_static_field9/Parent.java similarity index 100% rename from regression/cbmc-java/inherited_static_field9/Parent.java rename to jbmc/regression/jbmc/inherited_static_field9/Parent.java diff --git a/regression/cbmc-java/inherited_static_field9/Test.class b/jbmc/regression/jbmc/inherited_static_field9/Test.class similarity index 100% rename from regression/cbmc-java/inherited_static_field9/Test.class rename to jbmc/regression/jbmc/inherited_static_field9/Test.class diff --git a/regression/cbmc-java/inherited_static_field9/Test.java b/jbmc/regression/jbmc/inherited_static_field9/Test.java similarity index 100% rename from regression/cbmc-java/inherited_static_field9/Test.java rename to jbmc/regression/jbmc/inherited_static_field9/Test.java diff --git a/regression/cbmc-java/inherited_static_field9/compile_against/Parent.class b/jbmc/regression/jbmc/inherited_static_field9/compile_against/Parent.class similarity index 100% rename from regression/cbmc-java/inherited_static_field9/compile_against/Parent.class rename to jbmc/regression/jbmc/inherited_static_field9/compile_against/Parent.class diff --git a/regression/cbmc-java/inherited_static_field9/compile_against/Parent.java b/jbmc/regression/jbmc/inherited_static_field9/compile_against/Parent.java similarity index 100% rename from regression/cbmc-java/inherited_static_field9/compile_against/Parent.java rename to jbmc/regression/jbmc/inherited_static_field9/compile_against/Parent.java diff --git a/regression/cbmc-java/inherited_static_field9/test.desc b/jbmc/regression/jbmc/inherited_static_field9/test.desc similarity index 100% rename from regression/cbmc-java/inherited_static_field9/test.desc rename to jbmc/regression/jbmc/inherited_static_field9/test.desc diff --git a/regression/cbmc-java/instanceof1/instanceof1.class b/jbmc/regression/jbmc/instanceof1/instanceof1.class similarity index 100% rename from regression/cbmc-java/instanceof1/instanceof1.class rename to jbmc/regression/jbmc/instanceof1/instanceof1.class diff --git a/regression/cbmc-java/instanceof1/instanceof1.java b/jbmc/regression/jbmc/instanceof1/instanceof1.java similarity index 100% rename from regression/cbmc-java/instanceof1/instanceof1.java rename to jbmc/regression/jbmc/instanceof1/instanceof1.java diff --git a/regression/cbmc-java/instanceof1/test.desc b/jbmc/regression/jbmc/instanceof1/test.desc similarity index 100% rename from regression/cbmc-java/instanceof1/test.desc rename to jbmc/regression/jbmc/instanceof1/test.desc diff --git a/regression/cbmc-java/instanceof2/instanceof2.class b/jbmc/regression/jbmc/instanceof2/instanceof2.class similarity index 100% rename from regression/cbmc-java/instanceof2/instanceof2.class rename to jbmc/regression/jbmc/instanceof2/instanceof2.class diff --git a/regression/cbmc-java/instanceof2/instanceof2.java b/jbmc/regression/jbmc/instanceof2/instanceof2.java similarity index 100% rename from regression/cbmc-java/instanceof2/instanceof2.java rename to jbmc/regression/jbmc/instanceof2/instanceof2.java diff --git a/regression/cbmc-java/instanceof2/test.desc b/jbmc/regression/jbmc/instanceof2/test.desc similarity index 100% rename from regression/cbmc-java/instanceof2/test.desc rename to jbmc/regression/jbmc/instanceof2/test.desc diff --git a/regression/cbmc-java/instanceof3/instanceof3.class b/jbmc/regression/jbmc/instanceof3/instanceof3.class similarity index 100% rename from regression/cbmc-java/instanceof3/instanceof3.class rename to jbmc/regression/jbmc/instanceof3/instanceof3.class diff --git a/regression/cbmc-java/instanceof3/instanceof3.java b/jbmc/regression/jbmc/instanceof3/instanceof3.java similarity index 100% rename from regression/cbmc-java/instanceof3/instanceof3.java rename to jbmc/regression/jbmc/instanceof3/instanceof3.java diff --git a/regression/cbmc-java/instanceof3/test.desc b/jbmc/regression/jbmc/instanceof3/test.desc similarity index 100% rename from regression/cbmc-java/instanceof3/test.desc rename to jbmc/regression/jbmc/instanceof3/test.desc diff --git a/regression/cbmc-java/instanceof4/instanceof4.class b/jbmc/regression/jbmc/instanceof4/instanceof4.class similarity index 100% rename from regression/cbmc-java/instanceof4/instanceof4.class rename to jbmc/regression/jbmc/instanceof4/instanceof4.class diff --git a/regression/cbmc-java/instanceof4/instanceof4.java b/jbmc/regression/jbmc/instanceof4/instanceof4.java similarity index 100% rename from regression/cbmc-java/instanceof4/instanceof4.java rename to jbmc/regression/jbmc/instanceof4/instanceof4.java diff --git a/regression/cbmc-java/instanceof4/test.desc b/jbmc/regression/jbmc/instanceof4/test.desc similarity index 100% rename from regression/cbmc-java/instanceof4/test.desc rename to jbmc/regression/jbmc/instanceof4/test.desc diff --git a/regression/cbmc-java/instanceof5/instanceof5.class b/jbmc/regression/jbmc/instanceof5/instanceof5.class similarity index 100% rename from regression/cbmc-java/instanceof5/instanceof5.class rename to jbmc/regression/jbmc/instanceof5/instanceof5.class diff --git a/regression/cbmc-java/instanceof5/instanceof5.java b/jbmc/regression/jbmc/instanceof5/instanceof5.java similarity index 100% rename from regression/cbmc-java/instanceof5/instanceof5.java rename to jbmc/regression/jbmc/instanceof5/instanceof5.java diff --git a/regression/cbmc-java/instanceof5/test.desc b/jbmc/regression/jbmc/instanceof5/test.desc similarity index 100% rename from regression/cbmc-java/instanceof5/test.desc rename to jbmc/regression/jbmc/instanceof5/test.desc diff --git a/regression/cbmc-java/instanceof6/A.class b/jbmc/regression/jbmc/instanceof6/A.class similarity index 100% rename from regression/cbmc-java/instanceof6/A.class rename to jbmc/regression/jbmc/instanceof6/A.class diff --git a/regression/cbmc-java/instanceof6/B.class b/jbmc/regression/jbmc/instanceof6/B.class similarity index 100% rename from regression/cbmc-java/instanceof6/B.class rename to jbmc/regression/jbmc/instanceof6/B.class diff --git a/regression/cbmc-java/instanceof6/instanceof6.class b/jbmc/regression/jbmc/instanceof6/instanceof6.class similarity index 100% rename from regression/cbmc-java/instanceof6/instanceof6.class rename to jbmc/regression/jbmc/instanceof6/instanceof6.class diff --git a/regression/cbmc-java/instanceof6/instanceof6.java b/jbmc/regression/jbmc/instanceof6/instanceof6.java similarity index 100% rename from regression/cbmc-java/instanceof6/instanceof6.java rename to jbmc/regression/jbmc/instanceof6/instanceof6.java diff --git a/regression/cbmc-java/instanceof6/test.desc b/jbmc/regression/jbmc/instanceof6/test.desc similarity index 100% rename from regression/cbmc-java/instanceof6/test.desc rename to jbmc/regression/jbmc/instanceof6/test.desc diff --git a/regression/cbmc-java/instanceof7/A.class b/jbmc/regression/jbmc/instanceof7/A.class similarity index 100% rename from regression/cbmc-java/instanceof7/A.class rename to jbmc/regression/jbmc/instanceof7/A.class diff --git a/regression/cbmc-java/instanceof7/B.class b/jbmc/regression/jbmc/instanceof7/B.class similarity index 100% rename from regression/cbmc-java/instanceof7/B.class rename to jbmc/regression/jbmc/instanceof7/B.class diff --git a/regression/cbmc-java/instanceof7/instanceof7.class b/jbmc/regression/jbmc/instanceof7/instanceof7.class similarity index 100% rename from regression/cbmc-java/instanceof7/instanceof7.class rename to jbmc/regression/jbmc/instanceof7/instanceof7.class diff --git a/regression/cbmc-java/instanceof7/instanceof7.java b/jbmc/regression/jbmc/instanceof7/instanceof7.java similarity index 100% rename from regression/cbmc-java/instanceof7/instanceof7.java rename to jbmc/regression/jbmc/instanceof7/instanceof7.java diff --git a/regression/cbmc-java/instanceof7/test.desc b/jbmc/regression/jbmc/instanceof7/test.desc similarity index 100% rename from regression/cbmc-java/instanceof7/test.desc rename to jbmc/regression/jbmc/instanceof7/test.desc diff --git a/regression/cbmc-java/instanceof8/InstanceOf8.class b/jbmc/regression/jbmc/instanceof8/InstanceOf8.class similarity index 100% rename from regression/cbmc-java/instanceof8/InstanceOf8.class rename to jbmc/regression/jbmc/instanceof8/InstanceOf8.class diff --git a/regression/cbmc-java/instanceof8/InstanceOf8.java b/jbmc/regression/jbmc/instanceof8/InstanceOf8.java similarity index 100% rename from regression/cbmc-java/instanceof8/InstanceOf8.java rename to jbmc/regression/jbmc/instanceof8/InstanceOf8.java diff --git a/regression/cbmc-java/instanceof8/test.desc b/jbmc/regression/jbmc/instanceof8/test.desc similarity index 100% rename from regression/cbmc-java/instanceof8/test.desc rename to jbmc/regression/jbmc/instanceof8/test.desc diff --git a/regression/cbmc-java/integer_without_simplify1/test.class b/jbmc/regression/jbmc/integer_without_simplify1/test.class similarity index 100% rename from regression/cbmc-java/integer_without_simplify1/test.class rename to jbmc/regression/jbmc/integer_without_simplify1/test.class diff --git a/regression/cbmc-java/integer_without_simplify1/test.desc b/jbmc/regression/jbmc/integer_without_simplify1/test.desc similarity index 100% rename from regression/cbmc-java/integer_without_simplify1/test.desc rename to jbmc/regression/jbmc/integer_without_simplify1/test.desc diff --git a/regression/cbmc-java/integer_without_simplify1/test.java b/jbmc/regression/jbmc/integer_without_simplify1/test.java similarity index 100% rename from regression/cbmc-java/integer_without_simplify1/test.java rename to jbmc/regression/jbmc/integer_without_simplify1/test.java diff --git a/regression/cbmc-java/interface1/A.class b/jbmc/regression/jbmc/interface1/A.class similarity index 100% rename from regression/cbmc-java/interface1/A.class rename to jbmc/regression/jbmc/interface1/A.class diff --git a/regression/cbmc-java/interface1/B.class b/jbmc/regression/jbmc/interface1/B.class similarity index 100% rename from regression/cbmc-java/interface1/B.class rename to jbmc/regression/jbmc/interface1/B.class diff --git a/regression/cbmc-java/interface1/C.class b/jbmc/regression/jbmc/interface1/C.class similarity index 100% rename from regression/cbmc-java/interface1/C.class rename to jbmc/regression/jbmc/interface1/C.class diff --git a/regression/cbmc-java/interface1/interface1.class b/jbmc/regression/jbmc/interface1/interface1.class similarity index 100% rename from regression/cbmc-java/interface1/interface1.class rename to jbmc/regression/jbmc/interface1/interface1.class diff --git a/regression/cbmc-java/interface1/interface1.java b/jbmc/regression/jbmc/interface1/interface1.java similarity index 100% rename from regression/cbmc-java/interface1/interface1.java rename to jbmc/regression/jbmc/interface1/interface1.java diff --git a/regression/cbmc-java/interface1/test.desc b/jbmc/regression/jbmc/interface1/test.desc similarity index 100% rename from regression/cbmc-java/interface1/test.desc rename to jbmc/regression/jbmc/interface1/test.desc diff --git a/regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.class b/jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.class similarity index 100% rename from regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.class rename to jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.class diff --git a/regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.java b/jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.java similarity index 100% rename from regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.java rename to jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Item.java diff --git a/regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.class b/jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.class similarity index 100% rename from regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.class rename to jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.class diff --git a/regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.java b/jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.java similarity index 100% rename from regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.java rename to jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/Order.java diff --git a/regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/readme.txt b/jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/readme.txt similarity index 100% rename from regression/cbmc-java/internal1/com/diffblue/javatest/nestedobjects/subpackage/readme.txt rename to jbmc/regression/jbmc/internal1/com/diffblue/javatest/nestedobjects/subpackage/readme.txt diff --git a/regression/cbmc-java/internal1/test.desc b/jbmc/regression/jbmc/internal1/test.desc similarity index 100% rename from regression/cbmc-java/internal1/test.desc rename to jbmc/regression/jbmc/internal1/test.desc diff --git a/regression/cbmc-java/invalid_classpath/Test.class b/jbmc/regression/jbmc/invalid_classpath/Test.class similarity index 100% rename from regression/cbmc-java/invalid_classpath/Test.class rename to jbmc/regression/jbmc/invalid_classpath/Test.class diff --git a/regression/cbmc-java/invalid_classpath/Test.java b/jbmc/regression/jbmc/invalid_classpath/Test.java similarity index 100% rename from regression/cbmc-java/invalid_classpath/Test.java rename to jbmc/regression/jbmc/invalid_classpath/Test.java diff --git a/regression/cbmc-java/invalid_classpath/test-jar.desc b/jbmc/regression/jbmc/invalid_classpath/test-jar.desc similarity index 100% rename from regression/cbmc-java/invalid_classpath/test-jar.desc rename to jbmc/regression/jbmc/invalid_classpath/test-jar.desc diff --git a/regression/cbmc-java/invalid_classpath/test-path.desc b/jbmc/regression/jbmc/invalid_classpath/test-path.desc similarity index 100% rename from regression/cbmc-java/invalid_classpath/test-path.desc rename to jbmc/regression/jbmc/invalid_classpath/test-path.desc diff --git a/regression/cbmc-java/isnan1/test.class b/jbmc/regression/jbmc/isnan1/test.class similarity index 100% rename from regression/cbmc-java/isnan1/test.class rename to jbmc/regression/jbmc/isnan1/test.class diff --git a/regression/cbmc-java/isnan1/test.desc b/jbmc/regression/jbmc/isnan1/test.desc similarity index 100% rename from regression/cbmc-java/isnan1/test.desc rename to jbmc/regression/jbmc/isnan1/test.desc diff --git a/regression/cbmc-java/isnan1/test.java b/jbmc/regression/jbmc/isnan1/test.java similarity index 100% rename from regression/cbmc-java/isnan1/test.java rename to jbmc/regression/jbmc/isnan1/test.java diff --git a/regression/cbmc-java/iterator1/iterator1.class b/jbmc/regression/jbmc/iterator1/iterator1.class similarity index 100% rename from regression/cbmc-java/iterator1/iterator1.class rename to jbmc/regression/jbmc/iterator1/iterator1.class diff --git a/regression/cbmc-java/iterator1/iterator1.java b/jbmc/regression/jbmc/iterator1/iterator1.java similarity index 100% rename from regression/cbmc-java/iterator1/iterator1.java rename to jbmc/regression/jbmc/iterator1/iterator1.java diff --git a/regression/cbmc-java/iterator1/test.desc b/jbmc/regression/jbmc/iterator1/test.desc similarity index 100% rename from regression/cbmc-java/iterator1/test.desc rename to jbmc/regression/jbmc/iterator1/test.desc diff --git a/regression/cbmc-java/iterator2/iterator2.class b/jbmc/regression/jbmc/iterator2/iterator2.class similarity index 100% rename from regression/cbmc-java/iterator2/iterator2.class rename to jbmc/regression/jbmc/iterator2/iterator2.class diff --git a/regression/cbmc-java/iterator2/iterator2.java b/jbmc/regression/jbmc/iterator2/iterator2.java similarity index 100% rename from regression/cbmc-java/iterator2/iterator2.java rename to jbmc/regression/jbmc/iterator2/iterator2.java diff --git a/regression/cbmc-java/iterator2/test.desc b/jbmc/regression/jbmc/iterator2/test.desc similarity index 100% rename from regression/cbmc-java/iterator2/test.desc rename to jbmc/regression/jbmc/iterator2/test.desc diff --git a/regression/cbmc-java/jar-file1/some_jar.jar b/jbmc/regression/jbmc/jar-file1/some_jar.jar similarity index 100% rename from regression/cbmc-java/jar-file1/some_jar.jar rename to jbmc/regression/jbmc/jar-file1/some_jar.jar diff --git a/regression/cbmc-java/jar-file1/test.desc b/jbmc/regression/jbmc/jar-file1/test.desc similarity index 100% rename from regression/cbmc-java/jar-file1/test.desc rename to jbmc/regression/jbmc/jar-file1/test.desc diff --git a/regression/cbmc-java/jar-file2/jar-file2.jar b/jbmc/regression/jbmc/jar-file2/jar-file2.jar similarity index 100% rename from regression/cbmc-java/jar-file2/jar-file2.jar rename to jbmc/regression/jbmc/jar-file2/jar-file2.jar diff --git a/regression/cbmc-java/jar-file2/some_class.java b/jbmc/regression/jbmc/jar-file2/some_class.java similarity index 100% rename from regression/cbmc-java/jar-file2/some_class.java rename to jbmc/regression/jbmc/jar-file2/some_class.java diff --git a/regression/cbmc-java/jar-file2/test.desc b/jbmc/regression/jbmc/jar-file2/test.desc similarity index 100% rename from regression/cbmc-java/jar-file2/test.desc rename to jbmc/regression/jbmc/jar-file2/test.desc diff --git a/regression/cbmc-java/jar-file3/A.jar b/jbmc/regression/jbmc/jar-file3/A.jar similarity index 100% rename from regression/cbmc-java/jar-file3/A.jar rename to jbmc/regression/jbmc/jar-file3/A.jar diff --git a/regression/cbmc-java/jar-file3/B.jar b/jbmc/regression/jbmc/jar-file3/B.jar similarity index 100% rename from regression/cbmc-java/jar-file3/B.jar rename to jbmc/regression/jbmc/jar-file3/B.jar diff --git a/regression/cbmc-java/jar-file3/C.jar b/jbmc/regression/jbmc/jar-file3/C.jar similarity index 100% rename from regression/cbmc-java/jar-file3/C.jar rename to jbmc/regression/jbmc/jar-file3/C.jar diff --git a/regression/cbmc-java/jar-file3/jarfile3.class b/jbmc/regression/jbmc/jar-file3/jarfile3.class similarity index 100% rename from regression/cbmc-java/jar-file3/jarfile3.class rename to jbmc/regression/jbmc/jar-file3/jarfile3.class diff --git a/regression/cbmc-java/jar-file3/jarfile3.java b/jbmc/regression/jbmc/jar-file3/jarfile3.java similarity index 100% rename from regression/cbmc-java/jar-file3/jarfile3.java rename to jbmc/regression/jbmc/jar-file3/jarfile3.java diff --git a/regression/cbmc-java/jar-file3/test.desc b/jbmc/regression/jbmc/jar-file3/test.desc similarity index 100% rename from regression/cbmc-java/jar-file3/test.desc rename to jbmc/regression/jbmc/jar-file3/test.desc diff --git a/regression/cbmc-java/jar-file4/A.jar b/jbmc/regression/jbmc/jar-file4/A.jar similarity index 100% rename from regression/cbmc-java/jar-file4/A.jar rename to jbmc/regression/jbmc/jar-file4/A.jar diff --git a/regression/cbmc-java/jar-file4/B.jar b/jbmc/regression/jbmc/jar-file4/B.jar similarity index 100% rename from regression/cbmc-java/jar-file4/B.jar rename to jbmc/regression/jbmc/jar-file4/B.jar diff --git a/regression/cbmc-java/jar-file4/C.jar b/jbmc/regression/jbmc/jar-file4/C.jar similarity index 100% rename from regression/cbmc-java/jar-file4/C.jar rename to jbmc/regression/jbmc/jar-file4/C.jar diff --git a/regression/cbmc-java/jar-file4/jar.json b/jbmc/regression/jbmc/jar-file4/jar.json similarity index 100% rename from regression/cbmc-java/jar-file4/jar.json rename to jbmc/regression/jbmc/jar-file4/jar.json diff --git a/regression/cbmc-java/jar-file4/test.desc b/jbmc/regression/jbmc/jar-file4/test.desc similarity index 100% rename from regression/cbmc-java/jar-file4/test.desc rename to jbmc/regression/jbmc/jar-file4/test.desc diff --git a/regression/cbmc-java/json_trace1/Test.class b/jbmc/regression/jbmc/json_trace1/Test.class similarity index 100% rename from regression/cbmc-java/json_trace1/Test.class rename to jbmc/regression/jbmc/json_trace1/Test.class diff --git a/regression/cbmc-java/json_trace1/Test.java b/jbmc/regression/jbmc/json_trace1/Test.java similarity index 100% rename from regression/cbmc-java/json_trace1/Test.java rename to jbmc/regression/jbmc/json_trace1/Test.java diff --git a/regression/cbmc-java/json_trace1/test.desc b/jbmc/regression/jbmc/json_trace1/test.desc similarity index 100% rename from regression/cbmc-java/json_trace1/test.desc rename to jbmc/regression/jbmc/json_trace1/test.desc diff --git a/regression/cbmc-java/json_trace2/Test.class b/jbmc/regression/jbmc/json_trace2/Test.class similarity index 100% rename from regression/cbmc-java/json_trace2/Test.class rename to jbmc/regression/jbmc/json_trace2/Test.class diff --git a/regression/cbmc-java/json_trace2/Test.java b/jbmc/regression/jbmc/json_trace2/Test.java similarity index 100% rename from regression/cbmc-java/json_trace2/Test.java rename to jbmc/regression/jbmc/json_trace2/Test.java diff --git a/regression/cbmc-java/json_trace2/test.desc b/jbmc/regression/jbmc/json_trace2/test.desc similarity index 100% rename from regression/cbmc-java/json_trace2/test.desc rename to jbmc/regression/jbmc/json_trace2/test.desc diff --git a/regression/cbmc-java/json_trace3/Test.class b/jbmc/regression/jbmc/json_trace3/Test.class similarity index 100% rename from regression/cbmc-java/json_trace3/Test.class rename to jbmc/regression/jbmc/json_trace3/Test.class diff --git a/regression/cbmc-java/json_trace3/Test.java b/jbmc/regression/jbmc/json_trace3/Test.java similarity index 100% rename from regression/cbmc-java/json_trace3/Test.java rename to jbmc/regression/jbmc/json_trace3/Test.java diff --git a/regression/cbmc-java/json_trace3/test.desc b/jbmc/regression/jbmc/json_trace3/test.desc similarity index 100% rename from regression/cbmc-java/json_trace3/test.desc rename to jbmc/regression/jbmc/json_trace3/test.desc diff --git a/regression/cbmc-java/jsr1/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentHashMap.class b/jbmc/regression/jbmc/jsr1/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentHashMap.class similarity index 100% rename from regression/cbmc-java/jsr1/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentHashMap.class rename to jbmc/regression/jbmc/jsr1/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentHashMap.class diff --git a/regression/cbmc-java/jsr1/test.desc b/jbmc/regression/jbmc/jsr1/test.desc similarity index 100% rename from regression/cbmc-java/jsr1/test.desc rename to jbmc/regression/jbmc/jsr1/test.desc diff --git a/regression/cbmc-java/jsr2/test.class b/jbmc/regression/jbmc/jsr2/test.class similarity index 100% rename from regression/cbmc-java/jsr2/test.class rename to jbmc/regression/jbmc/jsr2/test.class diff --git a/regression/cbmc-java/jsr2/test.desc b/jbmc/regression/jbmc/jsr2/test.desc similarity index 100% rename from regression/cbmc-java/jsr2/test.desc rename to jbmc/regression/jbmc/jsr2/test.desc diff --git a/regression/cbmc-java/jsr2/test.j b/jbmc/regression/jbmc/jsr2/test.j similarity index 100% rename from regression/cbmc-java/jsr2/test.j rename to jbmc/regression/jbmc/jsr2/test.j diff --git a/regression/cbmc-java/lambda1/B.class b/jbmc/regression/jbmc/lambda1/B.class similarity index 100% rename from regression/cbmc-java/lambda1/B.class rename to jbmc/regression/jbmc/lambda1/B.class diff --git a/regression/cbmc-java/lambda1/B.java b/jbmc/regression/jbmc/lambda1/B.java similarity index 100% rename from regression/cbmc-java/lambda1/B.java rename to jbmc/regression/jbmc/lambda1/B.java diff --git a/regression/cbmc-java/lambda1/C.class b/jbmc/regression/jbmc/lambda1/C.class similarity index 100% rename from regression/cbmc-java/lambda1/C.class rename to jbmc/regression/jbmc/lambda1/C.class diff --git a/regression/cbmc-java/lambda1/CustomLambda.class b/jbmc/regression/jbmc/lambda1/CustomLambda.class similarity index 100% rename from regression/cbmc-java/lambda1/CustomLambda.class rename to jbmc/regression/jbmc/lambda1/CustomLambda.class diff --git a/regression/cbmc-java/lambda1/CustomLambda.java b/jbmc/regression/jbmc/lambda1/CustomLambda.java similarity index 100% rename from regression/cbmc-java/lambda1/CustomLambda.java rename to jbmc/regression/jbmc/lambda1/CustomLambda.java diff --git a/regression/cbmc-java/lambda1/Lambdatest$A.class b/jbmc/regression/jbmc/lambda1/Lambdatest$A.class similarity index 100% rename from regression/cbmc-java/lambda1/Lambdatest$A.class rename to jbmc/regression/jbmc/lambda1/Lambdatest$A.class diff --git a/regression/cbmc-java/lambda1/Lambdatest.class b/jbmc/regression/jbmc/lambda1/Lambdatest.class similarity index 100% rename from regression/cbmc-java/lambda1/Lambdatest.class rename to jbmc/regression/jbmc/lambda1/Lambdatest.class diff --git a/regression/cbmc-java/lambda1/Lambdatest.java b/jbmc/regression/jbmc/lambda1/Lambdatest.java similarity index 100% rename from regression/cbmc-java/lambda1/Lambdatest.java rename to jbmc/regression/jbmc/lambda1/Lambdatest.java diff --git a/regression/cbmc-java/lambda1/test.desc b/jbmc/regression/jbmc/lambda1/test.desc similarity index 100% rename from regression/cbmc-java/lambda1/test.desc rename to jbmc/regression/jbmc/lambda1/test.desc diff --git a/regression/cbmc-java/lambda2/StaticMethodRef.class b/jbmc/regression/jbmc/lambda2/StaticMethodRef.class similarity index 100% rename from regression/cbmc-java/lambda2/StaticMethodRef.class rename to jbmc/regression/jbmc/lambda2/StaticMethodRef.class diff --git a/regression/cbmc-java/lambda2/StaticMethodRef.java b/jbmc/regression/jbmc/lambda2/StaticMethodRef.java similarity index 100% rename from regression/cbmc-java/lambda2/StaticMethodRef.java rename to jbmc/regression/jbmc/lambda2/StaticMethodRef.java diff --git a/regression/cbmc-java/lambda2/SymStream.class b/jbmc/regression/jbmc/lambda2/SymStream.class similarity index 100% rename from regression/cbmc-java/lambda2/SymStream.class rename to jbmc/regression/jbmc/lambda2/SymStream.class diff --git a/regression/cbmc-java/lambda2/readme.txt b/jbmc/regression/jbmc/lambda2/readme.txt similarity index 100% rename from regression/cbmc-java/lambda2/readme.txt rename to jbmc/regression/jbmc/lambda2/readme.txt diff --git a/regression/cbmc-java/lambda2/test.desc b/jbmc/regression/jbmc/lambda2/test.desc similarity index 100% rename from regression/cbmc-java/lambda2/test.desc rename to jbmc/regression/jbmc/lambda2/test.desc diff --git a/regression/cbmc-java/lambda2/test_no_crash.desc b/jbmc/regression/jbmc/lambda2/test_no_crash.desc similarity index 100% rename from regression/cbmc-java/lambda2/test_no_crash.desc rename to jbmc/regression/jbmc/lambda2/test_no_crash.desc diff --git a/regression/cbmc-java/lambda2/test_no_crash_ecj.desc b/jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc similarity index 100% rename from regression/cbmc-java/lambda2/test_no_crash_ecj.desc rename to jbmc/regression/jbmc/lambda2/test_no_crash_ecj.desc diff --git a/regression/cbmc-java/lambda3/LambdaTest/Lamb1.class b/jbmc/regression/jbmc/lambda3/LambdaTest/Lamb1.class similarity index 100% rename from regression/cbmc-java/lambda3/LambdaTest/Lamb1.class rename to jbmc/regression/jbmc/lambda3/LambdaTest/Lamb1.class diff --git a/regression/cbmc-java/lambda3/LambdaTest/Test.class b/jbmc/regression/jbmc/lambda3/LambdaTest/Test.class similarity index 100% rename from regression/cbmc-java/lambda3/LambdaTest/Test.class rename to jbmc/regression/jbmc/lambda3/LambdaTest/Test.class diff --git a/regression/cbmc-java/lambda3/LambdaTest/Test.java b/jbmc/regression/jbmc/lambda3/LambdaTest/Test.java similarity index 100% rename from regression/cbmc-java/lambda3/LambdaTest/Test.java rename to jbmc/regression/jbmc/lambda3/LambdaTest/Test.java diff --git a/regression/cbmc-java/lambda3/test.desc b/jbmc/regression/jbmc/lambda3/test.desc similarity index 100% rename from regression/cbmc-java/lambda3/test.desc rename to jbmc/regression/jbmc/lambda3/test.desc diff --git a/regression/cbmc-java/lazyloading1/A.class b/jbmc/regression/jbmc/lazyloading1/A.class similarity index 100% rename from regression/cbmc-java/lazyloading1/A.class rename to jbmc/regression/jbmc/lazyloading1/A.class diff --git a/regression/cbmc-java/lazyloading1/B.class b/jbmc/regression/jbmc/lazyloading1/B.class similarity index 100% rename from regression/cbmc-java/lazyloading1/B.class rename to jbmc/regression/jbmc/lazyloading1/B.class diff --git a/regression/cbmc-java/lazyloading1/test.class b/jbmc/regression/jbmc/lazyloading1/test.class similarity index 100% rename from regression/cbmc-java/lazyloading1/test.class rename to jbmc/regression/jbmc/lazyloading1/test.class diff --git a/regression/cbmc-java/lazyloading1/test.desc b/jbmc/regression/jbmc/lazyloading1/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading1/test.desc rename to jbmc/regression/jbmc/lazyloading1/test.desc diff --git a/regression/cbmc-java/lazyloading1/test.java b/jbmc/regression/jbmc/lazyloading1/test.java similarity index 100% rename from regression/cbmc-java/lazyloading1/test.java rename to jbmc/regression/jbmc/lazyloading1/test.java diff --git a/regression/cbmc-java/lazyloading10/test.class b/jbmc/regression/jbmc/lazyloading10/test.class similarity index 100% rename from regression/cbmc-java/lazyloading10/test.class rename to jbmc/regression/jbmc/lazyloading10/test.class diff --git a/regression/cbmc-java/lazyloading10/test.desc b/jbmc/regression/jbmc/lazyloading10/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading10/test.desc rename to jbmc/regression/jbmc/lazyloading10/test.desc diff --git a/regression/cbmc-java/lazyloading10/test.java b/jbmc/regression/jbmc/lazyloading10/test.java similarity index 100% rename from regression/cbmc-java/lazyloading10/test.java rename to jbmc/regression/jbmc/lazyloading10/test.java diff --git a/regression/cbmc-java/lazyloading11/test.class b/jbmc/regression/jbmc/lazyloading11/test.class similarity index 100% rename from regression/cbmc-java/lazyloading11/test.class rename to jbmc/regression/jbmc/lazyloading11/test.class diff --git a/regression/cbmc-java/lazyloading11/test.desc b/jbmc/regression/jbmc/lazyloading11/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading11/test.desc rename to jbmc/regression/jbmc/lazyloading11/test.desc diff --git a/regression/cbmc-java/lazyloading11/test.java b/jbmc/regression/jbmc/lazyloading11/test.java similarity index 100% rename from regression/cbmc-java/lazyloading11/test.java rename to jbmc/regression/jbmc/lazyloading11/test.java diff --git a/regression/cbmc-java/lazyloading2/A.class b/jbmc/regression/jbmc/lazyloading2/A.class similarity index 100% rename from regression/cbmc-java/lazyloading2/A.class rename to jbmc/regression/jbmc/lazyloading2/A.class diff --git a/regression/cbmc-java/lazyloading2/B.class b/jbmc/regression/jbmc/lazyloading2/B.class similarity index 100% rename from regression/cbmc-java/lazyloading2/B.class rename to jbmc/regression/jbmc/lazyloading2/B.class diff --git a/regression/cbmc-java/lazyloading2/test.class b/jbmc/regression/jbmc/lazyloading2/test.class similarity index 100% rename from regression/cbmc-java/lazyloading2/test.class rename to jbmc/regression/jbmc/lazyloading2/test.class diff --git a/regression/cbmc-java/lazyloading2/test.desc b/jbmc/regression/jbmc/lazyloading2/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading2/test.desc rename to jbmc/regression/jbmc/lazyloading2/test.desc diff --git a/regression/cbmc-java/lazyloading2/test.java b/jbmc/regression/jbmc/lazyloading2/test.java similarity index 100% rename from regression/cbmc-java/lazyloading2/test.java rename to jbmc/regression/jbmc/lazyloading2/test.java diff --git a/regression/cbmc-java/lazyloading3/A.class b/jbmc/regression/jbmc/lazyloading3/A.class similarity index 100% rename from regression/cbmc-java/lazyloading3/A.class rename to jbmc/regression/jbmc/lazyloading3/A.class diff --git a/regression/cbmc-java/lazyloading3/B.class b/jbmc/regression/jbmc/lazyloading3/B.class similarity index 100% rename from regression/cbmc-java/lazyloading3/B.class rename to jbmc/regression/jbmc/lazyloading3/B.class diff --git a/regression/cbmc-java/lazyloading3/C.class b/jbmc/regression/jbmc/lazyloading3/C.class similarity index 100% rename from regression/cbmc-java/lazyloading3/C.class rename to jbmc/regression/jbmc/lazyloading3/C.class diff --git a/regression/cbmc-java/lazyloading3/D.class b/jbmc/regression/jbmc/lazyloading3/D.class similarity index 100% rename from regression/cbmc-java/lazyloading3/D.class rename to jbmc/regression/jbmc/lazyloading3/D.class diff --git a/regression/cbmc-java/lazyloading3/test.class b/jbmc/regression/jbmc/lazyloading3/test.class similarity index 100% rename from regression/cbmc-java/lazyloading3/test.class rename to jbmc/regression/jbmc/lazyloading3/test.class diff --git a/regression/cbmc-java/lazyloading3/test.desc b/jbmc/regression/jbmc/lazyloading3/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading3/test.desc rename to jbmc/regression/jbmc/lazyloading3/test.desc diff --git a/regression/cbmc-java/lazyloading3/test.java b/jbmc/regression/jbmc/lazyloading3/test.java similarity index 100% rename from regression/cbmc-java/lazyloading3/test.java rename to jbmc/regression/jbmc/lazyloading3/test.java diff --git a/regression/cbmc-java/lazyloading4/Main.class b/jbmc/regression/jbmc/lazyloading4/Main.class similarity index 100% rename from regression/cbmc-java/lazyloading4/Main.class rename to jbmc/regression/jbmc/lazyloading4/Main.class diff --git a/regression/cbmc-java/lazyloading4/Main.java b/jbmc/regression/jbmc/lazyloading4/Main.java similarity index 100% rename from regression/cbmc-java/lazyloading4/Main.java rename to jbmc/regression/jbmc/lazyloading4/Main.java diff --git a/regression/cbmc-java/lazyloading4/Problem.class b/jbmc/regression/jbmc/lazyloading4/Problem.class similarity index 100% rename from regression/cbmc-java/lazyloading4/Problem.class rename to jbmc/regression/jbmc/lazyloading4/Problem.class diff --git a/regression/cbmc-java/lazyloading4/test.desc b/jbmc/regression/jbmc/lazyloading4/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading4/test.desc rename to jbmc/regression/jbmc/lazyloading4/test.desc diff --git a/regression/cbmc-java/lazyloading5/other.class b/jbmc/regression/jbmc/lazyloading5/other.class similarity index 100% rename from regression/cbmc-java/lazyloading5/other.class rename to jbmc/regression/jbmc/lazyloading5/other.class diff --git a/regression/cbmc-java/lazyloading5/test.class b/jbmc/regression/jbmc/lazyloading5/test.class similarity index 100% rename from regression/cbmc-java/lazyloading5/test.class rename to jbmc/regression/jbmc/lazyloading5/test.class diff --git a/regression/cbmc-java/lazyloading5/test.desc b/jbmc/regression/jbmc/lazyloading5/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading5/test.desc rename to jbmc/regression/jbmc/lazyloading5/test.desc diff --git a/regression/cbmc-java/lazyloading5/test.java b/jbmc/regression/jbmc/lazyloading5/test.java similarity index 100% rename from regression/cbmc-java/lazyloading5/test.java rename to jbmc/regression/jbmc/lazyloading5/test.java diff --git a/regression/cbmc-java/lazyloading6/test.class b/jbmc/regression/jbmc/lazyloading6/test.class similarity index 100% rename from regression/cbmc-java/lazyloading6/test.class rename to jbmc/regression/jbmc/lazyloading6/test.class diff --git a/regression/cbmc-java/lazyloading6/test.desc b/jbmc/regression/jbmc/lazyloading6/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading6/test.desc rename to jbmc/regression/jbmc/lazyloading6/test.desc diff --git a/regression/cbmc-java/lazyloading6/test.java b/jbmc/regression/jbmc/lazyloading6/test.java similarity index 100% rename from regression/cbmc-java/lazyloading6/test.java rename to jbmc/regression/jbmc/lazyloading6/test.java diff --git a/regression/cbmc-java/lazyloading7/test.class b/jbmc/regression/jbmc/lazyloading7/test.class similarity index 100% rename from regression/cbmc-java/lazyloading7/test.class rename to jbmc/regression/jbmc/lazyloading7/test.class diff --git a/regression/cbmc-java/lazyloading7/test.desc b/jbmc/regression/jbmc/lazyloading7/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading7/test.desc rename to jbmc/regression/jbmc/lazyloading7/test.desc diff --git a/regression/cbmc-java/lazyloading7/test.java b/jbmc/regression/jbmc/lazyloading7/test.java similarity index 100% rename from regression/cbmc-java/lazyloading7/test.java rename to jbmc/regression/jbmc/lazyloading7/test.java diff --git a/regression/cbmc-java/lazyloading8/test.class b/jbmc/regression/jbmc/lazyloading8/test.class similarity index 100% rename from regression/cbmc-java/lazyloading8/test.class rename to jbmc/regression/jbmc/lazyloading8/test.class diff --git a/regression/cbmc-java/lazyloading8/test.desc b/jbmc/regression/jbmc/lazyloading8/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading8/test.desc rename to jbmc/regression/jbmc/lazyloading8/test.desc diff --git a/regression/cbmc-java/lazyloading8/test.java b/jbmc/regression/jbmc/lazyloading8/test.java similarity index 100% rename from regression/cbmc-java/lazyloading8/test.java rename to jbmc/regression/jbmc/lazyloading8/test.java diff --git a/regression/cbmc-java/lazyloading9/test.class b/jbmc/regression/jbmc/lazyloading9/test.class similarity index 100% rename from regression/cbmc-java/lazyloading9/test.class rename to jbmc/regression/jbmc/lazyloading9/test.class diff --git a/regression/cbmc-java/lazyloading9/test.desc b/jbmc/regression/jbmc/lazyloading9/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading9/test.desc rename to jbmc/regression/jbmc/lazyloading9/test.desc diff --git a/regression/cbmc-java/lazyloading9/test.java b/jbmc/regression/jbmc/lazyloading9/test.java similarity index 100% rename from regression/cbmc-java/lazyloading9/test.java rename to jbmc/regression/jbmc/lazyloading9/test.java diff --git a/regression/cbmc-java/lazyloading_array_parameter/asserthere.class b/jbmc/regression/jbmc/lazyloading_array_parameter/asserthere.class similarity index 100% rename from regression/cbmc-java/lazyloading_array_parameter/asserthere.class rename to jbmc/regression/jbmc/lazyloading_array_parameter/asserthere.class diff --git a/regression/cbmc-java/lazyloading_array_parameter/test.class b/jbmc/regression/jbmc/lazyloading_array_parameter/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_array_parameter/test.class rename to jbmc/regression/jbmc/lazyloading_array_parameter/test.class diff --git a/regression/cbmc-java/lazyloading_array_parameter/test.desc b/jbmc/regression/jbmc/lazyloading_array_parameter/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_array_parameter/test.desc rename to jbmc/regression/jbmc/lazyloading_array_parameter/test.desc diff --git a/regression/cbmc-java/lazyloading_array_parameter/test.java b/jbmc/regression/jbmc/lazyloading_array_parameter/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_array_parameter/test.java rename to jbmc/regression/jbmc/lazyloading_array_parameter/test.java diff --git a/regression/cbmc-java/lazyloading_cyclic_class/Base.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/Base.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/Base.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/Base.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/Derived.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/Derived.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/Derived.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/Derived.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/Foo.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/Foo.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/Foo.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/Foo.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/Middle.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/Middle.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/Middle.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/Middle.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/cycle1.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/cycle1.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/cycle1.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/cycle1.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/cycle2.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/cycle2.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/cycle2.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/cycle2.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/test.class b/jbmc/regression/jbmc/lazyloading_cyclic_class/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/test.class rename to jbmc/regression/jbmc/lazyloading_cyclic_class/test.class diff --git a/regression/cbmc-java/lazyloading_cyclic_class/test.desc b/jbmc/regression/jbmc/lazyloading_cyclic_class/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/test.desc rename to jbmc/regression/jbmc/lazyloading_cyclic_class/test.desc diff --git a/regression/cbmc-java/lazyloading_cyclic_class/test.java b/jbmc/regression/jbmc/lazyloading_cyclic_class/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_cyclic_class/test.java rename to jbmc/regression/jbmc/lazyloading_cyclic_class/test.java diff --git a/regression/cbmc-java/lazyloading_indirect_array_parameter/asserthere.class b/jbmc/regression/jbmc/lazyloading_indirect_array_parameter/asserthere.class similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_array_parameter/asserthere.class rename to jbmc/regression/jbmc/lazyloading_indirect_array_parameter/asserthere.class diff --git a/regression/cbmc-java/lazyloading_indirect_array_parameter/container.class b/jbmc/regression/jbmc/lazyloading_indirect_array_parameter/container.class similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_array_parameter/container.class rename to jbmc/regression/jbmc/lazyloading_indirect_array_parameter/container.class diff --git a/regression/cbmc-java/lazyloading_indirect_array_parameter/test.class b/jbmc/regression/jbmc/lazyloading_indirect_array_parameter/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_array_parameter/test.class rename to jbmc/regression/jbmc/lazyloading_indirect_array_parameter/test.class diff --git a/regression/cbmc-java/lazyloading_indirect_array_parameter/test.desc b/jbmc/regression/jbmc/lazyloading_indirect_array_parameter/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_array_parameter/test.desc rename to jbmc/regression/jbmc/lazyloading_indirect_array_parameter/test.desc diff --git a/regression/cbmc-java/lazyloading_indirect_array_parameter/test.java b/jbmc/regression/jbmc/lazyloading_indirect_array_parameter/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_array_parameter/test.java rename to jbmc/regression/jbmc/lazyloading_indirect_array_parameter/test.java diff --git a/regression/cbmc-java/lazyloading_indirect_generic_array_parameter/asserthere.class b/jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/asserthere.class similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_generic_array_parameter/asserthere.class rename to jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/asserthere.class diff --git a/regression/cbmc-java/lazyloading_indirect_generic_array_parameter/container.class b/jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/container.class similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_generic_array_parameter/container.class rename to jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/container.class diff --git a/regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.class b/jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.class rename to jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/test.class diff --git a/regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.desc b/jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.desc rename to jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/test.desc diff --git a/regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.java b/jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.java rename to jbmc/regression/jbmc/lazyloading_indirect_generic_array_parameter/test.java diff --git a/regression/cbmc-java/lazyloading_inheritance/Base.class b/jbmc/regression/jbmc/lazyloading_inheritance/Base.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance/Base.class rename to jbmc/regression/jbmc/lazyloading_inheritance/Base.class diff --git a/regression/cbmc-java/lazyloading_inheritance/Derived.class b/jbmc/regression/jbmc/lazyloading_inheritance/Derived.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance/Derived.class rename to jbmc/regression/jbmc/lazyloading_inheritance/Derived.class diff --git a/regression/cbmc-java/lazyloading_inheritance/Middle.class b/jbmc/regression/jbmc/lazyloading_inheritance/Middle.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance/Middle.class rename to jbmc/regression/jbmc/lazyloading_inheritance/Middle.class diff --git a/regression/cbmc-java/lazyloading_inheritance/test.class b/jbmc/regression/jbmc/lazyloading_inheritance/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance/test.class rename to jbmc/regression/jbmc/lazyloading_inheritance/test.class diff --git a/regression/cbmc-java/lazyloading_inheritance/test.desc b/jbmc/regression/jbmc/lazyloading_inheritance/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance/test.desc rename to jbmc/regression/jbmc/lazyloading_inheritance/test.desc diff --git a/regression/cbmc-java/lazyloading_inheritance/test.java b/jbmc/regression/jbmc/lazyloading_inheritance/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance/test.java rename to jbmc/regression/jbmc/lazyloading_inheritance/test.java diff --git a/regression/cbmc-java/lazyloading_inheritance_field/Base.class b/jbmc/regression/jbmc/lazyloading_inheritance_field/Base.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/Base.class rename to jbmc/regression/jbmc/lazyloading_inheritance_field/Base.class diff --git a/regression/cbmc-java/lazyloading_inheritance_field/Derived.class b/jbmc/regression/jbmc/lazyloading_inheritance_field/Derived.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/Derived.class rename to jbmc/regression/jbmc/lazyloading_inheritance_field/Derived.class diff --git a/regression/cbmc-java/lazyloading_inheritance_field/Foo.class b/jbmc/regression/jbmc/lazyloading_inheritance_field/Foo.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/Foo.class rename to jbmc/regression/jbmc/lazyloading_inheritance_field/Foo.class diff --git a/regression/cbmc-java/lazyloading_inheritance_field/Middle.class b/jbmc/regression/jbmc/lazyloading_inheritance_field/Middle.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/Middle.class rename to jbmc/regression/jbmc/lazyloading_inheritance_field/Middle.class diff --git a/regression/cbmc-java/lazyloading_inheritance_field/test.class b/jbmc/regression/jbmc/lazyloading_inheritance_field/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/test.class rename to jbmc/regression/jbmc/lazyloading_inheritance_field/test.class diff --git a/regression/cbmc-java/lazyloading_inheritance_field/test.desc b/jbmc/regression/jbmc/lazyloading_inheritance_field/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/test.desc rename to jbmc/regression/jbmc/lazyloading_inheritance_field/test.desc diff --git a/regression/cbmc-java/lazyloading_inheritance_field/test.java b/jbmc/regression/jbmc/lazyloading_inheritance_field/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_inheritance_field/test.java rename to jbmc/regression/jbmc/lazyloading_inheritance_field/test.java diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/A.class b/jbmc/regression/jbmc/lazyloading_multiple_array_types/A.class similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/A.class rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/A.class diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/A.java b/jbmc/regression/jbmc/lazyloading_multiple_array_types/A.java similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/A.java rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/A.java diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/B.class b/jbmc/regression/jbmc/lazyloading_multiple_array_types/B.class similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/B.class rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/B.class diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/B.java b/jbmc/regression/jbmc/lazyloading_multiple_array_types/B.java similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/B.java rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/B.java diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/Test.class b/jbmc/regression/jbmc/lazyloading_multiple_array_types/Test.class similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/Test.class rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/Test.class diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/Test.java b/jbmc/regression/jbmc/lazyloading_multiple_array_types/Test.java similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/Test.java rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/Test.java diff --git a/regression/cbmc-java/lazyloading_multiple_array_types/test.desc b/jbmc/regression/jbmc/lazyloading_multiple_array_types/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_array_types/test.desc rename to jbmc/regression/jbmc/lazyloading_multiple_array_types/test.desc diff --git a/regression/cbmc-java/lazyloading_multiple_generic_parameters/asserthere.class b/jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/asserthere.class similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_generic_parameters/asserthere.class rename to jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/asserthere.class diff --git a/regression/cbmc-java/lazyloading_multiple_generic_parameters/container.class b/jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/container.class similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_generic_parameters/container.class rename to jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/container.class diff --git a/regression/cbmc-java/lazyloading_multiple_generic_parameters/test.class b/jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_generic_parameters/test.class rename to jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/test.class diff --git a/regression/cbmc-java/lazyloading_multiple_generic_parameters/test.desc b/jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_generic_parameters/test.desc rename to jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/test.desc diff --git a/regression/cbmc-java/lazyloading_multiple_generic_parameters/test.java b/jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_multiple_generic_parameters/test.java rename to jbmc/regression/jbmc/lazyloading_multiple_generic_parameters/test.java diff --git a/regression/cbmc-java/lazyloading_nested_generic_parameters/asserthere.class b/jbmc/regression/jbmc/lazyloading_nested_generic_parameters/asserthere.class similarity index 100% rename from regression/cbmc-java/lazyloading_nested_generic_parameters/asserthere.class rename to jbmc/regression/jbmc/lazyloading_nested_generic_parameters/asserthere.class diff --git a/regression/cbmc-java/lazyloading_nested_generic_parameters/container.class b/jbmc/regression/jbmc/lazyloading_nested_generic_parameters/container.class similarity index 100% rename from regression/cbmc-java/lazyloading_nested_generic_parameters/container.class rename to jbmc/regression/jbmc/lazyloading_nested_generic_parameters/container.class diff --git a/regression/cbmc-java/lazyloading_nested_generic_parameters/container2.class b/jbmc/regression/jbmc/lazyloading_nested_generic_parameters/container2.class similarity index 100% rename from regression/cbmc-java/lazyloading_nested_generic_parameters/container2.class rename to jbmc/regression/jbmc/lazyloading_nested_generic_parameters/container2.class diff --git a/regression/cbmc-java/lazyloading_nested_generic_parameters/test.class b/jbmc/regression/jbmc/lazyloading_nested_generic_parameters/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_nested_generic_parameters/test.class rename to jbmc/regression/jbmc/lazyloading_nested_generic_parameters/test.class diff --git a/regression/cbmc-java/lazyloading_nested_generic_parameters/test.desc b/jbmc/regression/jbmc/lazyloading_nested_generic_parameters/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_nested_generic_parameters/test.desc rename to jbmc/regression/jbmc/lazyloading_nested_generic_parameters/test.desc diff --git a/regression/cbmc-java/lazyloading_nested_generic_parameters/test.java b/jbmc/regression/jbmc/lazyloading_nested_generic_parameters/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_nested_generic_parameters/test.java rename to jbmc/regression/jbmc/lazyloading_nested_generic_parameters/test.java diff --git a/regression/cbmc-java/lazyloading_no_candidates/Test$factory_intf.class b/jbmc/regression/jbmc/lazyloading_no_candidates/Test$factory_intf.class similarity index 100% rename from regression/cbmc-java/lazyloading_no_candidates/Test$factory_intf.class rename to jbmc/regression/jbmc/lazyloading_no_candidates/Test$factory_intf.class diff --git a/regression/cbmc-java/lazyloading_no_candidates/Test$intf.class b/jbmc/regression/jbmc/lazyloading_no_candidates/Test$intf.class similarity index 100% rename from regression/cbmc-java/lazyloading_no_candidates/Test$intf.class rename to jbmc/regression/jbmc/lazyloading_no_candidates/Test$intf.class diff --git a/regression/cbmc-java/lazyloading_no_candidates/Test.class b/jbmc/regression/jbmc/lazyloading_no_candidates/Test.class similarity index 100% rename from regression/cbmc-java/lazyloading_no_candidates/Test.class rename to jbmc/regression/jbmc/lazyloading_no_candidates/Test.class diff --git a/regression/cbmc-java/lazyloading_no_candidates/Test.java b/jbmc/regression/jbmc/lazyloading_no_candidates/Test.java similarity index 100% rename from regression/cbmc-java/lazyloading_no_candidates/Test.java rename to jbmc/regression/jbmc/lazyloading_no_candidates/Test.java diff --git a/regression/cbmc-java/lazyloading_no_candidates/test.desc b/jbmc/regression/jbmc/lazyloading_no_candidates/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_no_candidates/test.desc rename to jbmc/regression/jbmc/lazyloading_no_candidates/test.desc diff --git a/regression/cbmc-java/lazyloading_recursive_class/Base.class b/jbmc/regression/jbmc/lazyloading_recursive_class/Base.class similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/Base.class rename to jbmc/regression/jbmc/lazyloading_recursive_class/Base.class diff --git a/regression/cbmc-java/lazyloading_recursive_class/Derived.class b/jbmc/regression/jbmc/lazyloading_recursive_class/Derived.class similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/Derived.class rename to jbmc/regression/jbmc/lazyloading_recursive_class/Derived.class diff --git a/regression/cbmc-java/lazyloading_recursive_class/Foo.class b/jbmc/regression/jbmc/lazyloading_recursive_class/Foo.class similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/Foo.class rename to jbmc/regression/jbmc/lazyloading_recursive_class/Foo.class diff --git a/regression/cbmc-java/lazyloading_recursive_class/Middle.class b/jbmc/regression/jbmc/lazyloading_recursive_class/Middle.class similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/Middle.class rename to jbmc/regression/jbmc/lazyloading_recursive_class/Middle.class diff --git a/regression/cbmc-java/lazyloading_recursive_class/test.class b/jbmc/regression/jbmc/lazyloading_recursive_class/test.class similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/test.class rename to jbmc/regression/jbmc/lazyloading_recursive_class/test.class diff --git a/regression/cbmc-java/lazyloading_recursive_class/test.desc b/jbmc/regression/jbmc/lazyloading_recursive_class/test.desc similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/test.desc rename to jbmc/regression/jbmc/lazyloading_recursive_class/test.desc diff --git a/regression/cbmc-java/lazyloading_recursive_class/test.java b/jbmc/regression/jbmc/lazyloading_recursive_class/test.java similarity index 100% rename from regression/cbmc-java/lazyloading_recursive_class/test.java rename to jbmc/regression/jbmc/lazyloading_recursive_class/test.java diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup1/Test.class b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/Test.class similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup1/Test.class rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/Test.class diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup1/Test.java b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/Test.java similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup1/Test.java rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/Test.java diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup1/Unused.class b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/Unused.class similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup1/Unused.class rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/Unused.class diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_clinit_normally_present.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/check_clinit_normally_present.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_clinit_normally_present.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/check_clinit_normally_present.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_clinit_removed_by_lazy_loading.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/check_clinit_removed_by_lazy_loading.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_clinit_removed_by_lazy_loading.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/check_clinit_removed_by_lazy_loading.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_runs_with_lazy_loading.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/check_runs_with_lazy_loading.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_runs_with_lazy_loading.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup1/check_runs_with_lazy_loading.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Test.class b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Test.class similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Test.class rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Test.class diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Test.java b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Test.java similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Test.java rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Test.java diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Unused1.class b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Unused1.class similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Unused1.class rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Unused1.class diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Unused2.class b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Unused2.class similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/Unused2.class rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/Unused2.class diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/check_clinit_normally_present.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/check_clinit_normally_present.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/check_clinit_normally_present.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/check_clinit_normally_present.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/check_clinit_removed_by_lazy_loading.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/check_clinit_removed_by_lazy_loading.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/check_clinit_removed_by_lazy_loading.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/check_clinit_removed_by_lazy_loading.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup2/check_runs_with_lazy_loading.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/check_runs_with_lazy_loading.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup2/check_runs_with_lazy_loading.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup2/check_runs_with_lazy_loading.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup3/Test.class b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/Test.class similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup3/Test.class rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/Test.class diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup3/Test.java b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/Test.java similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup3/Test.java rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/Test.java diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup3/check_clinit_normally_present.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/check_clinit_normally_present.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup3/check_clinit_normally_present.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/check_clinit_normally_present.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup3/check_clinit_removed_by_lazy_loading.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/check_clinit_removed_by_lazy_loading.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup3/check_clinit_removed_by_lazy_loading.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/check_clinit_removed_by_lazy_loading.desc diff --git a/regression/cbmc-java/lazyloading_synthetic_method_cleanup3/check_runs_with_lazy_loading.desc b/jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/check_runs_with_lazy_loading.desc similarity index 100% rename from regression/cbmc-java/lazyloading_synthetic_method_cleanup3/check_runs_with_lazy_loading.desc rename to jbmc/regression/jbmc/lazyloading_synthetic_method_cleanup3/check_runs_with_lazy_loading.desc diff --git a/regression/cbmc-java/list1/LinkedList.class b/jbmc/regression/jbmc/list1/LinkedList.class similarity index 100% rename from regression/cbmc-java/list1/LinkedList.class rename to jbmc/regression/jbmc/list1/LinkedList.class diff --git a/regression/cbmc-java/list1/LinkedListEntry.class b/jbmc/regression/jbmc/list1/LinkedListEntry.class similarity index 100% rename from regression/cbmc-java/list1/LinkedListEntry.class rename to jbmc/regression/jbmc/list1/LinkedListEntry.class diff --git a/regression/cbmc-java/list1/__CPROVER_nondet.class b/jbmc/regression/jbmc/list1/__CPROVER_nondet.class similarity index 100% rename from regression/cbmc-java/list1/__CPROVER_nondet.class rename to jbmc/regression/jbmc/list1/__CPROVER_nondet.class diff --git a/regression/cbmc-java/list1/__CPROVER_synthesis.class b/jbmc/regression/jbmc/list1/__CPROVER_synthesis.class similarity index 100% rename from regression/cbmc-java/list1/__CPROVER_synthesis.class rename to jbmc/regression/jbmc/list1/__CPROVER_synthesis.class diff --git a/regression/cbmc-java/list1/list1.class b/jbmc/regression/jbmc/list1/list1.class similarity index 100% rename from regression/cbmc-java/list1/list1.class rename to jbmc/regression/jbmc/list1/list1.class diff --git a/regression/cbmc-java/list1/list1.java b/jbmc/regression/jbmc/list1/list1.java similarity index 100% rename from regression/cbmc-java/list1/list1.java rename to jbmc/regression/jbmc/list1/list1.java diff --git a/regression/cbmc-java/list1/test.desc b/jbmc/regression/jbmc/list1/test.desc similarity index 100% rename from regression/cbmc-java/list1/test.desc rename to jbmc/regression/jbmc/list1/test.desc diff --git a/regression/cbmc-java/long1/long1.class b/jbmc/regression/jbmc/long1/long1.class similarity index 100% rename from regression/cbmc-java/long1/long1.class rename to jbmc/regression/jbmc/long1/long1.class diff --git a/regression/cbmc-java/long1/long1.java b/jbmc/regression/jbmc/long1/long1.java similarity index 100% rename from regression/cbmc-java/long1/long1.java rename to jbmc/regression/jbmc/long1/long1.java diff --git a/regression/cbmc-java/long1/test.desc b/jbmc/regression/jbmc/long1/test.desc similarity index 100% rename from regression/cbmc-java/long1/test.desc rename to jbmc/regression/jbmc/long1/test.desc diff --git a/regression/cbmc-java/lookupswitch1/lookupswitch1.class b/jbmc/regression/jbmc/lookupswitch1/lookupswitch1.class similarity index 100% rename from regression/cbmc-java/lookupswitch1/lookupswitch1.class rename to jbmc/regression/jbmc/lookupswitch1/lookupswitch1.class diff --git a/regression/cbmc-java/lookupswitch1/lookupswitch1.java b/jbmc/regression/jbmc/lookupswitch1/lookupswitch1.java similarity index 100% rename from regression/cbmc-java/lookupswitch1/lookupswitch1.java rename to jbmc/regression/jbmc/lookupswitch1/lookupswitch1.java diff --git a/regression/cbmc-java/lookupswitch1/test.desc b/jbmc/regression/jbmc/lookupswitch1/test.desc similarity index 100% rename from regression/cbmc-java/lookupswitch1/test.desc rename to jbmc/regression/jbmc/lookupswitch1/test.desc diff --git a/regression/cbmc-java/loop1/loop1.class b/jbmc/regression/jbmc/loop1/loop1.class similarity index 100% rename from regression/cbmc-java/loop1/loop1.class rename to jbmc/regression/jbmc/loop1/loop1.class diff --git a/regression/cbmc-java/loop1/loop1.java b/jbmc/regression/jbmc/loop1/loop1.java similarity index 100% rename from regression/cbmc-java/loop1/loop1.java rename to jbmc/regression/jbmc/loop1/loop1.java diff --git a/regression/cbmc-java/loop1/test.desc b/jbmc/regression/jbmc/loop1/test.desc similarity index 100% rename from regression/cbmc-java/loop1/test.desc rename to jbmc/regression/jbmc/loop1/test.desc diff --git a/regression/cbmc-java/lots_local_variables_manual/ManyLocalVariables.class b/jbmc/regression/jbmc/lots_local_variables_manual/ManyLocalVariables.class similarity index 100% rename from regression/cbmc-java/lots_local_variables_manual/ManyLocalVariables.class rename to jbmc/regression/jbmc/lots_local_variables_manual/ManyLocalVariables.class diff --git a/regression/cbmc-java/lots_local_variables_manual/ManyLocalVariables.j b/jbmc/regression/jbmc/lots_local_variables_manual/ManyLocalVariables.j similarity index 100% rename from regression/cbmc-java/lots_local_variables_manual/ManyLocalVariables.j rename to jbmc/regression/jbmc/lots_local_variables_manual/ManyLocalVariables.j diff --git a/regression/cbmc-java/lots_local_variables_manual/test.desc b/jbmc/regression/jbmc/lots_local_variables_manual/test.desc similarity index 100% rename from regression/cbmc-java/lots_local_variables_manual/test.desc rename to jbmc/regression/jbmc/lots_local_variables_manual/test.desc diff --git a/regression/cbmc-java/lots_of_local_variables/TooManyLocals.class b/jbmc/regression/jbmc/lots_of_local_variables/TooManyLocals.class similarity index 100% rename from regression/cbmc-java/lots_of_local_variables/TooManyLocals.class rename to jbmc/regression/jbmc/lots_of_local_variables/TooManyLocals.class diff --git a/regression/cbmc-java/lots_of_local_variables/TooManyLocals.java b/jbmc/regression/jbmc/lots_of_local_variables/TooManyLocals.java similarity index 100% rename from regression/cbmc-java/lots_of_local_variables/TooManyLocals.java rename to jbmc/regression/jbmc/lots_of_local_variables/TooManyLocals.java diff --git a/regression/cbmc-java/lots_of_local_variables/test.desc b/jbmc/regression/jbmc/lots_of_local_variables/test.desc similarity index 100% rename from regression/cbmc-java/lots_of_local_variables/test.desc rename to jbmc/regression/jbmc/lots_of_local_variables/test.desc diff --git a/regression/cbmc-java/lvt-groovy/DetectSplitPackagesTask.class b/jbmc/regression/jbmc/lvt-groovy/DetectSplitPackagesTask.class similarity index 100% rename from regression/cbmc-java/lvt-groovy/DetectSplitPackagesTask.class rename to jbmc/regression/jbmc/lvt-groovy/DetectSplitPackagesTask.class diff --git a/regression/cbmc-java/lvt-groovy/test.desc b/jbmc/regression/jbmc/lvt-groovy/test.desc similarity index 100% rename from regression/cbmc-java/lvt-groovy/test.desc rename to jbmc/regression/jbmc/lvt-groovy/test.desc diff --git a/regression/cbmc-java/lvt-unexpected/Makefile b/jbmc/regression/jbmc/lvt-unexpected/Makefile similarity index 100% rename from regression/cbmc-java/lvt-unexpected/Makefile rename to jbmc/regression/jbmc/lvt-unexpected/Makefile diff --git a/regression/cbmc-java/lvt-unexpected/test.desc b/jbmc/regression/jbmc/lvt-unexpected/test.desc similarity index 100% rename from regression/cbmc-java/lvt-unexpected/test.desc rename to jbmc/regression/jbmc/lvt-unexpected/test.desc diff --git a/regression/cbmc-java/lvt-unexpected/unexpected.class b/jbmc/regression/jbmc/lvt-unexpected/unexpected.class similarity index 100% rename from regression/cbmc-java/lvt-unexpected/unexpected.class rename to jbmc/regression/jbmc/lvt-unexpected/unexpected.class diff --git a/regression/cbmc-java/lvt-unexpected/unexpected.j b/jbmc/regression/jbmc/lvt-unexpected/unexpected.j similarity index 100% rename from regression/cbmc-java/lvt-unexpected/unexpected.j rename to jbmc/regression/jbmc/lvt-unexpected/unexpected.j diff --git a/regression/cbmc-java/method_parmeters1/method_parameters.class b/jbmc/regression/jbmc/method_parmeters1/method_parameters.class similarity index 100% rename from regression/cbmc-java/method_parmeters1/method_parameters.class rename to jbmc/regression/jbmc/method_parmeters1/method_parameters.class diff --git a/regression/cbmc-java/method_parmeters1/method_parameters.java b/jbmc/regression/jbmc/method_parmeters1/method_parameters.java similarity index 100% rename from regression/cbmc-java/method_parmeters1/method_parameters.java rename to jbmc/regression/jbmc/method_parmeters1/method_parameters.java diff --git a/regression/cbmc-java/method_parmeters1/test.desc b/jbmc/regression/jbmc/method_parmeters1/test.desc similarity index 100% rename from regression/cbmc-java/method_parmeters1/test.desc rename to jbmc/regression/jbmc/method_parmeters1/test.desc diff --git a/regression/cbmc-java/method_parmeters2/method_parameters.class b/jbmc/regression/jbmc/method_parmeters2/method_parameters.class similarity index 100% rename from regression/cbmc-java/method_parmeters2/method_parameters.class rename to jbmc/regression/jbmc/method_parmeters2/method_parameters.class diff --git a/regression/cbmc-java/method_parmeters2/method_parameters.java b/jbmc/regression/jbmc/method_parmeters2/method_parameters.java similarity index 100% rename from regression/cbmc-java/method_parmeters2/method_parameters.java rename to jbmc/regression/jbmc/method_parmeters2/method_parameters.java diff --git a/regression/cbmc-java/method_parmeters2/test.desc b/jbmc/regression/jbmc/method_parmeters2/test.desc similarity index 100% rename from regression/cbmc-java/method_parmeters2/test.desc rename to jbmc/regression/jbmc/method_parmeters2/test.desc diff --git a/regression/cbmc-java/monitorenter1/monitorenter1.class b/jbmc/regression/jbmc/monitorenter1/monitorenter1.class similarity index 100% rename from regression/cbmc-java/monitorenter1/monitorenter1.class rename to jbmc/regression/jbmc/monitorenter1/monitorenter1.class diff --git a/regression/cbmc-java/monitorenter1/monitorenter1.java b/jbmc/regression/jbmc/monitorenter1/monitorenter1.java similarity index 100% rename from regression/cbmc-java/monitorenter1/monitorenter1.java rename to jbmc/regression/jbmc/monitorenter1/monitorenter1.java diff --git a/regression/cbmc-java/monitorenter1/test.desc b/jbmc/regression/jbmc/monitorenter1/test.desc similarity index 100% rename from regression/cbmc-java/monitorenter1/test.desc rename to jbmc/regression/jbmc/monitorenter1/test.desc diff --git a/regression/cbmc-java/multinewarray/A.class b/jbmc/regression/jbmc/multinewarray/A.class similarity index 100% rename from regression/cbmc-java/multinewarray/A.class rename to jbmc/regression/jbmc/multinewarray/A.class diff --git a/regression/cbmc-java/multinewarray/multinewarray.class b/jbmc/regression/jbmc/multinewarray/multinewarray.class similarity index 100% rename from regression/cbmc-java/multinewarray/multinewarray.class rename to jbmc/regression/jbmc/multinewarray/multinewarray.class diff --git a/regression/cbmc-java/multinewarray/multinewarray.java b/jbmc/regression/jbmc/multinewarray/multinewarray.java similarity index 100% rename from regression/cbmc-java/multinewarray/multinewarray.java rename to jbmc/regression/jbmc/multinewarray/multinewarray.java diff --git a/regression/cbmc-java/multinewarray/test.desc b/jbmc/regression/jbmc/multinewarray/test.desc similarity index 100% rename from regression/cbmc-java/multinewarray/test.desc rename to jbmc/regression/jbmc/multinewarray/test.desc diff --git a/regression/cbmc-java/overlay-class/Test.class b/jbmc/regression/jbmc/overlay-class/Test.class similarity index 100% rename from regression/cbmc-java/overlay-class/Test.class rename to jbmc/regression/jbmc/overlay-class/Test.class diff --git a/regression/cbmc-java/overlay-class/Test.java b/jbmc/regression/jbmc/overlay-class/Test.java similarity index 100% rename from regression/cbmc-java/overlay-class/Test.java rename to jbmc/regression/jbmc/overlay-class/Test.java diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class b/jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class similarity index 100% rename from regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class rename to jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java b/jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java similarity index 100% rename from regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java rename to jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class b/jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class similarity index 100% rename from regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class rename to jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java b/jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java similarity index 100% rename from regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java rename to jbmc/regression/jbmc/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java diff --git a/regression/cbmc-java/overlay-class/correct-overlay/Test.class b/jbmc/regression/jbmc/overlay-class/correct-overlay/Test.class similarity index 100% rename from regression/cbmc-java/overlay-class/correct-overlay/Test.class rename to jbmc/regression/jbmc/overlay-class/correct-overlay/Test.class diff --git a/regression/cbmc-java/overlay-class/correct-overlay/Test.java b/jbmc/regression/jbmc/overlay-class/correct-overlay/Test.java similarity index 100% rename from regression/cbmc-java/overlay-class/correct-overlay/Test.java rename to jbmc/regression/jbmc/overlay-class/correct-overlay/Test.java diff --git a/regression/cbmc-java/overlay-class/correct-test.desc b/jbmc/regression/jbmc/overlay-class/correct-test.desc similarity index 100% rename from regression/cbmc-java/overlay-class/correct-test.desc rename to jbmc/regression/jbmc/overlay-class/correct-test.desc diff --git a/regression/cbmc-java/overlay-class/duplicate-test.desc b/jbmc/regression/jbmc/overlay-class/duplicate-test.desc similarity index 100% rename from regression/cbmc-java/overlay-class/duplicate-test.desc rename to jbmc/regression/jbmc/overlay-class/duplicate-test.desc diff --git a/regression/cbmc-java/overlay-class/format_classpath.sh b/jbmc/regression/jbmc/overlay-class/format_classpath.sh similarity index 100% rename from regression/cbmc-java/overlay-class/format_classpath.sh rename to jbmc/regression/jbmc/overlay-class/format_classpath.sh diff --git a/regression/cbmc-java/overlay-class/misordered-test.desc b/jbmc/regression/jbmc/overlay-class/misordered-test.desc similarity index 100% rename from regression/cbmc-java/overlay-class/misordered-test.desc rename to jbmc/regression/jbmc/overlay-class/misordered-test.desc diff --git a/regression/cbmc-java/overlay-class/unmarked-overlay/Test.class b/jbmc/regression/jbmc/overlay-class/unmarked-overlay/Test.class similarity index 100% rename from regression/cbmc-java/overlay-class/unmarked-overlay/Test.class rename to jbmc/regression/jbmc/overlay-class/unmarked-overlay/Test.class diff --git a/regression/cbmc-java/overlay-class/unmarked-overlay/Test.java b/jbmc/regression/jbmc/overlay-class/unmarked-overlay/Test.java similarity index 100% rename from regression/cbmc-java/overlay-class/unmarked-overlay/Test.java rename to jbmc/regression/jbmc/overlay-class/unmarked-overlay/Test.java diff --git a/regression/cbmc-java/overlay-class/unmarked-test.desc b/jbmc/regression/jbmc/overlay-class/unmarked-test.desc similarity index 100% rename from regression/cbmc-java/overlay-class/unmarked-test.desc rename to jbmc/regression/jbmc/overlay-class/unmarked-test.desc diff --git a/regression/cbmc-java/overloading1/other_class.class b/jbmc/regression/jbmc/overloading1/other_class.class similarity index 100% rename from regression/cbmc-java/overloading1/other_class.class rename to jbmc/regression/jbmc/overloading1/other_class.class diff --git a/regression/cbmc-java/overloading1/overloading1.class b/jbmc/regression/jbmc/overloading1/overloading1.class similarity index 100% rename from regression/cbmc-java/overloading1/overloading1.class rename to jbmc/regression/jbmc/overloading1/overloading1.class diff --git a/regression/cbmc-java/overloading1/overloading1.java b/jbmc/regression/jbmc/overloading1/overloading1.java similarity index 100% rename from regression/cbmc-java/overloading1/overloading1.java rename to jbmc/regression/jbmc/overloading1/overloading1.java diff --git a/regression/cbmc-java/overloading1/test.desc b/jbmc/regression/jbmc/overloading1/test.desc similarity index 100% rename from regression/cbmc-java/overloading1/test.desc rename to jbmc/regression/jbmc/overloading1/test.desc diff --git a/regression/cbmc-java/package1/classA.class b/jbmc/regression/jbmc/package1/classA.class similarity index 100% rename from regression/cbmc-java/package1/classA.class rename to jbmc/regression/jbmc/package1/classA.class diff --git a/regression/cbmc-java/package1/classA.java b/jbmc/regression/jbmc/package1/classA.java similarity index 100% rename from regression/cbmc-java/package1/classA.java rename to jbmc/regression/jbmc/package1/classA.java diff --git a/regression/cbmc-java/package1/mypackage/classB.class b/jbmc/regression/jbmc/package1/mypackage/classB.class similarity index 100% rename from regression/cbmc-java/package1/mypackage/classB.class rename to jbmc/regression/jbmc/package1/mypackage/classB.class diff --git a/regression/cbmc-java/package1/mypackage/classB.java b/jbmc/regression/jbmc/package1/mypackage/classB.java similarity index 100% rename from regression/cbmc-java/package1/mypackage/classB.java rename to jbmc/regression/jbmc/package1/mypackage/classB.java diff --git a/regression/cbmc-java/package1/test.desc b/jbmc/regression/jbmc/package1/test.desc similarity index 100% rename from regression/cbmc-java/package1/test.desc rename to jbmc/regression/jbmc/package1/test.desc diff --git a/regression/cbmc-java/package_friendly1/main.class b/jbmc/regression/jbmc/package_friendly1/main.class similarity index 100% rename from regression/cbmc-java/package_friendly1/main.class rename to jbmc/regression/jbmc/package_friendly1/main.class diff --git a/regression/cbmc-java/package_friendly1/main.java b/jbmc/regression/jbmc/package_friendly1/main.java similarity index 100% rename from regression/cbmc-java/package_friendly1/main.java rename to jbmc/regression/jbmc/package_friendly1/main.java diff --git a/regression/cbmc-java/package_friendly1/package_friendly1.class b/jbmc/regression/jbmc/package_friendly1/package_friendly1.class similarity index 100% rename from regression/cbmc-java/package_friendly1/package_friendly1.class rename to jbmc/regression/jbmc/package_friendly1/package_friendly1.class diff --git a/regression/cbmc-java/package_friendly1/package_friendly1.java b/jbmc/regression/jbmc/package_friendly1/package_friendly1.java similarity index 100% rename from regression/cbmc-java/package_friendly1/package_friendly1.java rename to jbmc/regression/jbmc/package_friendly1/package_friendly1.java diff --git a/regression/cbmc-java/package_friendly1/package_friendly2.class b/jbmc/regression/jbmc/package_friendly1/package_friendly2.class similarity index 100% rename from regression/cbmc-java/package_friendly1/package_friendly2.class rename to jbmc/regression/jbmc/package_friendly1/package_friendly2.class diff --git a/regression/cbmc-java/package_friendly1/test.desc b/jbmc/regression/jbmc/package_friendly1/test.desc similarity index 100% rename from regression/cbmc-java/package_friendly1/test.desc rename to jbmc/regression/jbmc/package_friendly1/test.desc diff --git a/regression/cbmc-java/phi-merge_uninitialized_values/PhiMergeUninitialized.class b/jbmc/regression/jbmc/phi-merge_uninitialized_values/PhiMergeUninitialized.class similarity index 100% rename from regression/cbmc-java/phi-merge_uninitialized_values/PhiMergeUninitialized.class rename to jbmc/regression/jbmc/phi-merge_uninitialized_values/PhiMergeUninitialized.class diff --git a/regression/cbmc-java/phi-merge_uninitialized_values/PhiMergeUninitialized.java b/jbmc/regression/jbmc/phi-merge_uninitialized_values/PhiMergeUninitialized.java similarity index 100% rename from regression/cbmc-java/phi-merge_uninitialized_values/PhiMergeUninitialized.java rename to jbmc/regression/jbmc/phi-merge_uninitialized_values/PhiMergeUninitialized.java diff --git a/regression/cbmc-java/phi-merge_uninitialized_values/field.desc b/jbmc/regression/jbmc/phi-merge_uninitialized_values/field.desc similarity index 100% rename from regression/cbmc-java/phi-merge_uninitialized_values/field.desc rename to jbmc/regression/jbmc/phi-merge_uninitialized_values/field.desc diff --git a/regression/cbmc-java/phi-merge_uninitialized_values/local.desc b/jbmc/regression/jbmc/phi-merge_uninitialized_values/local.desc similarity index 100% rename from regression/cbmc-java/phi-merge_uninitialized_values/local.desc rename to jbmc/regression/jbmc/phi-merge_uninitialized_values/local.desc diff --git a/regression/cbmc-java/phi-merge_uninitialized_values/static_field.desc b/jbmc/regression/jbmc/phi-merge_uninitialized_values/static_field.desc similarity index 100% rename from regression/cbmc-java/phi-merge_uninitialized_values/static_field.desc rename to jbmc/regression/jbmc/phi-merge_uninitialized_values/static_field.desc diff --git a/regression/cbmc-java/pointer_check1/A.class b/jbmc/regression/jbmc/pointer_check1/A.class similarity index 100% rename from regression/cbmc-java/pointer_check1/A.class rename to jbmc/regression/jbmc/pointer_check1/A.class diff --git a/regression/cbmc-java/pointer_check1/B.class b/jbmc/regression/jbmc/pointer_check1/B.class similarity index 100% rename from regression/cbmc-java/pointer_check1/B.class rename to jbmc/regression/jbmc/pointer_check1/B.class diff --git a/regression/cbmc-java/pointer_check1/pointer_check1.class b/jbmc/regression/jbmc/pointer_check1/pointer_check1.class similarity index 100% rename from regression/cbmc-java/pointer_check1/pointer_check1.class rename to jbmc/regression/jbmc/pointer_check1/pointer_check1.class diff --git a/regression/cbmc-java/pointer_check1/pointer_check1.java b/jbmc/regression/jbmc/pointer_check1/pointer_check1.java similarity index 100% rename from regression/cbmc-java/pointer_check1/pointer_check1.java rename to jbmc/regression/jbmc/pointer_check1/pointer_check1.java diff --git a/regression/cbmc-java/pointer_check1/test.desc b/jbmc/regression/jbmc/pointer_check1/test.desc similarity index 100% rename from regression/cbmc-java/pointer_check1/test.desc rename to jbmc/regression/jbmc/pointer_check1/test.desc diff --git a/regression/cbmc-java/provide_object_implementation/java/lang/Object.class b/jbmc/regression/jbmc/provide_object_implementation/java/lang/Object.class similarity index 100% rename from regression/cbmc-java/provide_object_implementation/java/lang/Object.class rename to jbmc/regression/jbmc/provide_object_implementation/java/lang/Object.class diff --git a/regression/cbmc-java/provide_object_implementation/java/lang/Object.java b/jbmc/regression/jbmc/provide_object_implementation/java/lang/Object.java similarity index 100% rename from regression/cbmc-java/provide_object_implementation/java/lang/Object.java rename to jbmc/regression/jbmc/provide_object_implementation/java/lang/Object.java diff --git a/regression/cbmc-java/provide_object_implementation/test.desc b/jbmc/regression/jbmc/provide_object_implementation/test.desc similarity index 100% rename from regression/cbmc-java/provide_object_implementation/test.desc rename to jbmc/regression/jbmc/provide_object_implementation/test.desc diff --git a/regression/cbmc-java/putfield_getfield1/A.class b/jbmc/regression/jbmc/putfield_getfield1/A.class similarity index 100% rename from regression/cbmc-java/putfield_getfield1/A.class rename to jbmc/regression/jbmc/putfield_getfield1/A.class diff --git a/regression/cbmc-java/putfield_getfield1/putfield_getfield1.class b/jbmc/regression/jbmc/putfield_getfield1/putfield_getfield1.class similarity index 100% rename from regression/cbmc-java/putfield_getfield1/putfield_getfield1.class rename to jbmc/regression/jbmc/putfield_getfield1/putfield_getfield1.class diff --git a/regression/cbmc-java/putfield_getfield1/putfield_getfield1.java b/jbmc/regression/jbmc/putfield_getfield1/putfield_getfield1.java similarity index 100% rename from regression/cbmc-java/putfield_getfield1/putfield_getfield1.java rename to jbmc/regression/jbmc/putfield_getfield1/putfield_getfield1.java diff --git a/regression/cbmc-java/putfield_getfield1/test.desc b/jbmc/regression/jbmc/putfield_getfield1/test.desc similarity index 100% rename from regression/cbmc-java/putfield_getfield1/test.desc rename to jbmc/regression/jbmc/putfield_getfield1/test.desc diff --git a/regression/cbmc-java/putstatic_getstatic1/A.class b/jbmc/regression/jbmc/putstatic_getstatic1/A.class similarity index 100% rename from regression/cbmc-java/putstatic_getstatic1/A.class rename to jbmc/regression/jbmc/putstatic_getstatic1/A.class diff --git a/regression/cbmc-java/putstatic_getstatic1/putstatic_getstatic1.class b/jbmc/regression/jbmc/putstatic_getstatic1/putstatic_getstatic1.class similarity index 100% rename from regression/cbmc-java/putstatic_getstatic1/putstatic_getstatic1.class rename to jbmc/regression/jbmc/putstatic_getstatic1/putstatic_getstatic1.class diff --git a/regression/cbmc-java/putstatic_getstatic1/putstatic_getstatic1.java b/jbmc/regression/jbmc/putstatic_getstatic1/putstatic_getstatic1.java similarity index 100% rename from regression/cbmc-java/putstatic_getstatic1/putstatic_getstatic1.java rename to jbmc/regression/jbmc/putstatic_getstatic1/putstatic_getstatic1.java diff --git a/regression/cbmc-java/putstatic_getstatic1/test.desc b/jbmc/regression/jbmc/putstatic_getstatic1/test.desc similarity index 100% rename from regression/cbmc-java/putstatic_getstatic1/test.desc rename to jbmc/regression/jbmc/putstatic_getstatic1/test.desc diff --git a/regression/cbmc-java/putstatic_source_location/test.class b/jbmc/regression/jbmc/putstatic_source_location/test.class similarity index 100% rename from regression/cbmc-java/putstatic_source_location/test.class rename to jbmc/regression/jbmc/putstatic_source_location/test.class diff --git a/regression/cbmc-java/putstatic_source_location/test.desc b/jbmc/regression/jbmc/putstatic_source_location/test.desc similarity index 100% rename from regression/cbmc-java/putstatic_source_location/test.desc rename to jbmc/regression/jbmc/putstatic_source_location/test.desc diff --git a/regression/cbmc-java/putstatic_source_location/test.java b/jbmc/regression/jbmc/putstatic_source_location/test.java similarity index 100% rename from regression/cbmc-java/putstatic_source_location/test.java rename to jbmc/regression/jbmc/putstatic_source_location/test.java diff --git a/regression/cbmc-java/reachability-slice/A.class b/jbmc/regression/jbmc/reachability-slice/A.class similarity index 100% rename from regression/cbmc-java/reachability-slice/A.class rename to jbmc/regression/jbmc/reachability-slice/A.class diff --git a/regression/cbmc-java/reachability-slice/A.java b/jbmc/regression/jbmc/reachability-slice/A.java similarity index 100% rename from regression/cbmc-java/reachability-slice/A.java rename to jbmc/regression/jbmc/reachability-slice/A.java diff --git a/regression/cbmc-java/reachability-slice/test.desc b/jbmc/regression/jbmc/reachability-slice/test.desc similarity index 100% rename from regression/cbmc-java/reachability-slice/test.desc rename to jbmc/regression/jbmc/reachability-slice/test.desc diff --git a/regression/cbmc-java/reachability-slice/test2.desc b/jbmc/regression/jbmc/reachability-slice/test2.desc similarity index 100% rename from regression/cbmc-java/reachability-slice/test2.desc rename to jbmc/regression/jbmc/reachability-slice/test2.desc diff --git a/regression/cbmc-java/reachability-slice/test3.desc b/jbmc/regression/jbmc/reachability-slice/test3.desc similarity index 100% rename from regression/cbmc-java/reachability-slice/test3.desc rename to jbmc/regression/jbmc/reachability-slice/test3.desc diff --git a/regression/cbmc-java/recursion1/recursion1.class b/jbmc/regression/jbmc/recursion1/recursion1.class similarity index 100% rename from regression/cbmc-java/recursion1/recursion1.class rename to jbmc/regression/jbmc/recursion1/recursion1.class diff --git a/regression/cbmc-java/recursion1/recursion1.java b/jbmc/regression/jbmc/recursion1/recursion1.java similarity index 100% rename from regression/cbmc-java/recursion1/recursion1.java rename to jbmc/regression/jbmc/recursion1/recursion1.java diff --git a/regression/cbmc-java/recursion2/recursion2.class b/jbmc/regression/jbmc/recursion2/recursion2.class similarity index 100% rename from regression/cbmc-java/recursion2/recursion2.class rename to jbmc/regression/jbmc/recursion2/recursion2.class diff --git a/regression/cbmc-java/recursion2/recursion2.java b/jbmc/regression/jbmc/recursion2/recursion2.java similarity index 100% rename from regression/cbmc-java/recursion2/recursion2.java rename to jbmc/regression/jbmc/recursion2/recursion2.java diff --git a/regression/cbmc-java/recursion2/test.desc b/jbmc/regression/jbmc/recursion2/test.desc similarity index 100% rename from regression/cbmc-java/recursion2/test.desc rename to jbmc/regression/jbmc/recursion2/test.desc diff --git a/regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions$A.class b/jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions$A.class similarity index 100% rename from regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions$A.class rename to jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions$A.class diff --git a/regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions$B.class b/jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions$B.class similarity index 100% rename from regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions$B.class rename to jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions$B.class diff --git a/regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions$C.class b/jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions$C.class similarity index 100% rename from regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions$C.class rename to jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions$C.class diff --git a/regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions.class b/jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions.class similarity index 100% rename from regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions.class rename to jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions.class diff --git a/regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions.java b/jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions.java similarity index 100% rename from regression/cbmc-java/remove_virtual_function_typecast/VirtualFunctions.java rename to jbmc/regression/jbmc/remove_virtual_function_typecast/VirtualFunctions.java diff --git a/regression/cbmc-java/remove_virtual_function_typecast/test.desc b/jbmc/regression/jbmc/remove_virtual_function_typecast/test.desc similarity index 100% rename from regression/cbmc-java/remove_virtual_function_typecast/test.desc rename to jbmc/regression/jbmc/remove_virtual_function_typecast/test.desc diff --git a/regression/cbmc-java/removed_virtual_functions/AbstractList$Itr.class b/jbmc/regression/jbmc/removed_virtual_functions/AbstractList$Itr.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/AbstractList$Itr.class rename to jbmc/regression/jbmc/removed_virtual_functions/AbstractList$Itr.class diff --git a/regression/cbmc-java/removed_virtual_functions/AbstractList.class b/jbmc/regression/jbmc/removed_virtual_functions/AbstractList.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/AbstractList.class rename to jbmc/regression/jbmc/removed_virtual_functions/AbstractList.class diff --git a/regression/cbmc-java/removed_virtual_functions/AbstractList.java b/jbmc/regression/jbmc/removed_virtual_functions/AbstractList.java similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/AbstractList.java rename to jbmc/regression/jbmc/removed_virtual_functions/AbstractList.java diff --git a/regression/cbmc-java/removed_virtual_functions/ArrayList$Itr.class b/jbmc/regression/jbmc/removed_virtual_functions/ArrayList$Itr.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ArrayList$Itr.class rename to jbmc/regression/jbmc/removed_virtual_functions/ArrayList$Itr.class diff --git a/regression/cbmc-java/removed_virtual_functions/ArrayList$ListItr.class b/jbmc/regression/jbmc/removed_virtual_functions/ArrayList$ListItr.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ArrayList$ListItr.class rename to jbmc/regression/jbmc/removed_virtual_functions/ArrayList$ListItr.class diff --git a/regression/cbmc-java/removed_virtual_functions/ArrayList.class b/jbmc/regression/jbmc/removed_virtual_functions/ArrayList.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ArrayList.class rename to jbmc/regression/jbmc/removed_virtual_functions/ArrayList.class diff --git a/regression/cbmc-java/removed_virtual_functions/ArrayList.java b/jbmc/regression/jbmc/removed_virtual_functions/ArrayList.java similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ArrayList.java rename to jbmc/regression/jbmc/removed_virtual_functions/ArrayList.java diff --git a/regression/cbmc-java/removed_virtual_functions/ArrayListEquals.class b/jbmc/regression/jbmc/removed_virtual_functions/ArrayListEquals.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ArrayListEquals.class rename to jbmc/regression/jbmc/removed_virtual_functions/ArrayListEquals.class diff --git a/regression/cbmc-java/removed_virtual_functions/ArrayListEquals.java b/jbmc/regression/jbmc/removed_virtual_functions/ArrayListEquals.java similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ArrayListEquals.java rename to jbmc/regression/jbmc/removed_virtual_functions/ArrayListEquals.java diff --git a/regression/cbmc-java/removed_virtual_functions/Iterator.class b/jbmc/regression/jbmc/removed_virtual_functions/Iterator.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/Iterator.class rename to jbmc/regression/jbmc/removed_virtual_functions/Iterator.class diff --git a/regression/cbmc-java/removed_virtual_functions/Iterator.java b/jbmc/regression/jbmc/removed_virtual_functions/Iterator.java similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/Iterator.java rename to jbmc/regression/jbmc/removed_virtual_functions/Iterator.java diff --git a/regression/cbmc-java/removed_virtual_functions/List.class b/jbmc/regression/jbmc/removed_virtual_functions/List.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/List.class rename to jbmc/regression/jbmc/removed_virtual_functions/List.class diff --git a/regression/cbmc-java/removed_virtual_functions/List.java b/jbmc/regression/jbmc/removed_virtual_functions/List.java similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/List.java rename to jbmc/regression/jbmc/removed_virtual_functions/List.java diff --git a/regression/cbmc-java/removed_virtual_functions/ListIterator.class b/jbmc/regression/jbmc/removed_virtual_functions/ListIterator.class similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ListIterator.class rename to jbmc/regression/jbmc/removed_virtual_functions/ListIterator.class diff --git a/regression/cbmc-java/removed_virtual_functions/ListIterator.java b/jbmc/regression/jbmc/removed_virtual_functions/ListIterator.java similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/ListIterator.java rename to jbmc/regression/jbmc/removed_virtual_functions/ListIterator.java diff --git a/regression/cbmc-java/removed_virtual_functions/test.desc b/jbmc/regression/jbmc/removed_virtual_functions/test.desc similarity index 100% rename from regression/cbmc-java/removed_virtual_functions/test.desc rename to jbmc/regression/jbmc/removed_virtual_functions/test.desc diff --git a/regression/cbmc-java/return1/return1.class b/jbmc/regression/jbmc/return1/return1.class similarity index 100% rename from regression/cbmc-java/return1/return1.class rename to jbmc/regression/jbmc/return1/return1.class diff --git a/regression/cbmc-java/return1/return1.java b/jbmc/regression/jbmc/return1/return1.java similarity index 100% rename from regression/cbmc-java/return1/return1.java rename to jbmc/regression/jbmc/return1/return1.java diff --git a/regression/cbmc-java/return1/test.desc b/jbmc/regression/jbmc/return1/test.desc similarity index 100% rename from regression/cbmc-java/return1/test.desc rename to jbmc/regression/jbmc/return1/test.desc diff --git a/regression/cbmc-java/return2/return2.class b/jbmc/regression/jbmc/return2/return2.class similarity index 100% rename from regression/cbmc-java/return2/return2.class rename to jbmc/regression/jbmc/return2/return2.class diff --git a/regression/cbmc-java/return2/return2.java b/jbmc/regression/jbmc/return2/return2.java similarity index 100% rename from regression/cbmc-java/return2/return2.java rename to jbmc/regression/jbmc/return2/return2.java diff --git a/regression/cbmc-java/return2/test.desc b/jbmc/regression/jbmc/return2/test.desc similarity index 100% rename from regression/cbmc-java/return2/test.desc rename to jbmc/regression/jbmc/return2/test.desc diff --git a/regression/cbmc-java/short1/short1.class b/jbmc/regression/jbmc/short1/short1.class similarity index 100% rename from regression/cbmc-java/short1/short1.class rename to jbmc/regression/jbmc/short1/short1.class diff --git a/regression/cbmc-java/short1/short1.java b/jbmc/regression/jbmc/short1/short1.java similarity index 100% rename from regression/cbmc-java/short1/short1.java rename to jbmc/regression/jbmc/short1/short1.java diff --git a/regression/cbmc-java/short1/test.desc b/jbmc/regression/jbmc/short1/test.desc similarity index 100% rename from regression/cbmc-java/short1/test.desc rename to jbmc/regression/jbmc/short1/test.desc diff --git a/regression/cbmc-java/short2/short2.class b/jbmc/regression/jbmc/short2/short2.class similarity index 100% rename from regression/cbmc-java/short2/short2.class rename to jbmc/regression/jbmc/short2/short2.class diff --git a/regression/cbmc-java/short2/short2.java b/jbmc/regression/jbmc/short2/short2.java similarity index 100% rename from regression/cbmc-java/short2/short2.java rename to jbmc/regression/jbmc/short2/short2.java diff --git a/regression/cbmc-java/short2/test.desc b/jbmc/regression/jbmc/short2/test.desc similarity index 100% rename from regression/cbmc-java/short2/test.desc rename to jbmc/regression/jbmc/short2/test.desc diff --git a/regression/cbmc-java/siblingobjects1/Other.class b/jbmc/regression/jbmc/siblingobjects1/Other.class similarity index 100% rename from regression/cbmc-java/siblingobjects1/Other.class rename to jbmc/regression/jbmc/siblingobjects1/Other.class diff --git a/regression/cbmc-java/siblingobjects1/test.class b/jbmc/regression/jbmc/siblingobjects1/test.class similarity index 100% rename from regression/cbmc-java/siblingobjects1/test.class rename to jbmc/regression/jbmc/siblingobjects1/test.class diff --git a/regression/cbmc-java/siblingobjects1/test.desc b/jbmc/regression/jbmc/siblingobjects1/test.desc similarity index 100% rename from regression/cbmc-java/siblingobjects1/test.desc rename to jbmc/regression/jbmc/siblingobjects1/test.desc diff --git a/regression/cbmc-java/siblingobjects1/test.java b/jbmc/regression/jbmc/siblingobjects1/test.java similarity index 100% rename from regression/cbmc-java/siblingobjects1/test.java rename to jbmc/regression/jbmc/siblingobjects1/test.java diff --git a/regression/cbmc-java/siblingobjects2/Other.class b/jbmc/regression/jbmc/siblingobjects2/Other.class similarity index 100% rename from regression/cbmc-java/siblingobjects2/Other.class rename to jbmc/regression/jbmc/siblingobjects2/Other.class diff --git a/regression/cbmc-java/siblingobjects2/test.class b/jbmc/regression/jbmc/siblingobjects2/test.class similarity index 100% rename from regression/cbmc-java/siblingobjects2/test.class rename to jbmc/regression/jbmc/siblingobjects2/test.class diff --git a/regression/cbmc-java/siblingobjects2/test.desc b/jbmc/regression/jbmc/siblingobjects2/test.desc similarity index 100% rename from regression/cbmc-java/siblingobjects2/test.desc rename to jbmc/regression/jbmc/siblingobjects2/test.desc diff --git a/regression/cbmc-java/siblingobjects2/test.java b/jbmc/regression/jbmc/siblingobjects2/test.java similarity index 100% rename from regression/cbmc-java/siblingobjects2/test.java rename to jbmc/regression/jbmc/siblingobjects2/test.java diff --git a/regression/cbmc-java/stack_var1/README b/jbmc/regression/jbmc/stack_var1/README similarity index 100% rename from regression/cbmc-java/stack_var1/README rename to jbmc/regression/jbmc/stack_var1/README diff --git a/regression/cbmc-java/stack_var1/stack_test.class b/jbmc/regression/jbmc/stack_var1/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var1/stack_test.class rename to jbmc/regression/jbmc/stack_var1/stack_test.class diff --git a/regression/cbmc-java/stack_var1/stack_test.java b/jbmc/regression/jbmc/stack_var1/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var1/stack_test.java rename to jbmc/regression/jbmc/stack_var1/stack_test.java diff --git a/regression/cbmc-java/stack_var1/stack_var1.class b/jbmc/regression/jbmc/stack_var1/stack_var1.class similarity index 100% rename from regression/cbmc-java/stack_var1/stack_var1.class rename to jbmc/regression/jbmc/stack_var1/stack_var1.class diff --git a/regression/cbmc-java/stack_var1/stack_var1.j b/jbmc/regression/jbmc/stack_var1/stack_var1.j similarity index 100% rename from regression/cbmc-java/stack_var1/stack_var1.j rename to jbmc/regression/jbmc/stack_var1/stack_var1.j diff --git a/regression/cbmc-java/stack_var1/test.desc b/jbmc/regression/jbmc/stack_var1/test.desc similarity index 100% rename from regression/cbmc-java/stack_var1/test.desc rename to jbmc/regression/jbmc/stack_var1/test.desc diff --git a/regression/cbmc-java/stack_var10/README b/jbmc/regression/jbmc/stack_var10/README similarity index 100% rename from regression/cbmc-java/stack_var10/README rename to jbmc/regression/jbmc/stack_var10/README diff --git a/regression/cbmc-java/stack_var10/stack_test.class b/jbmc/regression/jbmc/stack_var10/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var10/stack_test.class rename to jbmc/regression/jbmc/stack_var10/stack_test.class diff --git a/regression/cbmc-java/stack_var10/stack_test.java b/jbmc/regression/jbmc/stack_var10/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var10/stack_test.java rename to jbmc/regression/jbmc/stack_var10/stack_test.java diff --git a/regression/cbmc-java/stack_var10/stack_var10.class b/jbmc/regression/jbmc/stack_var10/stack_var10.class similarity index 100% rename from regression/cbmc-java/stack_var10/stack_var10.class rename to jbmc/regression/jbmc/stack_var10/stack_var10.class diff --git a/regression/cbmc-java/stack_var10/stack_var10.j b/jbmc/regression/jbmc/stack_var10/stack_var10.j similarity index 100% rename from regression/cbmc-java/stack_var10/stack_var10.j rename to jbmc/regression/jbmc/stack_var10/stack_var10.j diff --git a/regression/cbmc-java/stack_var10/test.desc b/jbmc/regression/jbmc/stack_var10/test.desc similarity index 100% rename from regression/cbmc-java/stack_var10/test.desc rename to jbmc/regression/jbmc/stack_var10/test.desc diff --git a/regression/cbmc-java/stack_var11/README b/jbmc/regression/jbmc/stack_var11/README similarity index 100% rename from regression/cbmc-java/stack_var11/README rename to jbmc/regression/jbmc/stack_var11/README diff --git a/regression/cbmc-java/stack_var11/stack_test.class b/jbmc/regression/jbmc/stack_var11/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var11/stack_test.class rename to jbmc/regression/jbmc/stack_var11/stack_test.class diff --git a/regression/cbmc-java/stack_var11/stack_test.java b/jbmc/regression/jbmc/stack_var11/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var11/stack_test.java rename to jbmc/regression/jbmc/stack_var11/stack_test.java diff --git a/regression/cbmc-java/stack_var11/stack_var11.class b/jbmc/regression/jbmc/stack_var11/stack_var11.class similarity index 100% rename from regression/cbmc-java/stack_var11/stack_var11.class rename to jbmc/regression/jbmc/stack_var11/stack_var11.class diff --git a/regression/cbmc-java/stack_var11/stack_var11.j b/jbmc/regression/jbmc/stack_var11/stack_var11.j similarity index 100% rename from regression/cbmc-java/stack_var11/stack_var11.j rename to jbmc/regression/jbmc/stack_var11/stack_var11.j diff --git a/regression/cbmc-java/stack_var2/README b/jbmc/regression/jbmc/stack_var2/README similarity index 100% rename from regression/cbmc-java/stack_var2/README rename to jbmc/regression/jbmc/stack_var2/README diff --git a/regression/cbmc-java/stack_var2/stack_test.class b/jbmc/regression/jbmc/stack_var2/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var2/stack_test.class rename to jbmc/regression/jbmc/stack_var2/stack_test.class diff --git a/regression/cbmc-java/stack_var2/stack_test.java b/jbmc/regression/jbmc/stack_var2/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var2/stack_test.java rename to jbmc/regression/jbmc/stack_var2/stack_test.java diff --git a/regression/cbmc-java/stack_var2/stack_var2.class b/jbmc/regression/jbmc/stack_var2/stack_var2.class similarity index 100% rename from regression/cbmc-java/stack_var2/stack_var2.class rename to jbmc/regression/jbmc/stack_var2/stack_var2.class diff --git a/regression/cbmc-java/stack_var2/stack_var2.j b/jbmc/regression/jbmc/stack_var2/stack_var2.j similarity index 100% rename from regression/cbmc-java/stack_var2/stack_var2.j rename to jbmc/regression/jbmc/stack_var2/stack_var2.j diff --git a/regression/cbmc-java/stack_var2/test.desc b/jbmc/regression/jbmc/stack_var2/test.desc similarity index 100% rename from regression/cbmc-java/stack_var2/test.desc rename to jbmc/regression/jbmc/stack_var2/test.desc diff --git a/regression/cbmc-java/stack_var3/README b/jbmc/regression/jbmc/stack_var3/README similarity index 100% rename from regression/cbmc-java/stack_var3/README rename to jbmc/regression/jbmc/stack_var3/README diff --git a/regression/cbmc-java/stack_var3/stack_test.class b/jbmc/regression/jbmc/stack_var3/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var3/stack_test.class rename to jbmc/regression/jbmc/stack_var3/stack_test.class diff --git a/regression/cbmc-java/stack_var3/stack_test.java b/jbmc/regression/jbmc/stack_var3/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var3/stack_test.java rename to jbmc/regression/jbmc/stack_var3/stack_test.java diff --git a/regression/cbmc-java/stack_var3/stack_var3.class b/jbmc/regression/jbmc/stack_var3/stack_var3.class similarity index 100% rename from regression/cbmc-java/stack_var3/stack_var3.class rename to jbmc/regression/jbmc/stack_var3/stack_var3.class diff --git a/regression/cbmc-java/stack_var3/stack_var3.j b/jbmc/regression/jbmc/stack_var3/stack_var3.j similarity index 100% rename from regression/cbmc-java/stack_var3/stack_var3.j rename to jbmc/regression/jbmc/stack_var3/stack_var3.j diff --git a/regression/cbmc-java/stack_var3/test.desc b/jbmc/regression/jbmc/stack_var3/test.desc similarity index 100% rename from regression/cbmc-java/stack_var3/test.desc rename to jbmc/regression/jbmc/stack_var3/test.desc diff --git a/regression/cbmc-java/stack_var4/README b/jbmc/regression/jbmc/stack_var4/README similarity index 100% rename from regression/cbmc-java/stack_var4/README rename to jbmc/regression/jbmc/stack_var4/README diff --git a/regression/cbmc-java/stack_var4/stack_test.class b/jbmc/regression/jbmc/stack_var4/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var4/stack_test.class rename to jbmc/regression/jbmc/stack_var4/stack_test.class diff --git a/regression/cbmc-java/stack_var4/stack_test.java b/jbmc/regression/jbmc/stack_var4/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var4/stack_test.java rename to jbmc/regression/jbmc/stack_var4/stack_test.java diff --git a/regression/cbmc-java/stack_var4/stack_var4.class b/jbmc/regression/jbmc/stack_var4/stack_var4.class similarity index 100% rename from regression/cbmc-java/stack_var4/stack_var4.class rename to jbmc/regression/jbmc/stack_var4/stack_var4.class diff --git a/regression/cbmc-java/stack_var4/stack_var4.j b/jbmc/regression/jbmc/stack_var4/stack_var4.j similarity index 100% rename from regression/cbmc-java/stack_var4/stack_var4.j rename to jbmc/regression/jbmc/stack_var4/stack_var4.j diff --git a/regression/cbmc-java/stack_var4/test.desc b/jbmc/regression/jbmc/stack_var4/test.desc similarity index 100% rename from regression/cbmc-java/stack_var4/test.desc rename to jbmc/regression/jbmc/stack_var4/test.desc diff --git a/regression/cbmc-java/stack_var5/README b/jbmc/regression/jbmc/stack_var5/README similarity index 100% rename from regression/cbmc-java/stack_var5/README rename to jbmc/regression/jbmc/stack_var5/README diff --git a/regression/cbmc-java/stack_var5/stack_test.class b/jbmc/regression/jbmc/stack_var5/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var5/stack_test.class rename to jbmc/regression/jbmc/stack_var5/stack_test.class diff --git a/regression/cbmc-java/stack_var5/stack_test.java b/jbmc/regression/jbmc/stack_var5/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var5/stack_test.java rename to jbmc/regression/jbmc/stack_var5/stack_test.java diff --git a/regression/cbmc-java/stack_var5/stack_var5.class b/jbmc/regression/jbmc/stack_var5/stack_var5.class similarity index 100% rename from regression/cbmc-java/stack_var5/stack_var5.class rename to jbmc/regression/jbmc/stack_var5/stack_var5.class diff --git a/regression/cbmc-java/stack_var5/stack_var5.j b/jbmc/regression/jbmc/stack_var5/stack_var5.j similarity index 100% rename from regression/cbmc-java/stack_var5/stack_var5.j rename to jbmc/regression/jbmc/stack_var5/stack_var5.j diff --git a/regression/cbmc-java/stack_var5/test.desc b/jbmc/regression/jbmc/stack_var5/test.desc similarity index 100% rename from regression/cbmc-java/stack_var5/test.desc rename to jbmc/regression/jbmc/stack_var5/test.desc diff --git a/regression/cbmc-java/stack_var6/README b/jbmc/regression/jbmc/stack_var6/README similarity index 100% rename from regression/cbmc-java/stack_var6/README rename to jbmc/regression/jbmc/stack_var6/README diff --git a/regression/cbmc-java/stack_var6/stack_test.class b/jbmc/regression/jbmc/stack_var6/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var6/stack_test.class rename to jbmc/regression/jbmc/stack_var6/stack_test.class diff --git a/regression/cbmc-java/stack_var6/stack_test.java b/jbmc/regression/jbmc/stack_var6/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var6/stack_test.java rename to jbmc/regression/jbmc/stack_var6/stack_test.java diff --git a/regression/cbmc-java/stack_var6/stack_var6.class b/jbmc/regression/jbmc/stack_var6/stack_var6.class similarity index 100% rename from regression/cbmc-java/stack_var6/stack_var6.class rename to jbmc/regression/jbmc/stack_var6/stack_var6.class diff --git a/regression/cbmc-java/stack_var6/stack_var6.j b/jbmc/regression/jbmc/stack_var6/stack_var6.j similarity index 100% rename from regression/cbmc-java/stack_var6/stack_var6.j rename to jbmc/regression/jbmc/stack_var6/stack_var6.j diff --git a/regression/cbmc-java/stack_var6/test.desc b/jbmc/regression/jbmc/stack_var6/test.desc similarity index 100% rename from regression/cbmc-java/stack_var6/test.desc rename to jbmc/regression/jbmc/stack_var6/test.desc diff --git a/regression/cbmc-java/stack_var7/README b/jbmc/regression/jbmc/stack_var7/README similarity index 100% rename from regression/cbmc-java/stack_var7/README rename to jbmc/regression/jbmc/stack_var7/README diff --git a/regression/cbmc-java/stack_var7/stack_test.class b/jbmc/regression/jbmc/stack_var7/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var7/stack_test.class rename to jbmc/regression/jbmc/stack_var7/stack_test.class diff --git a/regression/cbmc-java/stack_var7/stack_test.java b/jbmc/regression/jbmc/stack_var7/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var7/stack_test.java rename to jbmc/regression/jbmc/stack_var7/stack_test.java diff --git a/regression/cbmc-java/stack_var7/stack_var7.class b/jbmc/regression/jbmc/stack_var7/stack_var7.class similarity index 100% rename from regression/cbmc-java/stack_var7/stack_var7.class rename to jbmc/regression/jbmc/stack_var7/stack_var7.class diff --git a/regression/cbmc-java/stack_var7/stack_var7.j b/jbmc/regression/jbmc/stack_var7/stack_var7.j similarity index 100% rename from regression/cbmc-java/stack_var7/stack_var7.j rename to jbmc/regression/jbmc/stack_var7/stack_var7.j diff --git a/regression/cbmc-java/stack_var7/test.desc b/jbmc/regression/jbmc/stack_var7/test.desc similarity index 100% rename from regression/cbmc-java/stack_var7/test.desc rename to jbmc/regression/jbmc/stack_var7/test.desc diff --git a/regression/cbmc-java/stack_var8/README b/jbmc/regression/jbmc/stack_var8/README similarity index 100% rename from regression/cbmc-java/stack_var8/README rename to jbmc/regression/jbmc/stack_var8/README diff --git a/regression/cbmc-java/stack_var8/stack_test.class b/jbmc/regression/jbmc/stack_var8/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var8/stack_test.class rename to jbmc/regression/jbmc/stack_var8/stack_test.class diff --git a/regression/cbmc-java/stack_var8/stack_test.java b/jbmc/regression/jbmc/stack_var8/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var8/stack_test.java rename to jbmc/regression/jbmc/stack_var8/stack_test.java diff --git a/regression/cbmc-java/stack_var8/stack_var8.class b/jbmc/regression/jbmc/stack_var8/stack_var8.class similarity index 100% rename from regression/cbmc-java/stack_var8/stack_var8.class rename to jbmc/regression/jbmc/stack_var8/stack_var8.class diff --git a/regression/cbmc-java/stack_var8/stack_var8.j b/jbmc/regression/jbmc/stack_var8/stack_var8.j similarity index 100% rename from regression/cbmc-java/stack_var8/stack_var8.j rename to jbmc/regression/jbmc/stack_var8/stack_var8.j diff --git a/regression/cbmc-java/stack_var9/README b/jbmc/regression/jbmc/stack_var9/README similarity index 100% rename from regression/cbmc-java/stack_var9/README rename to jbmc/regression/jbmc/stack_var9/README diff --git a/regression/cbmc-java/stack_var9/stack_test.class b/jbmc/regression/jbmc/stack_var9/stack_test.class similarity index 100% rename from regression/cbmc-java/stack_var9/stack_test.class rename to jbmc/regression/jbmc/stack_var9/stack_test.class diff --git a/regression/cbmc-java/stack_var9/stack_test.java b/jbmc/regression/jbmc/stack_var9/stack_test.java similarity index 100% rename from regression/cbmc-java/stack_var9/stack_test.java rename to jbmc/regression/jbmc/stack_var9/stack_test.java diff --git a/regression/cbmc-java/stack_var9/stack_var9.class b/jbmc/regression/jbmc/stack_var9/stack_var9.class similarity index 100% rename from regression/cbmc-java/stack_var9/stack_var9.class rename to jbmc/regression/jbmc/stack_var9/stack_var9.class diff --git a/regression/cbmc-java/stack_var9/stack_var9.j b/jbmc/regression/jbmc/stack_var9/stack_var9.j similarity index 100% rename from regression/cbmc-java/stack_var9/stack_var9.j rename to jbmc/regression/jbmc/stack_var9/stack_var9.j diff --git a/regression/cbmc-java/static_init1/A.class b/jbmc/regression/jbmc/static_init1/A.class similarity index 100% rename from regression/cbmc-java/static_init1/A.class rename to jbmc/regression/jbmc/static_init1/A.class diff --git a/regression/cbmc-java/static_init1/B.class b/jbmc/regression/jbmc/static_init1/B.class similarity index 100% rename from regression/cbmc-java/static_init1/B.class rename to jbmc/regression/jbmc/static_init1/B.class diff --git a/regression/cbmc-java/static_init1/static_init.class b/jbmc/regression/jbmc/static_init1/static_init.class similarity index 100% rename from regression/cbmc-java/static_init1/static_init.class rename to jbmc/regression/jbmc/static_init1/static_init.class diff --git a/regression/cbmc-java/static_init1/static_init.java b/jbmc/regression/jbmc/static_init1/static_init.java similarity index 100% rename from regression/cbmc-java/static_init1/static_init.java rename to jbmc/regression/jbmc/static_init1/static_init.java diff --git a/regression/cbmc-java/static_init1/test.desc b/jbmc/regression/jbmc/static_init1/test.desc similarity index 100% rename from regression/cbmc-java/static_init1/test.desc rename to jbmc/regression/jbmc/static_init1/test.desc diff --git a/regression/cbmc-java/static_init1/test1.desc b/jbmc/regression/jbmc/static_init1/test1.desc similarity index 100% rename from regression/cbmc-java/static_init1/test1.desc rename to jbmc/regression/jbmc/static_init1/test1.desc diff --git a/regression/cbmc-java/static_init2/A.class b/jbmc/regression/jbmc/static_init2/A.class similarity index 100% rename from regression/cbmc-java/static_init2/A.class rename to jbmc/regression/jbmc/static_init2/A.class diff --git a/regression/cbmc-java/static_init2/B.class b/jbmc/regression/jbmc/static_init2/B.class similarity index 100% rename from regression/cbmc-java/static_init2/B.class rename to jbmc/regression/jbmc/static_init2/B.class diff --git a/regression/cbmc-java/static_init2/static_init.class b/jbmc/regression/jbmc/static_init2/static_init.class similarity index 100% rename from regression/cbmc-java/static_init2/static_init.class rename to jbmc/regression/jbmc/static_init2/static_init.class diff --git a/regression/cbmc-java/static_init2/static_init.java b/jbmc/regression/jbmc/static_init2/static_init.java similarity index 100% rename from regression/cbmc-java/static_init2/static_init.java rename to jbmc/regression/jbmc/static_init2/static_init.java diff --git a/regression/cbmc-java/static_init2/test.desc b/jbmc/regression/jbmc/static_init2/test.desc similarity index 100% rename from regression/cbmc-java/static_init2/test.desc rename to jbmc/regression/jbmc/static_init2/test.desc diff --git a/regression/cbmc-java/static_init2/test1.desc b/jbmc/regression/jbmc/static_init2/test1.desc similarity index 100% rename from regression/cbmc-java/static_init2/test1.desc rename to jbmc/regression/jbmc/static_init2/test1.desc diff --git a/regression/cbmc-java/static_init_order/A.class b/jbmc/regression/jbmc/static_init_order/A.class similarity index 100% rename from regression/cbmc-java/static_init_order/A.class rename to jbmc/regression/jbmc/static_init_order/A.class diff --git a/regression/cbmc-java/static_init_order/B.class b/jbmc/regression/jbmc/static_init_order/B.class similarity index 100% rename from regression/cbmc-java/static_init_order/B.class rename to jbmc/regression/jbmc/static_init_order/B.class diff --git a/regression/cbmc-java/static_init_order/C.class b/jbmc/regression/jbmc/static_init_order/C.class similarity index 100% rename from regression/cbmc-java/static_init_order/C.class rename to jbmc/regression/jbmc/static_init_order/C.class diff --git a/regression/cbmc-java/static_init_order/static_init_order.class b/jbmc/regression/jbmc/static_init_order/static_init_order.class similarity index 100% rename from regression/cbmc-java/static_init_order/static_init_order.class rename to jbmc/regression/jbmc/static_init_order/static_init_order.class diff --git a/regression/cbmc-java/static_init_order/static_init_order.java b/jbmc/regression/jbmc/static_init_order/static_init_order.java similarity index 100% rename from regression/cbmc-java/static_init_order/static_init_order.java rename to jbmc/regression/jbmc/static_init_order/static_init_order.java diff --git a/regression/cbmc-java/static_init_order/test1.desc b/jbmc/regression/jbmc/static_init_order/test1.desc similarity index 100% rename from regression/cbmc-java/static_init_order/test1.desc rename to jbmc/regression/jbmc/static_init_order/test1.desc diff --git a/regression/cbmc-java/static_init_order/test2.desc b/jbmc/regression/jbmc/static_init_order/test2.desc similarity index 100% rename from regression/cbmc-java/static_init_order/test2.desc rename to jbmc/regression/jbmc/static_init_order/test2.desc diff --git a/regression/cbmc-java/static_init_order/test3.desc b/jbmc/regression/jbmc/static_init_order/test3.desc similarity index 100% rename from regression/cbmc-java/static_init_order/test3.desc rename to jbmc/regression/jbmc/static_init_order/test3.desc diff --git a/regression/cbmc-java/static_init_order/test4.desc b/jbmc/regression/jbmc/static_init_order/test4.desc similarity index 100% rename from regression/cbmc-java/static_init_order/test4.desc rename to jbmc/regression/jbmc/static_init_order/test4.desc diff --git a/regression/cbmc-java/static_method1/static_method1.class b/jbmc/regression/jbmc/static_method1/static_method1.class similarity index 100% rename from regression/cbmc-java/static_method1/static_method1.class rename to jbmc/regression/jbmc/static_method1/static_method1.class diff --git a/regression/cbmc-java/static_method1/static_method1.java b/jbmc/regression/jbmc/static_method1/static_method1.java similarity index 100% rename from regression/cbmc-java/static_method1/static_method1.java rename to jbmc/regression/jbmc/static_method1/static_method1.java diff --git a/regression/cbmc-java/static_method1/test.desc b/jbmc/regression/jbmc/static_method1/test.desc similarity index 100% rename from regression/cbmc-java/static_method1/test.desc rename to jbmc/regression/jbmc/static_method1/test.desc diff --git a/regression/cbmc-java/store_load1/store_load1.class b/jbmc/regression/jbmc/store_load1/store_load1.class similarity index 100% rename from regression/cbmc-java/store_load1/store_load1.class rename to jbmc/regression/jbmc/store_load1/store_load1.class diff --git a/regression/cbmc-java/store_load1/store_load1.java b/jbmc/regression/jbmc/store_load1/store_load1.java similarity index 100% rename from regression/cbmc-java/store_load1/store_load1.java rename to jbmc/regression/jbmc/store_load1/store_load1.java diff --git a/regression/cbmc-java/store_load1/test.desc b/jbmc/regression/jbmc/store_load1/test.desc similarity index 100% rename from regression/cbmc-java/store_load1/test.desc rename to jbmc/regression/jbmc/store_load1/test.desc diff --git a/regression/cbmc-java/string_literal1/string_literal1.class b/jbmc/regression/jbmc/string_literal1/string_literal1.class similarity index 100% rename from regression/cbmc-java/string_literal1/string_literal1.class rename to jbmc/regression/jbmc/string_literal1/string_literal1.class diff --git a/regression/cbmc-java/string_literal1/string_literal1.java b/jbmc/regression/jbmc/string_literal1/string_literal1.java similarity index 100% rename from regression/cbmc-java/string_literal1/string_literal1.java rename to jbmc/regression/jbmc/string_literal1/string_literal1.java diff --git a/regression/cbmc-java/string_literal1/test.desc b/jbmc/regression/jbmc/string_literal1/test.desc similarity index 100% rename from regression/cbmc-java/string_literal1/test.desc rename to jbmc/regression/jbmc/string_literal1/test.desc diff --git a/regression/cbmc-java/swap1/Swap.class b/jbmc/regression/jbmc/swap1/Swap.class similarity index 100% rename from regression/cbmc-java/swap1/Swap.class rename to jbmc/regression/jbmc/swap1/Swap.class diff --git a/regression/cbmc-java/swap1/Swap.java b/jbmc/regression/jbmc/swap1/Swap.java similarity index 100% rename from regression/cbmc-java/swap1/Swap.java rename to jbmc/regression/jbmc/swap1/Swap.java diff --git a/regression/cbmc-java/swap1/SwapDump.java b/jbmc/regression/jbmc/swap1/SwapDump.java similarity index 100% rename from regression/cbmc-java/swap1/SwapDump.java rename to jbmc/regression/jbmc/swap1/SwapDump.java diff --git a/regression/cbmc-java/swap1/test.desc b/jbmc/regression/jbmc/swap1/test.desc similarity index 100% rename from regression/cbmc-java/swap1/test.desc rename to jbmc/regression/jbmc/swap1/test.desc diff --git a/regression/cbmc-java/swap2/org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class b/jbmc/regression/jbmc/swap2/org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class similarity index 100% rename from regression/cbmc-java/swap2/org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class rename to jbmc/regression/jbmc/swap2/org/springframework/build/gradle/MergePlugin$1$_execute_closure1$_closure2.class diff --git a/regression/cbmc-java/swap2/org/springframework/build/gradle/MergePlugin.groovy b/jbmc/regression/jbmc/swap2/org/springframework/build/gradle/MergePlugin.groovy similarity index 100% rename from regression/cbmc-java/swap2/org/springframework/build/gradle/MergePlugin.groovy rename to jbmc/regression/jbmc/swap2/org/springframework/build/gradle/MergePlugin.groovy diff --git a/regression/cbmc-java/swap2/test.desc b/jbmc/regression/jbmc/swap2/test.desc similarity index 100% rename from regression/cbmc-java/swap2/test.desc rename to jbmc/regression/jbmc/swap2/test.desc diff --git a/regression/cbmc-java/synchronized/Sync.class b/jbmc/regression/jbmc/synchronized/Sync.class similarity index 100% rename from regression/cbmc-java/synchronized/Sync.class rename to jbmc/regression/jbmc/synchronized/Sync.class diff --git a/regression/cbmc-java/synchronized/Sync.java b/jbmc/regression/jbmc/synchronized/Sync.java similarity index 100% rename from regression/cbmc-java/synchronized/Sync.java rename to jbmc/regression/jbmc/synchronized/Sync.java diff --git a/regression/cbmc-java/synchronized/test.desc b/jbmc/regression/jbmc/synchronized/test.desc similarity index 100% rename from regression/cbmc-java/synchronized/test.desc rename to jbmc/regression/jbmc/synchronized/test.desc diff --git a/regression/cbmc-java/tableswitch1/tableswitch1.class b/jbmc/regression/jbmc/tableswitch1/tableswitch1.class similarity index 100% rename from regression/cbmc-java/tableswitch1/tableswitch1.class rename to jbmc/regression/jbmc/tableswitch1/tableswitch1.class diff --git a/regression/cbmc-java/tableswitch1/tableswitch1.java b/jbmc/regression/jbmc/tableswitch1/tableswitch1.java similarity index 100% rename from regression/cbmc-java/tableswitch1/tableswitch1.java rename to jbmc/regression/jbmc/tableswitch1/tableswitch1.java diff --git a/regression/cbmc-java/tableswitch1/test.desc b/jbmc/regression/jbmc/tableswitch1/test.desc similarity index 100% rename from regression/cbmc-java/tableswitch1/test.desc rename to jbmc/regression/jbmc/tableswitch1/test.desc diff --git a/regression/cbmc-java/tableswitch2/generate_signed_tableswitch.java b/jbmc/regression/jbmc/tableswitch2/generate_signed_tableswitch.java similarity index 100% rename from regression/cbmc-java/tableswitch2/generate_signed_tableswitch.java rename to jbmc/regression/jbmc/tableswitch2/generate_signed_tableswitch.java diff --git a/regression/cbmc-java/tableswitch2/table_switch_neg_offset.class b/jbmc/regression/jbmc/tableswitch2/table_switch_neg_offset.class similarity index 100% rename from regression/cbmc-java/tableswitch2/table_switch_neg_offset.class rename to jbmc/regression/jbmc/tableswitch2/table_switch_neg_offset.class diff --git a/regression/cbmc-java/tableswitch2/test.desc b/jbmc/regression/jbmc/tableswitch2/test.desc similarity index 100% rename from regression/cbmc-java/tableswitch2/test.desc rename to jbmc/regression/jbmc/tableswitch2/test.desc diff --git a/regression/cbmc-java/trace_class_identifier/TestGenTest.class b/jbmc/regression/jbmc/trace_class_identifier/TestGenTest.class similarity index 100% rename from regression/cbmc-java/trace_class_identifier/TestGenTest.class rename to jbmc/regression/jbmc/trace_class_identifier/TestGenTest.class diff --git a/regression/cbmc-java/trace_class_identifier/TestGenTest.java b/jbmc/regression/jbmc/trace_class_identifier/TestGenTest.java similarity index 100% rename from regression/cbmc-java/trace_class_identifier/TestGenTest.java rename to jbmc/regression/jbmc/trace_class_identifier/TestGenTest.java diff --git a/regression/cbmc-java/trace_class_identifier/test.desc b/jbmc/regression/jbmc/trace_class_identifier/test.desc similarity index 100% rename from regression/cbmc-java/trace_class_identifier/test.desc rename to jbmc/regression/jbmc/trace_class_identifier/test.desc diff --git a/regression/cbmc-java/trace_options_json_extended/Test.class b/jbmc/regression/jbmc/trace_options_json_extended/Test.class similarity index 100% rename from regression/cbmc-java/trace_options_json_extended/Test.class rename to jbmc/regression/jbmc/trace_options_json_extended/Test.class diff --git a/regression/cbmc-java/trace_options_json_extended/Test.java b/jbmc/regression/jbmc/trace_options_json_extended/Test.java similarity index 100% rename from regression/cbmc-java/trace_options_json_extended/Test.java rename to jbmc/regression/jbmc/trace_options_json_extended/Test.java diff --git a/regression/cbmc-java/trace_options_json_extended/extended.desc b/jbmc/regression/jbmc/trace_options_json_extended/extended.desc similarity index 100% rename from regression/cbmc-java/trace_options_json_extended/extended.desc rename to jbmc/regression/jbmc/trace_options_json_extended/extended.desc diff --git a/regression/cbmc-java/trace_options_json_extended/non-extended.desc b/jbmc/regression/jbmc/trace_options_json_extended/non-extended.desc similarity index 100% rename from regression/cbmc-java/trace_options_json_extended/non-extended.desc rename to jbmc/regression/jbmc/trace_options_json_extended/non-extended.desc diff --git a/regression/cbmc-java/uninitialised1/test.desc b/jbmc/regression/jbmc/uninitialised1/test.desc similarity index 100% rename from regression/cbmc-java/uninitialised1/test.desc rename to jbmc/regression/jbmc/uninitialised1/test.desc diff --git a/regression/cbmc-java/uninitialised1/uninitialised1.class b/jbmc/regression/jbmc/uninitialised1/uninitialised1.class similarity index 100% rename from regression/cbmc-java/uninitialised1/uninitialised1.class rename to jbmc/regression/jbmc/uninitialised1/uninitialised1.class diff --git a/regression/cbmc-java/uninitialised1/uninitialised1.java b/jbmc/regression/jbmc/uninitialised1/uninitialised1.java similarity index 100% rename from regression/cbmc-java/uninitialised1/uninitialised1.java rename to jbmc/regression/jbmc/uninitialised1/uninitialised1.java diff --git a/regression/cbmc-java/very-long-jumps/NopJumps.class b/jbmc/regression/jbmc/very-long-jumps/NopJumps.class similarity index 100% rename from regression/cbmc-java/very-long-jumps/NopJumps.class rename to jbmc/regression/jbmc/very-long-jumps/NopJumps.class diff --git a/regression/cbmc-java/very-long-jumps/NopJumps.j b/jbmc/regression/jbmc/very-long-jumps/NopJumps.j similarity index 100% rename from regression/cbmc-java/very-long-jumps/NopJumps.j rename to jbmc/regression/jbmc/very-long-jumps/NopJumps.j diff --git a/regression/cbmc-java/very-long-jumps/test.desc b/jbmc/regression/jbmc/very-long-jumps/test.desc similarity index 100% rename from regression/cbmc-java/very-long-jumps/test.desc rename to jbmc/regression/jbmc/very-long-jumps/test.desc diff --git a/regression/cbmc-java/virtual1/A.class b/jbmc/regression/jbmc/virtual1/A.class similarity index 100% rename from regression/cbmc-java/virtual1/A.class rename to jbmc/regression/jbmc/virtual1/A.class diff --git a/regression/cbmc-java/virtual1/B.class b/jbmc/regression/jbmc/virtual1/B.class similarity index 100% rename from regression/cbmc-java/virtual1/B.class rename to jbmc/regression/jbmc/virtual1/B.class diff --git a/regression/cbmc-java/virtual1/test.desc b/jbmc/regression/jbmc/virtual1/test.desc similarity index 100% rename from regression/cbmc-java/virtual1/test.desc rename to jbmc/regression/jbmc/virtual1/test.desc diff --git a/regression/cbmc-java/virtual1/virtual1.class b/jbmc/regression/jbmc/virtual1/virtual1.class similarity index 100% rename from regression/cbmc-java/virtual1/virtual1.class rename to jbmc/regression/jbmc/virtual1/virtual1.class diff --git a/regression/cbmc-java/virtual1/virtual1.java b/jbmc/regression/jbmc/virtual1/virtual1.java similarity index 100% rename from regression/cbmc-java/virtual1/virtual1.java rename to jbmc/regression/jbmc/virtual1/virtual1.java diff --git a/regression/cbmc-java/virtual10/A.class b/jbmc/regression/jbmc/virtual10/A.class similarity index 100% rename from regression/cbmc-java/virtual10/A.class rename to jbmc/regression/jbmc/virtual10/A.class diff --git a/regression/cbmc-java/virtual10/B.class b/jbmc/regression/jbmc/virtual10/B.class similarity index 100% rename from regression/cbmc-java/virtual10/B.class rename to jbmc/regression/jbmc/virtual10/B.class diff --git a/regression/cbmc-java/virtual10/C.class b/jbmc/regression/jbmc/virtual10/C.class similarity index 100% rename from regression/cbmc-java/virtual10/C.class rename to jbmc/regression/jbmc/virtual10/C.class diff --git a/regression/cbmc-java/virtual10/D.class b/jbmc/regression/jbmc/virtual10/D.class similarity index 100% rename from regression/cbmc-java/virtual10/D.class rename to jbmc/regression/jbmc/virtual10/D.class diff --git a/regression/cbmc-java/virtual10/E.class b/jbmc/regression/jbmc/virtual10/E.class similarity index 100% rename from regression/cbmc-java/virtual10/E.class rename to jbmc/regression/jbmc/virtual10/E.class diff --git a/regression/cbmc-java/virtual10/O.class b/jbmc/regression/jbmc/virtual10/O.class similarity index 100% rename from regression/cbmc-java/virtual10/O.class rename to jbmc/regression/jbmc/virtual10/O.class diff --git a/regression/cbmc-java/virtual10/test.desc b/jbmc/regression/jbmc/virtual10/test.desc similarity index 100% rename from regression/cbmc-java/virtual10/test.desc rename to jbmc/regression/jbmc/virtual10/test.desc diff --git a/regression/cbmc-java/virtual10/test.java b/jbmc/regression/jbmc/virtual10/test.java similarity index 100% rename from regression/cbmc-java/virtual10/test.java rename to jbmc/regression/jbmc/virtual10/test.java diff --git a/regression/cbmc-java/virtual2/A.class b/jbmc/regression/jbmc/virtual2/A.class similarity index 100% rename from regression/cbmc-java/virtual2/A.class rename to jbmc/regression/jbmc/virtual2/A.class diff --git a/regression/cbmc-java/virtual2/B.class b/jbmc/regression/jbmc/virtual2/B.class similarity index 100% rename from regression/cbmc-java/virtual2/B.class rename to jbmc/regression/jbmc/virtual2/B.class diff --git a/regression/cbmc-java/virtual2/test.desc b/jbmc/regression/jbmc/virtual2/test.desc similarity index 100% rename from regression/cbmc-java/virtual2/test.desc rename to jbmc/regression/jbmc/virtual2/test.desc diff --git a/regression/cbmc-java/virtual2/virtual2.class b/jbmc/regression/jbmc/virtual2/virtual2.class similarity index 100% rename from regression/cbmc-java/virtual2/virtual2.class rename to jbmc/regression/jbmc/virtual2/virtual2.class diff --git a/regression/cbmc-java/virtual2/virtual2.java b/jbmc/regression/jbmc/virtual2/virtual2.java similarity index 100% rename from regression/cbmc-java/virtual2/virtual2.java rename to jbmc/regression/jbmc/virtual2/virtual2.java diff --git a/regression/cbmc-java/virtual4/A.class b/jbmc/regression/jbmc/virtual4/A.class similarity index 100% rename from regression/cbmc-java/virtual4/A.class rename to jbmc/regression/jbmc/virtual4/A.class diff --git a/regression/cbmc-java/virtual4/B.class b/jbmc/regression/jbmc/virtual4/B.class similarity index 100% rename from regression/cbmc-java/virtual4/B.class rename to jbmc/regression/jbmc/virtual4/B.class diff --git a/regression/cbmc-java/virtual4/C.class b/jbmc/regression/jbmc/virtual4/C.class similarity index 100% rename from regression/cbmc-java/virtual4/C.class rename to jbmc/regression/jbmc/virtual4/C.class diff --git a/regression/cbmc-java/virtual4/test.desc b/jbmc/regression/jbmc/virtual4/test.desc similarity index 100% rename from regression/cbmc-java/virtual4/test.desc rename to jbmc/regression/jbmc/virtual4/test.desc diff --git a/regression/cbmc-java/virtual4/virtual4.class b/jbmc/regression/jbmc/virtual4/virtual4.class similarity index 100% rename from regression/cbmc-java/virtual4/virtual4.class rename to jbmc/regression/jbmc/virtual4/virtual4.class diff --git a/regression/cbmc-java/virtual4/virtual4.java b/jbmc/regression/jbmc/virtual4/virtual4.java similarity index 100% rename from regression/cbmc-java/virtual4/virtual4.java rename to jbmc/regression/jbmc/virtual4/virtual4.java diff --git a/regression/cbmc-java/virtual5/child.class b/jbmc/regression/jbmc/virtual5/child.class similarity index 100% rename from regression/cbmc-java/virtual5/child.class rename to jbmc/regression/jbmc/virtual5/child.class diff --git a/regression/cbmc-java/virtual5/parent.class b/jbmc/regression/jbmc/virtual5/parent.class similarity index 100% rename from regression/cbmc-java/virtual5/parent.class rename to jbmc/regression/jbmc/virtual5/parent.class diff --git a/regression/cbmc-java/virtual5/test.desc b/jbmc/regression/jbmc/virtual5/test.desc similarity index 100% rename from regression/cbmc-java/virtual5/test.desc rename to jbmc/regression/jbmc/virtual5/test.desc diff --git a/regression/cbmc-java/virtual5/virtual5.class b/jbmc/regression/jbmc/virtual5/virtual5.class similarity index 100% rename from regression/cbmc-java/virtual5/virtual5.class rename to jbmc/regression/jbmc/virtual5/virtual5.class diff --git a/regression/cbmc-java/virtual5/virtual5.java b/jbmc/regression/jbmc/virtual5/virtual5.java similarity index 100% rename from regression/cbmc-java/virtual5/virtual5.java rename to jbmc/regression/jbmc/virtual5/virtual5.java diff --git a/regression/cbmc-java/virtual6/A.class b/jbmc/regression/jbmc/virtual6/A.class similarity index 100% rename from regression/cbmc-java/virtual6/A.class rename to jbmc/regression/jbmc/virtual6/A.class diff --git a/regression/cbmc-java/virtual6/A.java b/jbmc/regression/jbmc/virtual6/A.java similarity index 100% rename from regression/cbmc-java/virtual6/A.java rename to jbmc/regression/jbmc/virtual6/A.java diff --git a/regression/cbmc-java/virtual6/B.class b/jbmc/regression/jbmc/virtual6/B.class similarity index 100% rename from regression/cbmc-java/virtual6/B.class rename to jbmc/regression/jbmc/virtual6/B.class diff --git a/regression/cbmc-java/virtual6/C.class b/jbmc/regression/jbmc/virtual6/C.class similarity index 100% rename from regression/cbmc-java/virtual6/C.class rename to jbmc/regression/jbmc/virtual6/C.class diff --git a/regression/cbmc-java/virtual6/test.desc b/jbmc/regression/jbmc/virtual6/test.desc similarity index 100% rename from regression/cbmc-java/virtual6/test.desc rename to jbmc/regression/jbmc/virtual6/test.desc diff --git a/regression/cbmc-java/virtual7/A.class b/jbmc/regression/jbmc/virtual7/A.class similarity index 100% rename from regression/cbmc-java/virtual7/A.class rename to jbmc/regression/jbmc/virtual7/A.class diff --git a/regression/cbmc-java/virtual7/B.class b/jbmc/regression/jbmc/virtual7/B.class similarity index 100% rename from regression/cbmc-java/virtual7/B.class rename to jbmc/regression/jbmc/virtual7/B.class diff --git a/regression/cbmc-java/virtual7/C.class b/jbmc/regression/jbmc/virtual7/C.class similarity index 100% rename from regression/cbmc-java/virtual7/C.class rename to jbmc/regression/jbmc/virtual7/C.class diff --git a/regression/cbmc-java/virtual7/D.class b/jbmc/regression/jbmc/virtual7/D.class similarity index 100% rename from regression/cbmc-java/virtual7/D.class rename to jbmc/regression/jbmc/virtual7/D.class diff --git a/regression/cbmc-java/virtual7/E.class b/jbmc/regression/jbmc/virtual7/E.class similarity index 100% rename from regression/cbmc-java/virtual7/E.class rename to jbmc/regression/jbmc/virtual7/E.class diff --git a/regression/cbmc-java/virtual7/test.class b/jbmc/regression/jbmc/virtual7/test.class similarity index 100% rename from regression/cbmc-java/virtual7/test.class rename to jbmc/regression/jbmc/virtual7/test.class diff --git a/regression/cbmc-java/virtual7/test.desc b/jbmc/regression/jbmc/virtual7/test.desc similarity index 100% rename from regression/cbmc-java/virtual7/test.desc rename to jbmc/regression/jbmc/virtual7/test.desc diff --git a/regression/cbmc-java/virtual7/test.java b/jbmc/regression/jbmc/virtual7/test.java similarity index 100% rename from regression/cbmc-java/virtual7/test.java rename to jbmc/regression/jbmc/virtual7/test.java diff --git a/regression/cbmc-java/virtual8/A.class b/jbmc/regression/jbmc/virtual8/A.class similarity index 100% rename from regression/cbmc-java/virtual8/A.class rename to jbmc/regression/jbmc/virtual8/A.class diff --git a/regression/cbmc-java/virtual8/B.class b/jbmc/regression/jbmc/virtual8/B.class similarity index 100% rename from regression/cbmc-java/virtual8/B.class rename to jbmc/regression/jbmc/virtual8/B.class diff --git a/regression/cbmc-java/virtual8/C.class b/jbmc/regression/jbmc/virtual8/C.class similarity index 100% rename from regression/cbmc-java/virtual8/C.class rename to jbmc/regression/jbmc/virtual8/C.class diff --git a/regression/cbmc-java/virtual8/D.class b/jbmc/regression/jbmc/virtual8/D.class similarity index 100% rename from regression/cbmc-java/virtual8/D.class rename to jbmc/regression/jbmc/virtual8/D.class diff --git a/regression/cbmc-java/virtual8/E.class b/jbmc/regression/jbmc/virtual8/E.class similarity index 100% rename from regression/cbmc-java/virtual8/E.class rename to jbmc/regression/jbmc/virtual8/E.class diff --git a/regression/cbmc-java/virtual8/Test.class b/jbmc/regression/jbmc/virtual8/Test.class similarity index 100% rename from regression/cbmc-java/virtual8/Test.class rename to jbmc/regression/jbmc/virtual8/Test.class diff --git a/regression/cbmc-java/virtual8/Test.java b/jbmc/regression/jbmc/virtual8/Test.java similarity index 100% rename from regression/cbmc-java/virtual8/Test.java rename to jbmc/regression/jbmc/virtual8/Test.java diff --git a/regression/cbmc-java/virtual8/test.desc b/jbmc/regression/jbmc/virtual8/test.desc similarity index 100% rename from regression/cbmc-java/virtual8/test.desc rename to jbmc/regression/jbmc/virtual8/test.desc diff --git a/regression/cbmc-java/virtual9/A.class b/jbmc/regression/jbmc/virtual9/A.class similarity index 100% rename from regression/cbmc-java/virtual9/A.class rename to jbmc/regression/jbmc/virtual9/A.class diff --git a/regression/cbmc-java/virtual9/B.class b/jbmc/regression/jbmc/virtual9/B.class similarity index 100% rename from regression/cbmc-java/virtual9/B.class rename to jbmc/regression/jbmc/virtual9/B.class diff --git a/regression/cbmc-java/virtual9/C.class b/jbmc/regression/jbmc/virtual9/C.class similarity index 100% rename from regression/cbmc-java/virtual9/C.class rename to jbmc/regression/jbmc/virtual9/C.class diff --git a/regression/cbmc-java/virtual9/D.class b/jbmc/regression/jbmc/virtual9/D.class similarity index 100% rename from regression/cbmc-java/virtual9/D.class rename to jbmc/regression/jbmc/virtual9/D.class diff --git a/regression/cbmc-java/virtual9/E.class b/jbmc/regression/jbmc/virtual9/E.class similarity index 100% rename from regression/cbmc-java/virtual9/E.class rename to jbmc/regression/jbmc/virtual9/E.class diff --git a/regression/cbmc-java/virtual9/Test.class b/jbmc/regression/jbmc/virtual9/Test.class similarity index 100% rename from regression/cbmc-java/virtual9/Test.class rename to jbmc/regression/jbmc/virtual9/Test.class diff --git a/regression/cbmc-java/virtual9/Test.java b/jbmc/regression/jbmc/virtual9/Test.java similarity index 100% rename from regression/cbmc-java/virtual9/Test.java rename to jbmc/regression/jbmc/virtual9/Test.java diff --git a/regression/cbmc-java/virtual9/test.desc b/jbmc/regression/jbmc/virtual9/test.desc similarity index 100% rename from regression/cbmc-java/virtual9/test.desc rename to jbmc/regression/jbmc/virtual9/test.desc diff --git a/regression/cbmc-java/virtual_function_unwinding/Inner.class b/jbmc/regression/jbmc/virtual_function_unwinding/Inner.class similarity index 100% rename from regression/cbmc-java/virtual_function_unwinding/Inner.class rename to jbmc/regression/jbmc/virtual_function_unwinding/Inner.class diff --git a/regression/cbmc-java/virtual_function_unwinding/Interface.class b/jbmc/regression/jbmc/virtual_function_unwinding/Interface.class similarity index 100% rename from regression/cbmc-java/virtual_function_unwinding/Interface.class rename to jbmc/regression/jbmc/virtual_function_unwinding/Interface.class diff --git a/regression/cbmc-java/virtual_function_unwinding/Outer.class b/jbmc/regression/jbmc/virtual_function_unwinding/Outer.class similarity index 100% rename from regression/cbmc-java/virtual_function_unwinding/Outer.class rename to jbmc/regression/jbmc/virtual_function_unwinding/Outer.class diff --git a/regression/cbmc-java/virtual_function_unwinding/Virtual.class b/jbmc/regression/jbmc/virtual_function_unwinding/Virtual.class similarity index 100% rename from regression/cbmc-java/virtual_function_unwinding/Virtual.class rename to jbmc/regression/jbmc/virtual_function_unwinding/Virtual.class diff --git a/regression/cbmc-java/virtual_function_unwinding/Virtual.java b/jbmc/regression/jbmc/virtual_function_unwinding/Virtual.java similarity index 100% rename from regression/cbmc-java/virtual_function_unwinding/Virtual.java rename to jbmc/regression/jbmc/virtual_function_unwinding/Virtual.java diff --git a/regression/cbmc-java/virtual_function_unwinding/test.desc b/jbmc/regression/jbmc/virtual_function_unwinding/test.desc similarity index 100% rename from regression/cbmc-java/virtual_function_unwinding/test.desc rename to jbmc/regression/jbmc/virtual_function_unwinding/test.desc diff --git a/jbmc/regression/jdiff/CMakeLists.txt b/jbmc/regression/jdiff/CMakeLists.txt new file mode 100644 index 00000000000..e55a44d8003 --- /dev/null +++ b/jbmc/regression/jdiff/CMakeLists.txt @@ -0,0 +1,3 @@ +add_test_pl_tests( + "$" +) diff --git a/jbmc/regression/jdiff/Makefile b/jbmc/regression/jdiff/Makefile new file mode 100644 index 00000000000..5d34e50e46c --- /dev/null +++ b/jbmc/regression/jdiff/Makefile @@ -0,0 +1,20 @@ +default: tests.log + +include ../../src/config.inc + +test: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jdiff/jdiff + +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jdiff/jdiff + +show: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + vim -o "$$dir/*.c" "$$dir/*.out"; \ + fi; \ + done; + +clean: + find -name '*.out' -execdir $(RM) '{}' \; + $(RM) tests.log diff --git a/regression/goto-diff/java-add-package/new.jar b/jbmc/regression/jdiff/java-add-package/new.jar similarity index 100% rename from regression/goto-diff/java-add-package/new.jar rename to jbmc/regression/jdiff/java-add-package/new.jar diff --git a/regression/goto-diff/java-add-package/new/Test.java b/jbmc/regression/jdiff/java-add-package/new/Test.java similarity index 100% rename from regression/goto-diff/java-add-package/new/Test.java rename to jbmc/regression/jdiff/java-add-package/new/Test.java diff --git a/regression/goto-diff/java-add-package/old.jar b/jbmc/regression/jdiff/java-add-package/old.jar similarity index 100% rename from regression/goto-diff/java-add-package/old.jar rename to jbmc/regression/jdiff/java-add-package/old.jar diff --git a/regression/goto-diff/java-add-package/old/Test.java b/jbmc/regression/jdiff/java-add-package/old/Test.java similarity index 100% rename from regression/goto-diff/java-add-package/old/Test.java rename to jbmc/regression/jdiff/java-add-package/old/Test.java diff --git a/regression/goto-diff/java-add-package/test.desc b/jbmc/regression/jdiff/java-add-package/test.desc similarity index 100% rename from regression/goto-diff/java-add-package/test.desc rename to jbmc/regression/jdiff/java-add-package/test.desc diff --git a/regression/goto-diff/java-del-package/new.jar b/jbmc/regression/jdiff/java-del-package/new.jar similarity index 100% rename from regression/goto-diff/java-del-package/new.jar rename to jbmc/regression/jdiff/java-del-package/new.jar diff --git a/regression/goto-diff/java-del-package/new/Test.java b/jbmc/regression/jdiff/java-del-package/new/Test.java similarity index 100% rename from regression/goto-diff/java-del-package/new/Test.java rename to jbmc/regression/jdiff/java-del-package/new/Test.java diff --git a/regression/goto-diff/java-del-package/old.jar b/jbmc/regression/jdiff/java-del-package/old.jar similarity index 100% rename from regression/goto-diff/java-del-package/old.jar rename to jbmc/regression/jdiff/java-del-package/old.jar diff --git a/regression/goto-diff/java-del-package/old/Test.java b/jbmc/regression/jdiff/java-del-package/old/Test.java similarity index 100% rename from regression/goto-diff/java-del-package/old/Test.java rename to jbmc/regression/jdiff/java-del-package/old/Test.java diff --git a/regression/goto-diff/java-del-package/test.desc b/jbmc/regression/jdiff/java-del-package/test.desc similarity index 100% rename from regression/goto-diff/java-del-package/test.desc rename to jbmc/regression/jdiff/java-del-package/test.desc diff --git a/regression/goto-diff/java-deleted-function/new.jar b/jbmc/regression/jdiff/java-deleted-function/new.jar similarity index 100% rename from regression/goto-diff/java-deleted-function/new.jar rename to jbmc/regression/jdiff/java-deleted-function/new.jar diff --git a/regression/goto-diff/java-deleted-function/new/Test.java b/jbmc/regression/jdiff/java-deleted-function/new/Test.java similarity index 100% rename from regression/goto-diff/java-deleted-function/new/Test.java rename to jbmc/regression/jdiff/java-deleted-function/new/Test.java diff --git a/regression/goto-diff/java-deleted-function/old.jar b/jbmc/regression/jdiff/java-deleted-function/old.jar similarity index 100% rename from regression/goto-diff/java-deleted-function/old.jar rename to jbmc/regression/jdiff/java-deleted-function/old.jar diff --git a/regression/goto-diff/java-deleted-function/old/Test.java b/jbmc/regression/jdiff/java-deleted-function/old/Test.java similarity index 100% rename from regression/goto-diff/java-deleted-function/old/Test.java rename to jbmc/regression/jdiff/java-deleted-function/old/Test.java diff --git a/regression/goto-diff/java-deleted-function/test.desc b/jbmc/regression/jdiff/java-deleted-function/test.desc similarity index 100% rename from regression/goto-diff/java-deleted-function/test.desc rename to jbmc/regression/jdiff/java-deleted-function/test.desc diff --git a/regression/goto-diff/java-instanceof/new.jar b/jbmc/regression/jdiff/java-instanceof/new.jar similarity index 100% rename from regression/goto-diff/java-instanceof/new.jar rename to jbmc/regression/jdiff/java-instanceof/new.jar diff --git a/regression/goto-diff/java-instanceof/new/Test.java b/jbmc/regression/jdiff/java-instanceof/new/Test.java similarity index 100% rename from regression/goto-diff/java-instanceof/new/Test.java rename to jbmc/regression/jdiff/java-instanceof/new/Test.java diff --git a/regression/goto-diff/java-instanceof/old.jar b/jbmc/regression/jdiff/java-instanceof/old.jar similarity index 100% rename from regression/goto-diff/java-instanceof/old.jar rename to jbmc/regression/jdiff/java-instanceof/old.jar diff --git a/regression/goto-diff/java-instanceof/old/Test.java b/jbmc/regression/jdiff/java-instanceof/old/Test.java similarity index 100% rename from regression/goto-diff/java-instanceof/old/Test.java rename to jbmc/regression/jdiff/java-instanceof/old/Test.java diff --git a/regression/goto-diff/java-instanceof/test.desc b/jbmc/regression/jdiff/java-instanceof/test.desc similarity index 100% rename from regression/goto-diff/java-instanceof/test.desc rename to jbmc/regression/jdiff/java-instanceof/test.desc diff --git a/regression/goto-diff/java-mod-comment/new.jar b/jbmc/regression/jdiff/java-mod-comment/new.jar similarity index 100% rename from regression/goto-diff/java-mod-comment/new.jar rename to jbmc/regression/jdiff/java-mod-comment/new.jar diff --git a/regression/goto-diff/java-mod-comment/new/Test.java b/jbmc/regression/jdiff/java-mod-comment/new/Test.java similarity index 100% rename from regression/goto-diff/java-mod-comment/new/Test.java rename to jbmc/regression/jdiff/java-mod-comment/new/Test.java diff --git a/regression/goto-diff/java-mod-comment/old.jar b/jbmc/regression/jdiff/java-mod-comment/old.jar similarity index 100% rename from regression/goto-diff/java-mod-comment/old.jar rename to jbmc/regression/jdiff/java-mod-comment/old.jar diff --git a/regression/goto-diff/java-mod-comment/old/Test.java b/jbmc/regression/jdiff/java-mod-comment/old/Test.java similarity index 100% rename from regression/goto-diff/java-mod-comment/old/Test.java rename to jbmc/regression/jdiff/java-mod-comment/old/Test.java diff --git a/regression/goto-diff/java-mod-comment/test.desc b/jbmc/regression/jdiff/java-mod-comment/test.desc similarity index 100% rename from regression/goto-diff/java-mod-comment/test.desc rename to jbmc/regression/jdiff/java-mod-comment/test.desc diff --git a/regression/goto-diff/java-mod-identifier/new.jar b/jbmc/regression/jdiff/java-mod-identifier/new.jar similarity index 100% rename from regression/goto-diff/java-mod-identifier/new.jar rename to jbmc/regression/jdiff/java-mod-identifier/new.jar diff --git a/regression/goto-diff/java-mod-identifier/new/Test.java b/jbmc/regression/jdiff/java-mod-identifier/new/Test.java similarity index 100% rename from regression/goto-diff/java-mod-identifier/new/Test.java rename to jbmc/regression/jdiff/java-mod-identifier/new/Test.java diff --git a/regression/goto-diff/java-mod-identifier/old.jar b/jbmc/regression/jdiff/java-mod-identifier/old.jar similarity index 100% rename from regression/goto-diff/java-mod-identifier/old.jar rename to jbmc/regression/jdiff/java-mod-identifier/old.jar diff --git a/regression/goto-diff/java-mod-identifier/old/Test.java b/jbmc/regression/jdiff/java-mod-identifier/old/Test.java similarity index 100% rename from regression/goto-diff/java-mod-identifier/old/Test.java rename to jbmc/regression/jdiff/java-mod-identifier/old/Test.java diff --git a/regression/goto-diff/java-mod-identifier/test.desc b/jbmc/regression/jdiff/java-mod-identifier/test.desc similarity index 100% rename from regression/goto-diff/java-mod-identifier/test.desc rename to jbmc/regression/jdiff/java-mod-identifier/test.desc diff --git a/regression/goto-diff/java-mod-identifier2/new.jar b/jbmc/regression/jdiff/java-mod-identifier2/new.jar similarity index 100% rename from regression/goto-diff/java-mod-identifier2/new.jar rename to jbmc/regression/jdiff/java-mod-identifier2/new.jar diff --git a/regression/goto-diff/java-mod-identifier2/new/Test.java b/jbmc/regression/jdiff/java-mod-identifier2/new/Test.java similarity index 100% rename from regression/goto-diff/java-mod-identifier2/new/Test.java rename to jbmc/regression/jdiff/java-mod-identifier2/new/Test.java diff --git a/regression/goto-diff/java-mod-identifier2/old.jar b/jbmc/regression/jdiff/java-mod-identifier2/old.jar similarity index 100% rename from regression/goto-diff/java-mod-identifier2/old.jar rename to jbmc/regression/jdiff/java-mod-identifier2/old.jar diff --git a/regression/goto-diff/java-mod-identifier2/old/Test.java b/jbmc/regression/jdiff/java-mod-identifier2/old/Test.java similarity index 100% rename from regression/goto-diff/java-mod-identifier2/old/Test.java rename to jbmc/regression/jdiff/java-mod-identifier2/old/Test.java diff --git a/regression/goto-diff/java-mod-identifier2/test.desc b/jbmc/regression/jdiff/java-mod-identifier2/test.desc similarity index 100% rename from regression/goto-diff/java-mod-identifier2/test.desc rename to jbmc/regression/jdiff/java-mod-identifier2/test.desc diff --git a/regression/goto-diff/java-mod-package/new.jar b/jbmc/regression/jdiff/java-mod-package/new.jar similarity index 100% rename from regression/goto-diff/java-mod-package/new.jar rename to jbmc/regression/jdiff/java-mod-package/new.jar diff --git a/regression/goto-diff/java-mod-package/new/Test.java b/jbmc/regression/jdiff/java-mod-package/new/Test.java similarity index 100% rename from regression/goto-diff/java-mod-package/new/Test.java rename to jbmc/regression/jdiff/java-mod-package/new/Test.java diff --git a/regression/goto-diff/java-mod-package/old.jar b/jbmc/regression/jdiff/java-mod-package/old.jar similarity index 100% rename from regression/goto-diff/java-mod-package/old.jar rename to jbmc/regression/jdiff/java-mod-package/old.jar diff --git a/regression/goto-diff/java-mod-package/old/Test.java b/jbmc/regression/jdiff/java-mod-package/old/Test.java similarity index 100% rename from regression/goto-diff/java-mod-package/old/Test.java rename to jbmc/regression/jdiff/java-mod-package/old/Test.java diff --git a/regression/goto-diff/java-mod-package/test.desc b/jbmc/regression/jdiff/java-mod-package/test.desc similarity index 100% rename from regression/goto-diff/java-mod-package/test.desc rename to jbmc/regression/jdiff/java-mod-package/test.desc diff --git a/regression/goto-diff/java-new-function/new.jar b/jbmc/regression/jdiff/java-new-function/new.jar similarity index 100% rename from regression/goto-diff/java-new-function/new.jar rename to jbmc/regression/jdiff/java-new-function/new.jar diff --git a/regression/goto-diff/java-new-function/new/Test.java b/jbmc/regression/jdiff/java-new-function/new/Test.java similarity index 100% rename from regression/goto-diff/java-new-function/new/Test.java rename to jbmc/regression/jdiff/java-new-function/new/Test.java diff --git a/regression/goto-diff/java-new-function/old.jar b/jbmc/regression/jdiff/java-new-function/old.jar similarity index 100% rename from regression/goto-diff/java-new-function/old.jar rename to jbmc/regression/jdiff/java-new-function/old.jar diff --git a/regression/goto-diff/java-new-function/old/Test.java b/jbmc/regression/jdiff/java-new-function/old/Test.java similarity index 100% rename from regression/goto-diff/java-new-function/old/Test.java rename to jbmc/regression/jdiff/java-new-function/old/Test.java diff --git a/regression/goto-diff/java-new-function/test.desc b/jbmc/regression/jdiff/java-new-function/test.desc similarity index 100% rename from regression/goto-diff/java-new-function/test.desc rename to jbmc/regression/jdiff/java-new-function/test.desc diff --git a/regression/goto-diff/java-no-change/new.jar b/jbmc/regression/jdiff/java-no-change/new.jar similarity index 100% rename from regression/goto-diff/java-no-change/new.jar rename to jbmc/regression/jdiff/java-no-change/new.jar diff --git a/regression/goto-diff/java-no-change/new/Test.java b/jbmc/regression/jdiff/java-no-change/new/Test.java similarity index 100% rename from regression/goto-diff/java-no-change/new/Test.java rename to jbmc/regression/jdiff/java-no-change/new/Test.java diff --git a/regression/goto-diff/java-no-change/old.jar b/jbmc/regression/jdiff/java-no-change/old.jar similarity index 100% rename from regression/goto-diff/java-no-change/old.jar rename to jbmc/regression/jdiff/java-no-change/old.jar diff --git a/regression/goto-diff/java-no-change/old/Test.java b/jbmc/regression/jdiff/java-no-change/old/Test.java similarity index 100% rename from regression/goto-diff/java-no-change/old/Test.java rename to jbmc/regression/jdiff/java-no-change/old/Test.java diff --git a/regression/goto-diff/java-no-change/test.desc b/jbmc/regression/jdiff/java-no-change/test.desc similarity index 100% rename from regression/goto-diff/java-no-change/test.desc rename to jbmc/regression/jdiff/java-no-change/test.desc diff --git a/regression/goto-diff/java-properties/new.jar b/jbmc/regression/jdiff/java-properties/new.jar similarity index 100% rename from regression/goto-diff/java-properties/new.jar rename to jbmc/regression/jdiff/java-properties/new.jar diff --git a/regression/goto-diff/java-properties/new/Test.java b/jbmc/regression/jdiff/java-properties/new/Test.java similarity index 100% rename from regression/goto-diff/java-properties/new/Test.java rename to jbmc/regression/jdiff/java-properties/new/Test.java diff --git a/regression/goto-diff/java-properties/old.jar b/jbmc/regression/jdiff/java-properties/old.jar similarity index 100% rename from regression/goto-diff/java-properties/old.jar rename to jbmc/regression/jdiff/java-properties/old.jar diff --git a/regression/goto-diff/java-properties/old/Test.java b/jbmc/regression/jdiff/java-properties/old/Test.java similarity index 100% rename from regression/goto-diff/java-properties/old/Test.java rename to jbmc/regression/jdiff/java-properties/old/Test.java diff --git a/regression/goto-diff/java-properties/test.desc b/jbmc/regression/jdiff/java-properties/test.desc similarity index 100% rename from regression/goto-diff/java-properties/test.desc rename to jbmc/regression/jdiff/java-properties/test.desc diff --git a/regression/goto-diff/java-scope-change/new.jar b/jbmc/regression/jdiff/java-scope-change/new.jar similarity index 100% rename from regression/goto-diff/java-scope-change/new.jar rename to jbmc/regression/jdiff/java-scope-change/new.jar diff --git a/regression/goto-diff/java-scope-change/new/Test.java b/jbmc/regression/jdiff/java-scope-change/new/Test.java similarity index 100% rename from regression/goto-diff/java-scope-change/new/Test.java rename to jbmc/regression/jdiff/java-scope-change/new/Test.java diff --git a/regression/goto-diff/java-scope-change/old.jar b/jbmc/regression/jdiff/java-scope-change/old.jar similarity index 100% rename from regression/goto-diff/java-scope-change/old.jar rename to jbmc/regression/jdiff/java-scope-change/old.jar diff --git a/regression/goto-diff/java-scope-change/old/Test.java b/jbmc/regression/jdiff/java-scope-change/old/Test.java similarity index 100% rename from regression/goto-diff/java-scope-change/old/Test.java rename to jbmc/regression/jdiff/java-scope-change/old/Test.java diff --git a/regression/goto-diff/java-scope-change/test.desc b/jbmc/regression/jdiff/java-scope-change/test.desc similarity index 100% rename from regression/goto-diff/java-scope-change/test.desc rename to jbmc/regression/jdiff/java-scope-change/test.desc diff --git a/regression/goto-diff/java-scope-change2/new.jar b/jbmc/regression/jdiff/java-scope-change2/new.jar similarity index 100% rename from regression/goto-diff/java-scope-change2/new.jar rename to jbmc/regression/jdiff/java-scope-change2/new.jar diff --git a/regression/goto-diff/java-scope-change2/new/Test.java b/jbmc/regression/jdiff/java-scope-change2/new/Test.java similarity index 100% rename from regression/goto-diff/java-scope-change2/new/Test.java rename to jbmc/regression/jdiff/java-scope-change2/new/Test.java diff --git a/regression/goto-diff/java-scope-change2/old.jar b/jbmc/regression/jdiff/java-scope-change2/old.jar similarity index 100% rename from regression/goto-diff/java-scope-change2/old.jar rename to jbmc/regression/jdiff/java-scope-change2/old.jar diff --git a/regression/goto-diff/java-scope-change2/old/Test.java b/jbmc/regression/jdiff/java-scope-change2/old/Test.java similarity index 100% rename from regression/goto-diff/java-scope-change2/old/Test.java rename to jbmc/regression/jdiff/java-scope-change2/old/Test.java diff --git a/regression/goto-diff/java-scope-change2/test.desc b/jbmc/regression/jdiff/java-scope-change2/test.desc similarity index 100% rename from regression/goto-diff/java-scope-change2/test.desc rename to jbmc/regression/jdiff/java-scope-change2/test.desc diff --git a/regression/goto-diff/java-scope-change3/new.jar b/jbmc/regression/jdiff/java-scope-change3/new.jar similarity index 100% rename from regression/goto-diff/java-scope-change3/new.jar rename to jbmc/regression/jdiff/java-scope-change3/new.jar diff --git a/regression/goto-diff/java-scope-change3/new/Test.java b/jbmc/regression/jdiff/java-scope-change3/new/Test.java similarity index 100% rename from regression/goto-diff/java-scope-change3/new/Test.java rename to jbmc/regression/jdiff/java-scope-change3/new/Test.java diff --git a/regression/goto-diff/java-scope-change3/old.jar b/jbmc/regression/jdiff/java-scope-change3/old.jar similarity index 100% rename from regression/goto-diff/java-scope-change3/old.jar rename to jbmc/regression/jdiff/java-scope-change3/old.jar diff --git a/regression/goto-diff/java-scope-change3/old/Test.java b/jbmc/regression/jdiff/java-scope-change3/old/Test.java similarity index 100% rename from regression/goto-diff/java-scope-change3/old/Test.java rename to jbmc/regression/jdiff/java-scope-change3/old/Test.java diff --git a/regression/goto-diff/java-scope-change3/test.desc b/jbmc/regression/jdiff/java-scope-change3/test.desc similarity index 100% rename from regression/goto-diff/java-scope-change3/test.desc rename to jbmc/regression/jdiff/java-scope-change3/test.desc diff --git a/regression/goto-diff/java-tmp-vars-array/new.jar b/jbmc/regression/jdiff/java-tmp-vars-array/new.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-array/new.jar rename to jbmc/regression/jdiff/java-tmp-vars-array/new.jar diff --git a/regression/goto-diff/java-tmp-vars-array/new/Test.java b/jbmc/regression/jdiff/java-tmp-vars-array/new/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-array/new/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-array/new/Test.java diff --git a/regression/goto-diff/java-tmp-vars-array/old.jar b/jbmc/regression/jdiff/java-tmp-vars-array/old.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-array/old.jar rename to jbmc/regression/jdiff/java-tmp-vars-array/old.jar diff --git a/regression/goto-diff/java-tmp-vars-array/old/Test.java b/jbmc/regression/jdiff/java-tmp-vars-array/old/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-array/old/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-array/old/Test.java diff --git a/regression/goto-diff/java-tmp-vars-array/test.desc b/jbmc/regression/jdiff/java-tmp-vars-array/test.desc similarity index 100% rename from regression/goto-diff/java-tmp-vars-array/test.desc rename to jbmc/regression/jdiff/java-tmp-vars-array/test.desc diff --git a/regression/goto-diff/java-tmp-vars-inc/new.jar b/jbmc/regression/jdiff/java-tmp-vars-inc/new.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-inc/new.jar rename to jbmc/regression/jdiff/java-tmp-vars-inc/new.jar diff --git a/regression/goto-diff/java-tmp-vars-inc/new/Test.java b/jbmc/regression/jdiff/java-tmp-vars-inc/new/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-inc/new/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-inc/new/Test.java diff --git a/regression/goto-diff/java-tmp-vars-inc/old.jar b/jbmc/regression/jdiff/java-tmp-vars-inc/old.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-inc/old.jar rename to jbmc/regression/jdiff/java-tmp-vars-inc/old.jar diff --git a/regression/goto-diff/java-tmp-vars-inc/old/Test.java b/jbmc/regression/jdiff/java-tmp-vars-inc/old/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-inc/old/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-inc/old/Test.java diff --git a/regression/goto-diff/java-tmp-vars-inc/test.desc b/jbmc/regression/jdiff/java-tmp-vars-inc/test.desc similarity index 100% rename from regression/goto-diff/java-tmp-vars-inc/test.desc rename to jbmc/regression/jdiff/java-tmp-vars-inc/test.desc diff --git a/regression/goto-diff/java-tmp-vars-new/new.jar b/jbmc/regression/jdiff/java-tmp-vars-new/new.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-new/new.jar rename to jbmc/regression/jdiff/java-tmp-vars-new/new.jar diff --git a/regression/goto-diff/java-tmp-vars-new/new/Test.java b/jbmc/regression/jdiff/java-tmp-vars-new/new/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-new/new/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-new/new/Test.java diff --git a/regression/goto-diff/java-tmp-vars-new/old.jar b/jbmc/regression/jdiff/java-tmp-vars-new/old.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-new/old.jar rename to jbmc/regression/jdiff/java-tmp-vars-new/old.jar diff --git a/regression/goto-diff/java-tmp-vars-new/old/Test.java b/jbmc/regression/jdiff/java-tmp-vars-new/old/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-new/old/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-new/old/Test.java diff --git a/regression/goto-diff/java-tmp-vars-new/test.desc b/jbmc/regression/jdiff/java-tmp-vars-new/test.desc similarity index 100% rename from regression/goto-diff/java-tmp-vars-new/test.desc rename to jbmc/regression/jdiff/java-tmp-vars-new/test.desc diff --git a/regression/goto-diff/java-tmp-vars-string/new.jar b/jbmc/regression/jdiff/java-tmp-vars-string/new.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-string/new.jar rename to jbmc/regression/jdiff/java-tmp-vars-string/new.jar diff --git a/regression/goto-diff/java-tmp-vars-string/new/Test.java b/jbmc/regression/jdiff/java-tmp-vars-string/new/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-string/new/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-string/new/Test.java diff --git a/regression/goto-diff/java-tmp-vars-string/old.jar b/jbmc/regression/jdiff/java-tmp-vars-string/old.jar similarity index 100% rename from regression/goto-diff/java-tmp-vars-string/old.jar rename to jbmc/regression/jdiff/java-tmp-vars-string/old.jar diff --git a/regression/goto-diff/java-tmp-vars-string/old/Test.java b/jbmc/regression/jdiff/java-tmp-vars-string/old/Test.java similarity index 100% rename from regression/goto-diff/java-tmp-vars-string/old/Test.java rename to jbmc/regression/jdiff/java-tmp-vars-string/old/Test.java diff --git a/regression/goto-diff/java-tmp-vars-string/test.desc b/jbmc/regression/jdiff/java-tmp-vars-string/test.desc similarity index 100% rename from regression/goto-diff/java-tmp-vars-string/test.desc rename to jbmc/regression/jdiff/java-tmp-vars-string/test.desc diff --git a/regression/goto-diff/java-virtual-methods/new.jar b/jbmc/regression/jdiff/java-virtual-methods/new.jar similarity index 100% rename from regression/goto-diff/java-virtual-methods/new.jar rename to jbmc/regression/jdiff/java-virtual-methods/new.jar diff --git a/regression/goto-diff/java-virtual-methods/new/Test.java b/jbmc/regression/jdiff/java-virtual-methods/new/Test.java similarity index 100% rename from regression/goto-diff/java-virtual-methods/new/Test.java rename to jbmc/regression/jdiff/java-virtual-methods/new/Test.java diff --git a/regression/goto-diff/java-virtual-methods/old.jar b/jbmc/regression/jdiff/java-virtual-methods/old.jar similarity index 100% rename from regression/goto-diff/java-virtual-methods/old.jar rename to jbmc/regression/jdiff/java-virtual-methods/old.jar diff --git a/regression/goto-diff/java-virtual-methods/old/Test.java b/jbmc/regression/jdiff/java-virtual-methods/old/Test.java similarity index 100% rename from regression/goto-diff/java-virtual-methods/old/Test.java rename to jbmc/regression/jdiff/java-virtual-methods/old/Test.java diff --git a/regression/goto-diff/java-virtual-methods/test.desc b/jbmc/regression/jdiff/java-virtual-methods/test.desc similarity index 100% rename from regression/goto-diff/java-virtual-methods/test.desc rename to jbmc/regression/jdiff/java-virtual-methods/test.desc diff --git a/regression/goto-diff/syntactic-diff-java1/new.jar b/jbmc/regression/jdiff/syntactic-diff-java1/new.jar similarity index 100% rename from regression/goto-diff/syntactic-diff-java1/new.jar rename to jbmc/regression/jdiff/syntactic-diff-java1/new.jar diff --git a/regression/goto-diff/syntactic-diff-java1/new/Test.java b/jbmc/regression/jdiff/syntactic-diff-java1/new/Test.java similarity index 100% rename from regression/goto-diff/syntactic-diff-java1/new/Test.java rename to jbmc/regression/jdiff/syntactic-diff-java1/new/Test.java diff --git a/regression/goto-diff/syntactic-diff-java1/old.jar b/jbmc/regression/jdiff/syntactic-diff-java1/old.jar similarity index 100% rename from regression/goto-diff/syntactic-diff-java1/old.jar rename to jbmc/regression/jdiff/syntactic-diff-java1/old.jar diff --git a/regression/goto-diff/syntactic-diff-java1/old/Test.java b/jbmc/regression/jdiff/syntactic-diff-java1/old/Test.java similarity index 100% rename from regression/goto-diff/syntactic-diff-java1/old/Test.java rename to jbmc/regression/jdiff/syntactic-diff-java1/old/Test.java diff --git a/regression/goto-diff/syntactic-diff-java1/test.desc b/jbmc/regression/jdiff/syntactic-diff-java1/test.desc similarity index 100% rename from regression/goto-diff/syntactic-diff-java1/test.desc rename to jbmc/regression/jdiff/syntactic-diff-java1/test.desc diff --git a/regression/strings-smoke-tests/CMakeLists.txt b/jbmc/regression/strings-smoke-tests/CMakeLists.txt similarity index 100% rename from regression/strings-smoke-tests/CMakeLists.txt rename to jbmc/regression/strings-smoke-tests/CMakeLists.txt diff --git a/jbmc/regression/strings-smoke-tests/Makefile b/jbmc/regression/strings-smoke-tests/Makefile new file mode 100644 index 00000000000..9c4a5076c4f --- /dev/null +++ b/jbmc/regression/strings-smoke-tests/Makefile @@ -0,0 +1,32 @@ +default: tests.log + +include ../../src/config.inc + +test: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + +testfuture: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -CF + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CF + +testall: + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc -CFTK + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CFTK + +tests.log: ../$(CPROVER_DIR)/regression/test.pl + @../$(CPROVER_DIR)/regression/test.pl -p -c ../../../src/jbmc/jbmc + @../$(CPROVER_DIR)/regression/test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure + +show: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + vim -o "$$dir/*.c" "$$dir/*.out"; \ + fi; \ + done; + +clean: + find -name '*.out' -execdir $(RM) '{}' \; + find -name '*.gb' -execdir $(RM) '{}' \; + $(RM) tests.log + diff --git a/regression/strings-smoke-tests/cprover/CProverString.class b/jbmc/regression/strings-smoke-tests/cprover/CProverString.class similarity index 100% rename from regression/strings-smoke-tests/cprover/CProverString.class rename to jbmc/regression/strings-smoke-tests/cprover/CProverString.class diff --git a/regression/strings-smoke-tests/cprover/CProverString.java b/jbmc/regression/strings-smoke-tests/cprover/CProverString.java similarity index 100% rename from regression/strings-smoke-tests/cprover/CProverString.java rename to jbmc/regression/strings-smoke-tests/cprover/CProverString.java diff --git a/regression/strings-smoke-tests/java_append_char/test.desc b/jbmc/regression/strings-smoke-tests/java_append_char/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_append_char/test.desc rename to jbmc/regression/strings-smoke-tests/java_append_char/test.desc diff --git a/regression/strings-smoke-tests/java_append_char/test_append_char.class b/jbmc/regression/strings-smoke-tests/java_append_char/test_append_char.class similarity index 100% rename from regression/strings-smoke-tests/java_append_char/test_append_char.class rename to jbmc/regression/strings-smoke-tests/java_append_char/test_append_char.class diff --git a/regression/strings-smoke-tests/java_append_char/test_append_char.java b/jbmc/regression/strings-smoke-tests/java_append_char/test_append_char.java similarity index 100% rename from regression/strings-smoke-tests/java_append_char/test_append_char.java rename to jbmc/regression/strings-smoke-tests/java_append_char/test_append_char.java diff --git a/regression/strings-smoke-tests/java_append_int/test.desc b/jbmc/regression/strings-smoke-tests/java_append_int/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_append_int/test.desc rename to jbmc/regression/strings-smoke-tests/java_append_int/test.desc diff --git a/regression/strings-smoke-tests/java_append_int/test_append_int.class b/jbmc/regression/strings-smoke-tests/java_append_int/test_append_int.class similarity index 100% rename from regression/strings-smoke-tests/java_append_int/test_append_int.class rename to jbmc/regression/strings-smoke-tests/java_append_int/test_append_int.class diff --git a/regression/strings-smoke-tests/java_append_int/test_append_int.java b/jbmc/regression/strings-smoke-tests/java_append_int/test_append_int.java similarity index 100% rename from regression/strings-smoke-tests/java_append_int/test_append_int.java rename to jbmc/regression/strings-smoke-tests/java_append_int/test_append_int.java diff --git a/regression/strings-smoke-tests/java_append_object/test.desc b/jbmc/regression/strings-smoke-tests/java_append_object/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_append_object/test.desc rename to jbmc/regression/strings-smoke-tests/java_append_object/test.desc diff --git a/regression/strings-smoke-tests/java_append_object/test_append_object.class b/jbmc/regression/strings-smoke-tests/java_append_object/test_append_object.class similarity index 100% rename from regression/strings-smoke-tests/java_append_object/test_append_object.class rename to jbmc/regression/strings-smoke-tests/java_append_object/test_append_object.class diff --git a/regression/strings-smoke-tests/java_append_object/test_append_object.java b/jbmc/regression/strings-smoke-tests/java_append_object/test_append_object.java similarity index 100% rename from regression/strings-smoke-tests/java_append_object/test_append_object.java rename to jbmc/regression/strings-smoke-tests/java_append_object/test_append_object.java diff --git a/regression/strings-smoke-tests/java_append_string/test.desc b/jbmc/regression/strings-smoke-tests/java_append_string/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_append_string/test.desc rename to jbmc/regression/strings-smoke-tests/java_append_string/test.desc diff --git a/regression/strings-smoke-tests/java_append_string/test_append_string.class b/jbmc/regression/strings-smoke-tests/java_append_string/test_append_string.class similarity index 100% rename from regression/strings-smoke-tests/java_append_string/test_append_string.class rename to jbmc/regression/strings-smoke-tests/java_append_string/test_append_string.class diff --git a/regression/strings-smoke-tests/java_append_string/test_append_string.java b/jbmc/regression/strings-smoke-tests/java_append_string/test_append_string.java similarity index 100% rename from regression/strings-smoke-tests/java_append_string/test_append_string.java rename to jbmc/regression/strings-smoke-tests/java_append_string/test_append_string.java diff --git a/regression/strings-smoke-tests/java_append_string/test_substring.desc b/jbmc/regression/strings-smoke-tests/java_append_string/test_substring.desc similarity index 100% rename from regression/strings-smoke-tests/java_append_string/test_substring.desc rename to jbmc/regression/strings-smoke-tests/java_append_string/test_substring.desc diff --git a/regression/strings-smoke-tests/java_case/test.desc b/jbmc/regression/strings-smoke-tests/java_case/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_case/test.desc rename to jbmc/regression/strings-smoke-tests/java_case/test.desc diff --git a/regression/strings-smoke-tests/java_case/test_case.class b/jbmc/regression/strings-smoke-tests/java_case/test_case.class similarity index 100% rename from regression/strings-smoke-tests/java_case/test_case.class rename to jbmc/regression/strings-smoke-tests/java_case/test_case.class diff --git a/regression/strings-smoke-tests/java_case/test_case.java b/jbmc/regression/strings-smoke-tests/java_case/test_case.java similarity index 100% rename from regression/strings-smoke-tests/java_case/test_case.java rename to jbmc/regression/strings-smoke-tests/java_case/test_case.java diff --git a/regression/strings-smoke-tests/java_char_array/test.desc b/jbmc/regression/strings-smoke-tests/java_char_array/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_char_array/test.desc rename to jbmc/regression/strings-smoke-tests/java_char_array/test.desc diff --git a/regression/strings-smoke-tests/java_char_array/test_char_array.class b/jbmc/regression/strings-smoke-tests/java_char_array/test_char_array.class similarity index 100% rename from regression/strings-smoke-tests/java_char_array/test_char_array.class rename to jbmc/regression/strings-smoke-tests/java_char_array/test_char_array.class diff --git a/regression/strings-smoke-tests/java_char_array/test_char_array.java b/jbmc/regression/strings-smoke-tests/java_char_array/test_char_array.java similarity index 100% rename from regression/strings-smoke-tests/java_char_array/test_char_array.java rename to jbmc/regression/strings-smoke-tests/java_char_array/test_char_array.java diff --git a/regression/strings-smoke-tests/java_char_array_init/test.desc b/jbmc/regression/strings-smoke-tests/java_char_array_init/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_char_array_init/test.desc rename to jbmc/regression/strings-smoke-tests/java_char_array_init/test.desc diff --git a/regression/strings-smoke-tests/java_char_array_init/test_init.class b/jbmc/regression/strings-smoke-tests/java_char_array_init/test_init.class similarity index 100% rename from regression/strings-smoke-tests/java_char_array_init/test_init.class rename to jbmc/regression/strings-smoke-tests/java_char_array_init/test_init.class diff --git a/regression/strings-smoke-tests/java_char_array_init/test_init.java b/jbmc/regression/strings-smoke-tests/java_char_array_init/test_init.java similarity index 100% rename from regression/strings-smoke-tests/java_char_array_init/test_init.java rename to jbmc/regression/strings-smoke-tests/java_char_array_init/test_init.java diff --git a/regression/strings-smoke-tests/java_char_at/test.desc b/jbmc/regression/strings-smoke-tests/java_char_at/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_char_at/test.desc rename to jbmc/regression/strings-smoke-tests/java_char_at/test.desc diff --git a/regression/strings-smoke-tests/java_char_at/test_char_at.class b/jbmc/regression/strings-smoke-tests/java_char_at/test_char_at.class similarity index 100% rename from regression/strings-smoke-tests/java_char_at/test_char_at.class rename to jbmc/regression/strings-smoke-tests/java_char_at/test_char_at.class diff --git a/regression/strings-smoke-tests/java_char_at/test_char_at.java b/jbmc/regression/strings-smoke-tests/java_char_at/test_char_at.java similarity index 100% rename from regression/strings-smoke-tests/java_char_at/test_char_at.java rename to jbmc/regression/strings-smoke-tests/java_char_at/test_char_at.java diff --git a/regression/strings-smoke-tests/java_code_point/test.desc b/jbmc/regression/strings-smoke-tests/java_code_point/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_code_point/test.desc rename to jbmc/regression/strings-smoke-tests/java_code_point/test.desc diff --git a/regression/strings-smoke-tests/java_code_point/test_code_point.class b/jbmc/regression/strings-smoke-tests/java_code_point/test_code_point.class similarity index 100% rename from regression/strings-smoke-tests/java_code_point/test_code_point.class rename to jbmc/regression/strings-smoke-tests/java_code_point/test_code_point.class diff --git a/regression/strings-smoke-tests/java_code_point/test_code_point.java b/jbmc/regression/strings-smoke-tests/java_code_point/test_code_point.java similarity index 100% rename from regression/strings-smoke-tests/java_code_point/test_code_point.java rename to jbmc/regression/strings-smoke-tests/java_code_point/test_code_point.java diff --git a/regression/strings-smoke-tests/java_compare/test.desc b/jbmc/regression/strings-smoke-tests/java_compare/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_compare/test.desc rename to jbmc/regression/strings-smoke-tests/java_compare/test.desc diff --git a/regression/strings-smoke-tests/java_compare/test_compare.class b/jbmc/regression/strings-smoke-tests/java_compare/test_compare.class similarity index 100% rename from regression/strings-smoke-tests/java_compare/test_compare.class rename to jbmc/regression/strings-smoke-tests/java_compare/test_compare.class diff --git a/regression/strings-smoke-tests/java_compare/test_compare.java b/jbmc/regression/strings-smoke-tests/java_compare/test_compare.java similarity index 100% rename from regression/strings-smoke-tests/java_compare/test_compare.java rename to jbmc/regression/strings-smoke-tests/java_compare/test_compare.java diff --git a/regression/strings-smoke-tests/java_concat/test.desc b/jbmc/regression/strings-smoke-tests/java_concat/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_concat/test.desc rename to jbmc/regression/strings-smoke-tests/java_concat/test.desc diff --git a/regression/strings-smoke-tests/java_concat/test_concat.class b/jbmc/regression/strings-smoke-tests/java_concat/test_concat.class similarity index 100% rename from regression/strings-smoke-tests/java_concat/test_concat.class rename to jbmc/regression/strings-smoke-tests/java_concat/test_concat.class diff --git a/regression/strings-smoke-tests/java_concat/test_concat.java b/jbmc/regression/strings-smoke-tests/java_concat/test_concat.java similarity index 100% rename from regression/strings-smoke-tests/java_concat/test_concat.java rename to jbmc/regression/strings-smoke-tests/java_concat/test_concat.java diff --git a/regression/strings-smoke-tests/java_contains/test.desc b/jbmc/regression/strings-smoke-tests/java_contains/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_contains/test.desc rename to jbmc/regression/strings-smoke-tests/java_contains/test.desc diff --git a/regression/strings-smoke-tests/java_contains/test_contains.class b/jbmc/regression/strings-smoke-tests/java_contains/test_contains.class similarity index 100% rename from regression/strings-smoke-tests/java_contains/test_contains.class rename to jbmc/regression/strings-smoke-tests/java_contains/test_contains.class diff --git a/regression/strings-smoke-tests/java_contains/test_contains.java b/jbmc/regression/strings-smoke-tests/java_contains/test_contains.java similarity index 100% rename from regression/strings-smoke-tests/java_contains/test_contains.java rename to jbmc/regression/strings-smoke-tests/java_contains/test_contains.java diff --git a/regression/strings-smoke-tests/java_contains/test_string_printable.desc b/jbmc/regression/strings-smoke-tests/java_contains/test_string_printable.desc similarity index 100% rename from regression/strings-smoke-tests/java_contains/test_string_printable.desc rename to jbmc/regression/strings-smoke-tests/java_contains/test_string_printable.desc diff --git a/regression/strings-smoke-tests/java_delete/test.desc b/jbmc/regression/strings-smoke-tests/java_delete/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_delete/test.desc rename to jbmc/regression/strings-smoke-tests/java_delete/test.desc diff --git a/regression/strings-smoke-tests/java_delete/test_delete.class b/jbmc/regression/strings-smoke-tests/java_delete/test_delete.class similarity index 100% rename from regression/strings-smoke-tests/java_delete/test_delete.class rename to jbmc/regression/strings-smoke-tests/java_delete/test_delete.class diff --git a/regression/strings-smoke-tests/java_delete/test_delete.java b/jbmc/regression/strings-smoke-tests/java_delete/test_delete.java similarity index 100% rename from regression/strings-smoke-tests/java_delete/test_delete.java rename to jbmc/regression/strings-smoke-tests/java_delete/test_delete.java diff --git a/regression/strings-smoke-tests/java_delete_char_at/test.desc b/jbmc/regression/strings-smoke-tests/java_delete_char_at/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_delete_char_at/test.desc rename to jbmc/regression/strings-smoke-tests/java_delete_char_at/test.desc diff --git a/regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.class b/jbmc/regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.class similarity index 100% rename from regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.class rename to jbmc/regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.class diff --git a/regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.java b/jbmc/regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.java similarity index 100% rename from regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.java rename to jbmc/regression/strings-smoke-tests/java_delete_char_at/test_delete_char_at.java diff --git a/regression/strings-smoke-tests/java_empty/test.desc b/jbmc/regression/strings-smoke-tests/java_empty/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_empty/test.desc rename to jbmc/regression/strings-smoke-tests/java_empty/test.desc diff --git a/regression/strings-smoke-tests/java_empty/test_empty.class b/jbmc/regression/strings-smoke-tests/java_empty/test_empty.class similarity index 100% rename from regression/strings-smoke-tests/java_empty/test_empty.class rename to jbmc/regression/strings-smoke-tests/java_empty/test_empty.class diff --git a/regression/strings-smoke-tests/java_empty/test_empty.java b/jbmc/regression/strings-smoke-tests/java_empty/test_empty.java similarity index 100% rename from regression/strings-smoke-tests/java_empty/test_empty.java rename to jbmc/regression/strings-smoke-tests/java_empty/test_empty.java diff --git a/regression/strings-smoke-tests/java_endswith/test.desc b/jbmc/regression/strings-smoke-tests/java_endswith/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_endswith/test.desc rename to jbmc/regression/strings-smoke-tests/java_endswith/test.desc diff --git a/regression/strings-smoke-tests/java_endswith/test_endswith.class b/jbmc/regression/strings-smoke-tests/java_endswith/test_endswith.class similarity index 100% rename from regression/strings-smoke-tests/java_endswith/test_endswith.class rename to jbmc/regression/strings-smoke-tests/java_endswith/test_endswith.class diff --git a/regression/strings-smoke-tests/java_endswith/test_endswith.java b/jbmc/regression/strings-smoke-tests/java_endswith/test_endswith.java similarity index 100% rename from regression/strings-smoke-tests/java_endswith/test_endswith.java rename to jbmc/regression/strings-smoke-tests/java_endswith/test_endswith.java diff --git a/regression/strings-smoke-tests/java_equal/test.desc b/jbmc/regression/strings-smoke-tests/java_equal/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_equal/test.desc rename to jbmc/regression/strings-smoke-tests/java_equal/test.desc diff --git a/regression/strings-smoke-tests/java_equal/test_2.desc b/jbmc/regression/strings-smoke-tests/java_equal/test_2.desc similarity index 100% rename from regression/strings-smoke-tests/java_equal/test_2.desc rename to jbmc/regression/strings-smoke-tests/java_equal/test_2.desc diff --git a/regression/strings-smoke-tests/java_equal/test_equal.class b/jbmc/regression/strings-smoke-tests/java_equal/test_equal.class similarity index 100% rename from regression/strings-smoke-tests/java_equal/test_equal.class rename to jbmc/regression/strings-smoke-tests/java_equal/test_equal.class diff --git a/regression/strings-smoke-tests/java_equal/test_equal.java b/jbmc/regression/strings-smoke-tests/java_equal/test_equal.java similarity index 100% rename from regression/strings-smoke-tests/java_equal/test_equal.java rename to jbmc/regression/strings-smoke-tests/java_equal/test_equal.java diff --git a/regression/strings-smoke-tests/java_equal/test_equal_2.java b/jbmc/regression/strings-smoke-tests/java_equal/test_equal_2.java similarity index 100% rename from regression/strings-smoke-tests/java_equal/test_equal_2.java rename to jbmc/regression/strings-smoke-tests/java_equal/test_equal_2.java diff --git a/regression/strings-smoke-tests/java_float/test.desc b/jbmc/regression/strings-smoke-tests/java_float/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_float/test.desc rename to jbmc/regression/strings-smoke-tests/java_float/test.desc diff --git a/regression/strings-smoke-tests/java_float/test_float.class b/jbmc/regression/strings-smoke-tests/java_float/test_float.class similarity index 100% rename from regression/strings-smoke-tests/java_float/test_float.class rename to jbmc/regression/strings-smoke-tests/java_float/test_float.class diff --git a/regression/strings-smoke-tests/java_float/test_float.java b/jbmc/regression/strings-smoke-tests/java_float/test_float.java similarity index 100% rename from regression/strings-smoke-tests/java_float/test_float.java rename to jbmc/regression/strings-smoke-tests/java_float/test_float.java diff --git a/regression/strings-smoke-tests/java_format/test.class b/jbmc/regression/strings-smoke-tests/java_format/test.class similarity index 100% rename from regression/strings-smoke-tests/java_format/test.class rename to jbmc/regression/strings-smoke-tests/java_format/test.class diff --git a/regression/strings-smoke-tests/java_format/test.desc b/jbmc/regression/strings-smoke-tests/java_format/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_format/test.desc rename to jbmc/regression/strings-smoke-tests/java_format/test.desc diff --git a/regression/strings-smoke-tests/java_format/test.java b/jbmc/regression/strings-smoke-tests/java_format/test.java similarity index 100% rename from regression/strings-smoke-tests/java_format/test.java rename to jbmc/regression/strings-smoke-tests/java_format/test.java diff --git a/regression/strings-smoke-tests/java_format2/test.class b/jbmc/regression/strings-smoke-tests/java_format2/test.class similarity index 100% rename from regression/strings-smoke-tests/java_format2/test.class rename to jbmc/regression/strings-smoke-tests/java_format2/test.class diff --git a/regression/strings-smoke-tests/java_format2/test.desc b/jbmc/regression/strings-smoke-tests/java_format2/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_format2/test.desc rename to jbmc/regression/strings-smoke-tests/java_format2/test.desc diff --git a/regression/strings-smoke-tests/java_format2/test.java b/jbmc/regression/strings-smoke-tests/java_format2/test.java similarity index 100% rename from regression/strings-smoke-tests/java_format2/test.java rename to jbmc/regression/strings-smoke-tests/java_format2/test.java diff --git a/regression/strings-smoke-tests/java_format3/test.class b/jbmc/regression/strings-smoke-tests/java_format3/test.class similarity index 100% rename from regression/strings-smoke-tests/java_format3/test.class rename to jbmc/regression/strings-smoke-tests/java_format3/test.class diff --git a/regression/strings-smoke-tests/java_format3/test.desc b/jbmc/regression/strings-smoke-tests/java_format3/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_format3/test.desc rename to jbmc/regression/strings-smoke-tests/java_format3/test.desc diff --git a/regression/strings-smoke-tests/java_format3/test.java b/jbmc/regression/strings-smoke-tests/java_format3/test.java similarity index 100% rename from regression/strings-smoke-tests/java_format3/test.java rename to jbmc/regression/strings-smoke-tests/java_format3/test.java diff --git a/regression/strings-smoke-tests/java_format4/test.class b/jbmc/regression/strings-smoke-tests/java_format4/test.class similarity index 100% rename from regression/strings-smoke-tests/java_format4/test.class rename to jbmc/regression/strings-smoke-tests/java_format4/test.class diff --git a/regression/strings-smoke-tests/java_format4/test.desc b/jbmc/regression/strings-smoke-tests/java_format4/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_format4/test.desc rename to jbmc/regression/strings-smoke-tests/java_format4/test.desc diff --git a/regression/strings-smoke-tests/java_format4/test.java b/jbmc/regression/strings-smoke-tests/java_format4/test.java similarity index 100% rename from regression/strings-smoke-tests/java_format4/test.java rename to jbmc/regression/strings-smoke-tests/java_format4/test.java diff --git a/regression/strings-smoke-tests/java_format5/test.class b/jbmc/regression/strings-smoke-tests/java_format5/test.class similarity index 100% rename from regression/strings-smoke-tests/java_format5/test.class rename to jbmc/regression/strings-smoke-tests/java_format5/test.class diff --git a/regression/strings-smoke-tests/java_format5/test.desc b/jbmc/regression/strings-smoke-tests/java_format5/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_format5/test.desc rename to jbmc/regression/strings-smoke-tests/java_format5/test.desc diff --git a/regression/strings-smoke-tests/java_format5/test.java b/jbmc/regression/strings-smoke-tests/java_format5/test.java similarity index 100% rename from regression/strings-smoke-tests/java_format5/test.java rename to jbmc/regression/strings-smoke-tests/java_format5/test.java diff --git a/regression/strings-smoke-tests/java_hash_code/test.desc b/jbmc/regression/strings-smoke-tests/java_hash_code/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_hash_code/test.desc rename to jbmc/regression/strings-smoke-tests/java_hash_code/test.desc diff --git a/regression/strings-smoke-tests/java_hash_code/test_hash_code.class b/jbmc/regression/strings-smoke-tests/java_hash_code/test_hash_code.class similarity index 100% rename from regression/strings-smoke-tests/java_hash_code/test_hash_code.class rename to jbmc/regression/strings-smoke-tests/java_hash_code/test_hash_code.class diff --git a/regression/strings-smoke-tests/java_hash_code/test_hash_code.java b/jbmc/regression/strings-smoke-tests/java_hash_code/test_hash_code.java similarity index 100% rename from regression/strings-smoke-tests/java_hash_code/test_hash_code.java rename to jbmc/regression/strings-smoke-tests/java_hash_code/test_hash_code.java diff --git a/regression/strings-smoke-tests/java_if/test.class b/jbmc/regression/strings-smoke-tests/java_if/test.class similarity index 100% rename from regression/strings-smoke-tests/java_if/test.class rename to jbmc/regression/strings-smoke-tests/java_if/test.class diff --git a/regression/strings-smoke-tests/java_if/test.desc b/jbmc/regression/strings-smoke-tests/java_if/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_if/test.desc rename to jbmc/regression/strings-smoke-tests/java_if/test.desc diff --git a/regression/strings-smoke-tests/java_if/test.java b/jbmc/regression/strings-smoke-tests/java_if/test.java similarity index 100% rename from regression/strings-smoke-tests/java_if/test.java rename to jbmc/regression/strings-smoke-tests/java_if/test.java diff --git a/regression/strings-smoke-tests/java_index_of/test.desc b/jbmc/regression/strings-smoke-tests/java_index_of/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_index_of/test.desc rename to jbmc/regression/strings-smoke-tests/java_index_of/test.desc diff --git a/regression/strings-smoke-tests/java_index_of/test_index_of.class b/jbmc/regression/strings-smoke-tests/java_index_of/test_index_of.class similarity index 100% rename from regression/strings-smoke-tests/java_index_of/test_index_of.class rename to jbmc/regression/strings-smoke-tests/java_index_of/test_index_of.class diff --git a/regression/strings-smoke-tests/java_index_of/test_index_of.java b/jbmc/regression/strings-smoke-tests/java_index_of/test_index_of.java similarity index 100% rename from regression/strings-smoke-tests/java_index_of/test_index_of.java rename to jbmc/regression/strings-smoke-tests/java_index_of/test_index_of.java diff --git a/regression/strings-smoke-tests/java_index_of2/test.desc b/jbmc/regression/strings-smoke-tests/java_index_of2/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_index_of2/test.desc rename to jbmc/regression/strings-smoke-tests/java_index_of2/test.desc diff --git a/regression/strings-smoke-tests/java_index_of2/test_index_of2.class b/jbmc/regression/strings-smoke-tests/java_index_of2/test_index_of2.class similarity index 100% rename from regression/strings-smoke-tests/java_index_of2/test_index_of2.class rename to jbmc/regression/strings-smoke-tests/java_index_of2/test_index_of2.class diff --git a/regression/strings-smoke-tests/java_index_of2/test_index_of2.java b/jbmc/regression/strings-smoke-tests/java_index_of2/test_index_of2.java similarity index 100% rename from regression/strings-smoke-tests/java_index_of2/test_index_of2.java rename to jbmc/regression/strings-smoke-tests/java_index_of2/test_index_of2.java diff --git a/regression/strings-smoke-tests/java_index_of_char/test.desc b/jbmc/regression/strings-smoke-tests/java_index_of_char/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_index_of_char/test.desc rename to jbmc/regression/strings-smoke-tests/java_index_of_char/test.desc diff --git a/regression/strings-smoke-tests/java_index_of_char/test_index_of_char.class b/jbmc/regression/strings-smoke-tests/java_index_of_char/test_index_of_char.class similarity index 100% rename from regression/strings-smoke-tests/java_index_of_char/test_index_of_char.class rename to jbmc/regression/strings-smoke-tests/java_index_of_char/test_index_of_char.class diff --git a/regression/strings-smoke-tests/java_index_of_char/test_index_of_char.java b/jbmc/regression/strings-smoke-tests/java_index_of_char/test_index_of_char.java similarity index 100% rename from regression/strings-smoke-tests/java_index_of_char/test_index_of_char.java rename to jbmc/regression/strings-smoke-tests/java_index_of_char/test_index_of_char.java diff --git a/regression/strings-smoke-tests/java_insert_char/test.desc b/jbmc/regression/strings-smoke-tests/java_insert_char/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_insert_char/test.desc rename to jbmc/regression/strings-smoke-tests/java_insert_char/test.desc diff --git a/regression/strings-smoke-tests/java_insert_char/test_insert_char.class b/jbmc/regression/strings-smoke-tests/java_insert_char/test_insert_char.class similarity index 100% rename from regression/strings-smoke-tests/java_insert_char/test_insert_char.class rename to jbmc/regression/strings-smoke-tests/java_insert_char/test_insert_char.class diff --git a/regression/strings-smoke-tests/java_insert_char/test_insert_char.java b/jbmc/regression/strings-smoke-tests/java_insert_char/test_insert_char.java similarity index 100% rename from regression/strings-smoke-tests/java_insert_char/test_insert_char.java rename to jbmc/regression/strings-smoke-tests/java_insert_char/test_insert_char.java diff --git a/regression/strings-smoke-tests/java_insert_char_array/test.desc b/jbmc/regression/strings-smoke-tests/java_insert_char_array/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_insert_char_array/test.desc rename to jbmc/regression/strings-smoke-tests/java_insert_char_array/test.desc diff --git a/regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.class b/jbmc/regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.class similarity index 100% rename from regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.class rename to jbmc/regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.class diff --git a/regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.java b/jbmc/regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.java similarity index 100% rename from regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.java rename to jbmc/regression/strings-smoke-tests/java_insert_char_array/test_insert_char_array.java diff --git a/regression/strings-smoke-tests/java_insert_int/test.desc b/jbmc/regression/strings-smoke-tests/java_insert_int/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_insert_int/test.desc rename to jbmc/regression/strings-smoke-tests/java_insert_int/test.desc diff --git a/regression/strings-smoke-tests/java_insert_int/test_insert_int.class b/jbmc/regression/strings-smoke-tests/java_insert_int/test_insert_int.class similarity index 100% rename from regression/strings-smoke-tests/java_insert_int/test_insert_int.class rename to jbmc/regression/strings-smoke-tests/java_insert_int/test_insert_int.class diff --git a/regression/strings-smoke-tests/java_insert_int/test_insert_int.java b/jbmc/regression/strings-smoke-tests/java_insert_int/test_insert_int.java similarity index 100% rename from regression/strings-smoke-tests/java_insert_int/test_insert_int.java rename to jbmc/regression/strings-smoke-tests/java_insert_int/test_insert_int.java diff --git a/regression/strings-smoke-tests/java_insert_multiple/test.desc b/jbmc/regression/strings-smoke-tests/java_insert_multiple/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_insert_multiple/test.desc rename to jbmc/regression/strings-smoke-tests/java_insert_multiple/test.desc diff --git a/regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.class b/jbmc/regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.class similarity index 100% rename from regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.class rename to jbmc/regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.class diff --git a/regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.java b/jbmc/regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.java similarity index 100% rename from regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.java rename to jbmc/regression/strings-smoke-tests/java_insert_multiple/test_insert_multiple.java diff --git a/regression/strings-smoke-tests/java_insert_string/test.desc b/jbmc/regression/strings-smoke-tests/java_insert_string/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_insert_string/test.desc rename to jbmc/regression/strings-smoke-tests/java_insert_string/test.desc diff --git a/regression/strings-smoke-tests/java_insert_string/test_insert_string.class b/jbmc/regression/strings-smoke-tests/java_insert_string/test_insert_string.class similarity index 100% rename from regression/strings-smoke-tests/java_insert_string/test_insert_string.class rename to jbmc/regression/strings-smoke-tests/java_insert_string/test_insert_string.class diff --git a/regression/strings-smoke-tests/java_insert_string/test_insert_string.java b/jbmc/regression/strings-smoke-tests/java_insert_string/test_insert_string.java similarity index 100% rename from regression/strings-smoke-tests/java_insert_string/test_insert_string.java rename to jbmc/regression/strings-smoke-tests/java_insert_string/test_insert_string.java diff --git a/regression/strings-smoke-tests/java_int_to_string/Test1.class b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test1.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test1.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test1.class diff --git a/regression/strings-smoke-tests/java_int_to_string/Test1.java b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test1.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test1.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test1.java diff --git a/regression/strings-smoke-tests/java_int_to_string/Test2.class b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test2.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test2.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test2.class diff --git a/regression/strings-smoke-tests/java_int_to_string/Test2.java b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test2.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test2.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test2.java diff --git a/regression/strings-smoke-tests/java_int_to_string/Test3.class b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test3.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test3.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test3.class diff --git a/regression/strings-smoke-tests/java_int_to_string/Test3.java b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test3.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test3.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test3.java diff --git a/regression/strings-smoke-tests/java_int_to_string/Test4.class b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test4.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test4.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test4.class diff --git a/regression/strings-smoke-tests/java_int_to_string/Test4.java b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test4.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test4.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test4.java diff --git a/regression/strings-smoke-tests/java_int_to_string/Test5.class b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test5.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test5.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test5.class diff --git a/regression/strings-smoke-tests/java_int_to_string/Test5.java b/jbmc/regression/strings-smoke-tests/java_int_to_string/Test5.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/Test5.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string/Test5.java diff --git a/regression/strings-smoke-tests/java_int_to_string/test1.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string/test1.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/test1.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string/test1.desc diff --git a/regression/strings-smoke-tests/java_int_to_string/test2.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string/test2.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/test2.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string/test2.desc diff --git a/regression/strings-smoke-tests/java_int_to_string/test2_bug.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string/test2_bug.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/test2_bug.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string/test2_bug.desc diff --git a/regression/strings-smoke-tests/java_int_to_string/test3.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string/test3.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/test3.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string/test3.desc diff --git a/regression/strings-smoke-tests/java_int_to_string/test4.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string/test4.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/test4.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string/test4.desc diff --git a/regression/strings-smoke-tests/java_int_to_string/test5.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string/test5.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string/test5.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string/test5.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_knownbug/Test.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_knownbug/Test.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_knownbug/Test.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_knownbug/Test.class diff --git a/regression/strings-smoke-tests/java_int_to_string_knownbug/Test.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_knownbug/Test.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_knownbug/Test.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_knownbug/Test.java diff --git a/regression/strings-smoke-tests/java_int_to_string_knownbug/test.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_knownbug/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_knownbug/test.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_knownbug/test.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary1.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary2.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_binary3.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_decimal.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex1.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex2.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_hex3.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal1.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal2.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/Test_octal3.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary1.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary1.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary1.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary1.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary2.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary2.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary2.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary2.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary3.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary3.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary3.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_binary3.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_decimal.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_decimal.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_decimal.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_decimal.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex1.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex1.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex1.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex1.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex2.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex2.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex2.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex2.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex3.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex3.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex3.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_hex3.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal1.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal1.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal1.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal1.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal2.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal2.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal2.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal2.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal3.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal3.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal3.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix/test_octal3.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_binary.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_hex.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.class b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.class similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.class rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.class diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.java b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.java similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.java rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/Test_octal.java diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_binary.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_binary.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_binary.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_binary.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_hex.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_hex.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_hex.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_hex.desc diff --git a/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_octal.desc b/jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_octal.desc similarity index 100% rename from regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_octal.desc rename to jbmc/regression/strings-smoke-tests/java_int_to_string_with_radix_knownbug/test_octal.desc diff --git a/regression/strings-smoke-tests/java_intern/test.desc b/jbmc/regression/strings-smoke-tests/java_intern/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_intern/test.desc rename to jbmc/regression/strings-smoke-tests/java_intern/test.desc diff --git a/regression/strings-smoke-tests/java_intern/test_intern.class b/jbmc/regression/strings-smoke-tests/java_intern/test_intern.class similarity index 100% rename from regression/strings-smoke-tests/java_intern/test_intern.class rename to jbmc/regression/strings-smoke-tests/java_intern/test_intern.class diff --git a/regression/strings-smoke-tests/java_intern/test_intern.java b/jbmc/regression/strings-smoke-tests/java_intern/test_intern.java similarity index 100% rename from regression/strings-smoke-tests/java_intern/test_intern.java rename to jbmc/regression/strings-smoke-tests/java_intern/test_intern.java diff --git a/regression/strings-smoke-tests/java_last_index_of/test.desc b/jbmc/regression/strings-smoke-tests/java_last_index_of/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of/test.desc rename to jbmc/regression/strings-smoke-tests/java_last_index_of/test.desc diff --git a/regression/strings-smoke-tests/java_last_index_of/test_last_index_of.class b/jbmc/regression/strings-smoke-tests/java_last_index_of/test_last_index_of.class similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of/test_last_index_of.class rename to jbmc/regression/strings-smoke-tests/java_last_index_of/test_last_index_of.class diff --git a/regression/strings-smoke-tests/java_last_index_of/test_last_index_of.java b/jbmc/regression/strings-smoke-tests/java_last_index_of/test_last_index_of.java similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of/test_last_index_of.java rename to jbmc/regression/strings-smoke-tests/java_last_index_of/test_last_index_of.java diff --git a/regression/strings-smoke-tests/java_last_index_of2/test.desc b/jbmc/regression/strings-smoke-tests/java_last_index_of2/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of2/test.desc rename to jbmc/regression/strings-smoke-tests/java_last_index_of2/test.desc diff --git a/regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.class b/jbmc/regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.class similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.class rename to jbmc/regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.class diff --git a/regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.java b/jbmc/regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.java similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.java rename to jbmc/regression/strings-smoke-tests/java_last_index_of2/test_last_index_of2.java diff --git a/regression/strings-smoke-tests/java_last_index_of_char/test.desc b/jbmc/regression/strings-smoke-tests/java_last_index_of_char/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of_char/test.desc rename to jbmc/regression/strings-smoke-tests/java_last_index_of_char/test.desc diff --git a/regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.class b/jbmc/regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.class similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.class rename to jbmc/regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.class diff --git a/regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.java b/jbmc/regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.java similarity index 100% rename from regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.java rename to jbmc/regression/strings-smoke-tests/java_last_index_of_char/test_last_index_of_char.java diff --git a/regression/strings-smoke-tests/java_length/test.desc b/jbmc/regression/strings-smoke-tests/java_length/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_length/test.desc rename to jbmc/regression/strings-smoke-tests/java_length/test.desc diff --git a/regression/strings-smoke-tests/java_length/test_length.class b/jbmc/regression/strings-smoke-tests/java_length/test_length.class similarity index 100% rename from regression/strings-smoke-tests/java_length/test_length.class rename to jbmc/regression/strings-smoke-tests/java_length/test_length.class diff --git a/regression/strings-smoke-tests/java_length/test_length.java b/jbmc/regression/strings-smoke-tests/java_length/test_length.java similarity index 100% rename from regression/strings-smoke-tests/java_length/test_length.java rename to jbmc/regression/strings-smoke-tests/java_length/test_length.java diff --git a/regression/strings-smoke-tests/java_length2/test.class b/jbmc/regression/strings-smoke-tests/java_length2/test.class similarity index 100% rename from regression/strings-smoke-tests/java_length2/test.class rename to jbmc/regression/strings-smoke-tests/java_length2/test.class diff --git a/regression/strings-smoke-tests/java_length2/test.desc b/jbmc/regression/strings-smoke-tests/java_length2/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_length2/test.desc rename to jbmc/regression/strings-smoke-tests/java_length2/test.desc diff --git a/regression/strings-smoke-tests/java_length2/test.java b/jbmc/regression/strings-smoke-tests/java_length2/test.java similarity index 100% rename from regression/strings-smoke-tests/java_length2/test.java rename to jbmc/regression/strings-smoke-tests/java_length2/test.java diff --git a/regression/strings-smoke-tests/java_long_to_string/Test1.class b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test1.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test1.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test1.class diff --git a/regression/strings-smoke-tests/java_long_to_string/Test1.java b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test1.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test1.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test1.java diff --git a/regression/strings-smoke-tests/java_long_to_string/Test2.class b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test2.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test2.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test2.class diff --git a/regression/strings-smoke-tests/java_long_to_string/Test2.java b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test2.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test2.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test2.java diff --git a/regression/strings-smoke-tests/java_long_to_string/Test3.class b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test3.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test3.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test3.class diff --git a/regression/strings-smoke-tests/java_long_to_string/Test3.java b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test3.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test3.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test3.java diff --git a/regression/strings-smoke-tests/java_long_to_string/Test4.class b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test4.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test4.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test4.class diff --git a/regression/strings-smoke-tests/java_long_to_string/Test4.java b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test4.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test4.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test4.java diff --git a/regression/strings-smoke-tests/java_long_to_string/Test5.class b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test5.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test5.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test5.class diff --git a/regression/strings-smoke-tests/java_long_to_string/Test5.java b/jbmc/regression/strings-smoke-tests/java_long_to_string/Test5.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/Test5.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string/Test5.java diff --git a/regression/strings-smoke-tests/java_long_to_string/test1.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string/test1.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/test1.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string/test1.desc diff --git a/regression/strings-smoke-tests/java_long_to_string/test2.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string/test2.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/test2.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string/test2.desc diff --git a/regression/strings-smoke-tests/java_long_to_string/test3.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string/test3.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/test3.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string/test3.desc diff --git a/regression/strings-smoke-tests/java_long_to_string/test4.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string/test4.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/test4.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string/test4.desc diff --git a/regression/strings-smoke-tests/java_long_to_string/test5.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string/test5.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string/test5.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string/test5.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary1.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary2.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_binary3.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_decimal.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex1.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex2.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_hex3.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal1.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal2.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.class b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.class similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.class rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.class diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.java b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.java similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.java rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/Test_octal3.java diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary1.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary1.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary1.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary1.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary2.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary2.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary2.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary2.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary3.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary3.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary3.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_binary3.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_decimal.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_decimal.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_decimal.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_decimal.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex1.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex1.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex1.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex1.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex2.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex2.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex2.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex2.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex3.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex3.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex3.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_hex3.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal1.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal1.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal1.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal1.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal2.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal2.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal2.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal2.desc diff --git a/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal3.desc b/jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal3.desc similarity index 100% rename from regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal3.desc rename to jbmc/regression/strings-smoke-tests/java_long_to_string_with_radix/test_octal3.desc diff --git a/regression/strings-smoke-tests/java_parseint/Test1.class b/jbmc/regression/strings-smoke-tests/java_parseint/Test1.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint/Test1.class rename to jbmc/regression/strings-smoke-tests/java_parseint/Test1.class diff --git a/regression/strings-smoke-tests/java_parseint/Test1.java b/jbmc/regression/strings-smoke-tests/java_parseint/Test1.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint/Test1.java rename to jbmc/regression/strings-smoke-tests/java_parseint/Test1.java diff --git a/regression/strings-smoke-tests/java_parseint/Test2.class b/jbmc/regression/strings-smoke-tests/java_parseint/Test2.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint/Test2.class rename to jbmc/regression/strings-smoke-tests/java_parseint/Test2.class diff --git a/regression/strings-smoke-tests/java_parseint/Test2.java b/jbmc/regression/strings-smoke-tests/java_parseint/Test2.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint/Test2.java rename to jbmc/regression/strings-smoke-tests/java_parseint/Test2.java diff --git a/regression/strings-smoke-tests/java_parseint/Test3.class b/jbmc/regression/strings-smoke-tests/java_parseint/Test3.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint/Test3.class rename to jbmc/regression/strings-smoke-tests/java_parseint/Test3.class diff --git a/regression/strings-smoke-tests/java_parseint/Test3.java b/jbmc/regression/strings-smoke-tests/java_parseint/Test3.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint/Test3.java rename to jbmc/regression/strings-smoke-tests/java_parseint/Test3.java diff --git a/regression/strings-smoke-tests/java_parseint/test1.desc b/jbmc/regression/strings-smoke-tests/java_parseint/test1.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint/test1.desc rename to jbmc/regression/strings-smoke-tests/java_parseint/test1.desc diff --git a/regression/strings-smoke-tests/java_parseint/test2.desc b/jbmc/regression/strings-smoke-tests/java_parseint/test2.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint/test2.desc rename to jbmc/regression/strings-smoke-tests/java_parseint/test2.desc diff --git a/regression/strings-smoke-tests/java_parseint/test3.desc b/jbmc/regression/strings-smoke-tests/java_parseint/test3.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint/test3.desc rename to jbmc/regression/strings-smoke-tests/java_parseint/test3.desc diff --git a/regression/strings-smoke-tests/java_parseint_knownbug/Test.class b/jbmc/regression/strings-smoke-tests/java_parseint_knownbug/Test.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_knownbug/Test.class rename to jbmc/regression/strings-smoke-tests/java_parseint_knownbug/Test.class diff --git a/regression/strings-smoke-tests/java_parseint_knownbug/Test.java b/jbmc/regression/strings-smoke-tests/java_parseint_knownbug/Test.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_knownbug/Test.java rename to jbmc/regression/strings-smoke-tests/java_parseint_knownbug/Test.java diff --git a/regression/strings-smoke-tests/java_parseint_knownbug/test.desc b/jbmc/regression/strings-smoke-tests/java_parseint_knownbug/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_knownbug/test.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_knownbug/test.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test1.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test1.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test1.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test1.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test1.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test1.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test1.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test1.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test2.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test2.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test2.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test2.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test2.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test2.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test2.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test2.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test3.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test3.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test3.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test3.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test3.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test3.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test3.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test3.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test4.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test4.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test4.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test4.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test4.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test4.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test4.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test4.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test5.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test5.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test5.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test5.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test5.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test5.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test5.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test5.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test6.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test6.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test6.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test6.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/Test6.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test6.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/Test6.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/Test6.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/test1.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test1.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/test1.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test1.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/test2.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test2.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/test2.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test2.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/test3.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test3.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/test3.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test3.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/test4.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test4.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/test4.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test4.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/test5.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test5.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/test5.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test5.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix/test6.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test6.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix/test6.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix/test6.desc diff --git a/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.class b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.class similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.class rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.class diff --git a/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.java b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.java similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.java rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/Test.java diff --git a/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/output b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/output similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix_knownbug/output rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/output diff --git a/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/test.desc b/jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_parseint_with_radix_knownbug/test.desc rename to jbmc/regression/strings-smoke-tests/java_parseint_with_radix_knownbug/test.desc diff --git a/regression/strings-smoke-tests/java_parselong/Test_binary_min.class b/jbmc/regression/strings-smoke-tests/java_parselong/Test_binary_min.class similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_binary_min.class rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_binary_min.class diff --git a/regression/strings-smoke-tests/java_parselong/Test_binary_min.java b/jbmc/regression/strings-smoke-tests/java_parselong/Test_binary_min.java similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_binary_min.java rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_binary_min.java diff --git a/regression/strings-smoke-tests/java_parselong/Test_decimal_max.class b/jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_max.class similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_decimal_max.class rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_max.class diff --git a/regression/strings-smoke-tests/java_parselong/Test_decimal_max.java b/jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_max.java similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_decimal_max.java rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_max.java diff --git a/regression/strings-smoke-tests/java_parselong/Test_decimal_min.class b/jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_min.class similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_decimal_min.class rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_min.class diff --git a/regression/strings-smoke-tests/java_parselong/Test_decimal_min.java b/jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_min.java similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_decimal_min.java rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_decimal_min.java diff --git a/regression/strings-smoke-tests/java_parselong/Test_hex.class b/jbmc/regression/strings-smoke-tests/java_parselong/Test_hex.class similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_hex.class rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_hex.class diff --git a/regression/strings-smoke-tests/java_parselong/Test_hex.java b/jbmc/regression/strings-smoke-tests/java_parselong/Test_hex.java similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_hex.java rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_hex.java diff --git a/regression/strings-smoke-tests/java_parselong/Test_octal.class b/jbmc/regression/strings-smoke-tests/java_parselong/Test_octal.class similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_octal.class rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_octal.class diff --git a/regression/strings-smoke-tests/java_parselong/Test_octal.java b/jbmc/regression/strings-smoke-tests/java_parselong/Test_octal.java similarity index 100% rename from regression/strings-smoke-tests/java_parselong/Test_octal.java rename to jbmc/regression/strings-smoke-tests/java_parselong/Test_octal.java diff --git a/regression/strings-smoke-tests/java_parselong/test_binary_min.desc b/jbmc/regression/strings-smoke-tests/java_parselong/test_binary_min.desc similarity index 100% rename from regression/strings-smoke-tests/java_parselong/test_binary_min.desc rename to jbmc/regression/strings-smoke-tests/java_parselong/test_binary_min.desc diff --git a/regression/strings-smoke-tests/java_parselong/test_decimal_max.desc b/jbmc/regression/strings-smoke-tests/java_parselong/test_decimal_max.desc similarity index 100% rename from regression/strings-smoke-tests/java_parselong/test_decimal_max.desc rename to jbmc/regression/strings-smoke-tests/java_parselong/test_decimal_max.desc diff --git a/regression/strings-smoke-tests/java_parselong/test_decimal_min.desc b/jbmc/regression/strings-smoke-tests/java_parselong/test_decimal_min.desc similarity index 100% rename from regression/strings-smoke-tests/java_parselong/test_decimal_min.desc rename to jbmc/regression/strings-smoke-tests/java_parselong/test_decimal_min.desc diff --git a/regression/strings-smoke-tests/java_parselong/test_hex.desc b/jbmc/regression/strings-smoke-tests/java_parselong/test_hex.desc similarity index 100% rename from regression/strings-smoke-tests/java_parselong/test_hex.desc rename to jbmc/regression/strings-smoke-tests/java_parselong/test_hex.desc diff --git a/regression/strings-smoke-tests/java_parselong/test_octal.desc b/jbmc/regression/strings-smoke-tests/java_parselong/test_octal.desc similarity index 100% rename from regression/strings-smoke-tests/java_parselong/test_octal.desc rename to jbmc/regression/strings-smoke-tests/java_parselong/test_octal.desc diff --git a/regression/strings-smoke-tests/java_replace/test.desc b/jbmc/regression/strings-smoke-tests/java_replace/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_replace/test.desc rename to jbmc/regression/strings-smoke-tests/java_replace/test.desc diff --git a/regression/strings-smoke-tests/java_replace/test_replace.class b/jbmc/regression/strings-smoke-tests/java_replace/test_replace.class similarity index 100% rename from regression/strings-smoke-tests/java_replace/test_replace.class rename to jbmc/regression/strings-smoke-tests/java_replace/test_replace.class diff --git a/regression/strings-smoke-tests/java_replace/test_replace.java b/jbmc/regression/strings-smoke-tests/java_replace/test_replace.java similarity index 100% rename from regression/strings-smoke-tests/java_replace/test_replace.java rename to jbmc/regression/strings-smoke-tests/java_replace/test_replace.java diff --git a/regression/strings-smoke-tests/java_replace_char/test.desc b/jbmc/regression/strings-smoke-tests/java_replace_char/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_replace_char/test.desc rename to jbmc/regression/strings-smoke-tests/java_replace_char/test.desc diff --git a/regression/strings-smoke-tests/java_replace_char/test_replace_char.class b/jbmc/regression/strings-smoke-tests/java_replace_char/test_replace_char.class similarity index 100% rename from regression/strings-smoke-tests/java_replace_char/test_replace_char.class rename to jbmc/regression/strings-smoke-tests/java_replace_char/test_replace_char.class diff --git a/regression/strings-smoke-tests/java_replace_char/test_replace_char.java b/jbmc/regression/strings-smoke-tests/java_replace_char/test_replace_char.java similarity index 100% rename from regression/strings-smoke-tests/java_replace_char/test_replace_char.java rename to jbmc/regression/strings-smoke-tests/java_replace_char/test_replace_char.java diff --git a/regression/strings-smoke-tests/java_set_char_at/test.desc b/jbmc/regression/strings-smoke-tests/java_set_char_at/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_set_char_at/test.desc rename to jbmc/regression/strings-smoke-tests/java_set_char_at/test.desc diff --git a/regression/strings-smoke-tests/java_set_char_at/test_set_char_at.class b/jbmc/regression/strings-smoke-tests/java_set_char_at/test_set_char_at.class similarity index 100% rename from regression/strings-smoke-tests/java_set_char_at/test_set_char_at.class rename to jbmc/regression/strings-smoke-tests/java_set_char_at/test_set_char_at.class diff --git a/regression/strings-smoke-tests/java_set_char_at/test_set_char_at.java b/jbmc/regression/strings-smoke-tests/java_set_char_at/test_set_char_at.java similarity index 100% rename from regression/strings-smoke-tests/java_set_char_at/test_set_char_at.java rename to jbmc/regression/strings-smoke-tests/java_set_char_at/test_set_char_at.java diff --git a/regression/strings-smoke-tests/java_set_length/test.desc b/jbmc/regression/strings-smoke-tests/java_set_length/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_set_length/test.desc rename to jbmc/regression/strings-smoke-tests/java_set_length/test.desc diff --git a/regression/strings-smoke-tests/java_set_length/test_set_length.class b/jbmc/regression/strings-smoke-tests/java_set_length/test_set_length.class similarity index 100% rename from regression/strings-smoke-tests/java_set_length/test_set_length.class rename to jbmc/regression/strings-smoke-tests/java_set_length/test_set_length.class diff --git a/regression/strings-smoke-tests/java_set_length/test_set_length.java b/jbmc/regression/strings-smoke-tests/java_set_length/test_set_length.java similarity index 100% rename from regression/strings-smoke-tests/java_set_length/test_set_length.java rename to jbmc/regression/strings-smoke-tests/java_set_length/test_set_length.java diff --git a/regression/strings-smoke-tests/java_starts_with/test.desc b/jbmc/regression/strings-smoke-tests/java_starts_with/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_starts_with/test.desc rename to jbmc/regression/strings-smoke-tests/java_starts_with/test.desc diff --git a/regression/strings-smoke-tests/java_starts_with/test_starts_with.class b/jbmc/regression/strings-smoke-tests/java_starts_with/test_starts_with.class similarity index 100% rename from regression/strings-smoke-tests/java_starts_with/test_starts_with.class rename to jbmc/regression/strings-smoke-tests/java_starts_with/test_starts_with.class diff --git a/regression/strings-smoke-tests/java_starts_with/test_starts_with.java b/jbmc/regression/strings-smoke-tests/java_starts_with/test_starts_with.java similarity index 100% rename from regression/strings-smoke-tests/java_starts_with/test_starts_with.java rename to jbmc/regression/strings-smoke-tests/java_starts_with/test_starts_with.java diff --git a/regression/strings-smoke-tests/java_string_builder_length/test.desc b/jbmc/regression/strings-smoke-tests/java_string_builder_length/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_string_builder_length/test.desc rename to jbmc/regression/strings-smoke-tests/java_string_builder_length/test.desc diff --git a/regression/strings-smoke-tests/java_string_builder_length/test_sb_length.class b/jbmc/regression/strings-smoke-tests/java_string_builder_length/test_sb_length.class similarity index 100% rename from regression/strings-smoke-tests/java_string_builder_length/test_sb_length.class rename to jbmc/regression/strings-smoke-tests/java_string_builder_length/test_sb_length.class diff --git a/regression/strings-smoke-tests/java_string_builder_length/test_sb_length.java b/jbmc/regression/strings-smoke-tests/java_string_builder_length/test_sb_length.java similarity index 100% rename from regression/strings-smoke-tests/java_string_builder_length/test_sb_length.java rename to jbmc/regression/strings-smoke-tests/java_string_builder_length/test_sb_length.java diff --git a/regression/strings-smoke-tests/java_string_printable/Test.class b/jbmc/regression/strings-smoke-tests/java_string_printable/Test.class similarity index 100% rename from regression/strings-smoke-tests/java_string_printable/Test.class rename to jbmc/regression/strings-smoke-tests/java_string_printable/Test.class diff --git a/regression/strings-smoke-tests/java_string_printable/Test.java b/jbmc/regression/strings-smoke-tests/java_string_printable/Test.java similarity index 100% rename from regression/strings-smoke-tests/java_string_printable/Test.java rename to jbmc/regression/strings-smoke-tests/java_string_printable/Test.java diff --git a/regression/strings-smoke-tests/java_string_printable/test.desc b/jbmc/regression/strings-smoke-tests/java_string_printable/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_string_printable/test.desc rename to jbmc/regression/strings-smoke-tests/java_string_printable/test.desc diff --git a/regression/strings-smoke-tests/java_string_printable/test_char.desc b/jbmc/regression/strings-smoke-tests/java_string_printable/test_char.desc similarity index 100% rename from regression/strings-smoke-tests/java_string_printable/test_char.desc rename to jbmc/regression/strings-smoke-tests/java_string_printable/test_char.desc diff --git a/regression/strings-smoke-tests/java_subsequence/test.desc b/jbmc/regression/strings-smoke-tests/java_subsequence/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_subsequence/test.desc rename to jbmc/regression/strings-smoke-tests/java_subsequence/test.desc diff --git a/regression/strings-smoke-tests/java_subsequence/test_subsequence.class b/jbmc/regression/strings-smoke-tests/java_subsequence/test_subsequence.class similarity index 100% rename from regression/strings-smoke-tests/java_subsequence/test_subsequence.class rename to jbmc/regression/strings-smoke-tests/java_subsequence/test_subsequence.class diff --git a/regression/strings-smoke-tests/java_subsequence/test_subsequence.java b/jbmc/regression/strings-smoke-tests/java_subsequence/test_subsequence.java similarity index 100% rename from regression/strings-smoke-tests/java_subsequence/test_subsequence.java rename to jbmc/regression/strings-smoke-tests/java_subsequence/test_subsequence.java diff --git a/regression/strings-smoke-tests/java_substring/test.desc b/jbmc/regression/strings-smoke-tests/java_substring/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_substring/test.desc rename to jbmc/regression/strings-smoke-tests/java_substring/test.desc diff --git a/regression/strings-smoke-tests/java_substring/test_substring.class b/jbmc/regression/strings-smoke-tests/java_substring/test_substring.class similarity index 100% rename from regression/strings-smoke-tests/java_substring/test_substring.class rename to jbmc/regression/strings-smoke-tests/java_substring/test_substring.class diff --git a/regression/strings-smoke-tests/java_substring/test_substring.java b/jbmc/regression/strings-smoke-tests/java_substring/test_substring.java similarity index 100% rename from regression/strings-smoke-tests/java_substring/test_substring.java rename to jbmc/regression/strings-smoke-tests/java_substring/test_substring.java diff --git a/regression/strings-smoke-tests/java_trim/test.desc b/jbmc/regression/strings-smoke-tests/java_trim/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_trim/test.desc rename to jbmc/regression/strings-smoke-tests/java_trim/test.desc diff --git a/regression/strings-smoke-tests/java_trim/test_trim.class b/jbmc/regression/strings-smoke-tests/java_trim/test_trim.class similarity index 100% rename from regression/strings-smoke-tests/java_trim/test_trim.class rename to jbmc/regression/strings-smoke-tests/java_trim/test_trim.class diff --git a/regression/strings-smoke-tests/java_trim/test_trim.java b/jbmc/regression/strings-smoke-tests/java_trim/test_trim.java similarity index 100% rename from regression/strings-smoke-tests/java_trim/test_trim.java rename to jbmc/regression/strings-smoke-tests/java_trim/test_trim.java diff --git a/regression/strings-smoke-tests/java_value_of_float/test.class b/jbmc/regression/strings-smoke-tests/java_value_of_float/test.class similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float/test.class rename to jbmc/regression/strings-smoke-tests/java_value_of_float/test.class diff --git a/regression/strings-smoke-tests/java_value_of_float/test.desc b/jbmc/regression/strings-smoke-tests/java_value_of_float/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float/test.desc rename to jbmc/regression/strings-smoke-tests/java_value_of_float/test.desc diff --git a/regression/strings-smoke-tests/java_value_of_float/test.java b/jbmc/regression/strings-smoke-tests/java_value_of_float/test.java similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float/test.java rename to jbmc/regression/strings-smoke-tests/java_value_of_float/test.java diff --git a/regression/strings-smoke-tests/java_value_of_float_2/test.class b/jbmc/regression/strings-smoke-tests/java_value_of_float_2/test.class similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_2/test.class rename to jbmc/regression/strings-smoke-tests/java_value_of_float_2/test.class diff --git a/regression/strings-smoke-tests/java_value_of_float_2/test.desc b/jbmc/regression/strings-smoke-tests/java_value_of_float_2/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_2/test.desc rename to jbmc/regression/strings-smoke-tests/java_value_of_float_2/test.desc diff --git a/regression/strings-smoke-tests/java_value_of_float_2/test.java b/jbmc/regression/strings-smoke-tests/java_value_of_float_2/test.java similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_2/test.java rename to jbmc/regression/strings-smoke-tests/java_value_of_float_2/test.java diff --git a/regression/strings-smoke-tests/java_value_of_float_3/test.class b/jbmc/regression/strings-smoke-tests/java_value_of_float_3/test.class similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_3/test.class rename to jbmc/regression/strings-smoke-tests/java_value_of_float_3/test.class diff --git a/regression/strings-smoke-tests/java_value_of_float_3/test.desc b/jbmc/regression/strings-smoke-tests/java_value_of_float_3/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_3/test.desc rename to jbmc/regression/strings-smoke-tests/java_value_of_float_3/test.desc diff --git a/regression/strings-smoke-tests/java_value_of_float_3/test.java b/jbmc/regression/strings-smoke-tests/java_value_of_float_3/test.java similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_3/test.java rename to jbmc/regression/strings-smoke-tests/java_value_of_float_3/test.java diff --git a/regression/strings-smoke-tests/java_value_of_float_4/test.class b/jbmc/regression/strings-smoke-tests/java_value_of_float_4/test.class similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_4/test.class rename to jbmc/regression/strings-smoke-tests/java_value_of_float_4/test.class diff --git a/regression/strings-smoke-tests/java_value_of_float_4/test.desc b/jbmc/regression/strings-smoke-tests/java_value_of_float_4/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_4/test.desc rename to jbmc/regression/strings-smoke-tests/java_value_of_float_4/test.desc diff --git a/regression/strings-smoke-tests/java_value_of_float_4/test.java b/jbmc/regression/strings-smoke-tests/java_value_of_float_4/test.java similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_4/test.java rename to jbmc/regression/strings-smoke-tests/java_value_of_float_4/test.java diff --git a/regression/strings-smoke-tests/java_value_of_float_5/test.class b/jbmc/regression/strings-smoke-tests/java_value_of_float_5/test.class similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_5/test.class rename to jbmc/regression/strings-smoke-tests/java_value_of_float_5/test.class diff --git a/regression/strings-smoke-tests/java_value_of_float_5/test.desc b/jbmc/regression/strings-smoke-tests/java_value_of_float_5/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_5/test.desc rename to jbmc/regression/strings-smoke-tests/java_value_of_float_5/test.desc diff --git a/regression/strings-smoke-tests/java_value_of_float_5/test.java b/jbmc/regression/strings-smoke-tests/java_value_of_float_5/test.java similarity index 100% rename from regression/strings-smoke-tests/java_value_of_float_5/test.java rename to jbmc/regression/strings-smoke-tests/java_value_of_float_5/test.java diff --git a/regression/strings-smoke-tests/java_value_of_long/test.class b/jbmc/regression/strings-smoke-tests/java_value_of_long/test.class similarity index 100% rename from regression/strings-smoke-tests/java_value_of_long/test.class rename to jbmc/regression/strings-smoke-tests/java_value_of_long/test.class diff --git a/regression/strings-smoke-tests/java_value_of_long/test.desc b/jbmc/regression/strings-smoke-tests/java_value_of_long/test.desc similarity index 100% rename from regression/strings-smoke-tests/java_value_of_long/test.desc rename to jbmc/regression/strings-smoke-tests/java_value_of_long/test.desc diff --git a/regression/strings-smoke-tests/java_value_of_long/test.java b/jbmc/regression/strings-smoke-tests/java_value_of_long/test.java similarity index 100% rename from regression/strings-smoke-tests/java_value_of_long/test.java rename to jbmc/regression/strings-smoke-tests/java_value_of_long/test.java diff --git a/regression/strings-smoke-tests/max_input_length/MemberTest.class b/jbmc/regression/strings-smoke-tests/max_input_length/MemberTest.class similarity index 100% rename from regression/strings-smoke-tests/max_input_length/MemberTest.class rename to jbmc/regression/strings-smoke-tests/max_input_length/MemberTest.class diff --git a/regression/strings-smoke-tests/max_input_length/MemberTest.desc b/jbmc/regression/strings-smoke-tests/max_input_length/MemberTest.desc similarity index 100% rename from regression/strings-smoke-tests/max_input_length/MemberTest.desc rename to jbmc/regression/strings-smoke-tests/max_input_length/MemberTest.desc diff --git a/regression/strings-smoke-tests/max_input_length/MemberTest.java b/jbmc/regression/strings-smoke-tests/max_input_length/MemberTest.java similarity index 100% rename from regression/strings-smoke-tests/max_input_length/MemberTest.java rename to jbmc/regression/strings-smoke-tests/max_input_length/MemberTest.java diff --git a/regression/strings-smoke-tests/max_input_length/MemberTest2.desc b/jbmc/regression/strings-smoke-tests/max_input_length/MemberTest2.desc similarity index 100% rename from regression/strings-smoke-tests/max_input_length/MemberTest2.desc rename to jbmc/regression/strings-smoke-tests/max_input_length/MemberTest2.desc diff --git a/regression/strings-smoke-tests/max_input_length/Test.class b/jbmc/regression/strings-smoke-tests/max_input_length/Test.class similarity index 100% rename from regression/strings-smoke-tests/max_input_length/Test.class rename to jbmc/regression/strings-smoke-tests/max_input_length/Test.class diff --git a/regression/strings-smoke-tests/max_input_length/Test.java b/jbmc/regression/strings-smoke-tests/max_input_length/Test.java similarity index 100% rename from regression/strings-smoke-tests/max_input_length/Test.java rename to jbmc/regression/strings-smoke-tests/max_input_length/Test.java diff --git a/regression/strings-smoke-tests/max_input_length/test1.desc b/jbmc/regression/strings-smoke-tests/max_input_length/test1.desc similarity index 100% rename from regression/strings-smoke-tests/max_input_length/test1.desc rename to jbmc/regression/strings-smoke-tests/max_input_length/test1.desc diff --git a/regression/strings-smoke-tests/max_input_length/test2.desc b/jbmc/regression/strings-smoke-tests/max_input_length/test2.desc similarity index 100% rename from regression/strings-smoke-tests/max_input_length/test2.desc rename to jbmc/regression/strings-smoke-tests/max_input_length/test2.desc diff --git a/regression/strings-smoke-tests/performance.py b/jbmc/regression/strings-smoke-tests/performance.py similarity index 100% rename from regression/strings-smoke-tests/performance.py rename to jbmc/regression/strings-smoke-tests/performance.py diff --git a/regression/strings-smoke-tests/performance_draw.gp b/jbmc/regression/strings-smoke-tests/performance_draw.gp similarity index 100% rename from regression/strings-smoke-tests/performance_draw.gp rename to jbmc/regression/strings-smoke-tests/performance_draw.gp diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt index 27009895802..d915af9cf1a 100644 --- a/regression/CMakeLists.txt +++ b/regression/CMakeLists.txt @@ -24,13 +24,10 @@ endmacro(add_test_pl_tests) # running tests in parallel, it is important that these directories are # listed with decreasing runtimes (i.e. longest running at the top) add_subdirectory(cbmc) -add_subdirectory(cbmc-java) add_subdirectory(goto-analyzer) add_subdirectory(ansi-c) -add_subdirectory(jbmc-strings) add_subdirectory(goto-instrument) add_subdirectory(cpp) -add_subdirectory(strings-smoke-tests) add_subdirectory(cbmc-cover) add_subdirectory(goto-instrument-typedef) add_subdirectory(strings) @@ -38,7 +35,6 @@ add_subdirectory(invariants) add_subdirectory(goto-diff) add_subdirectory(test-script) add_subdirectory(goto-analyzer-taint) -add_subdirectory(cbmc-java-inheritance) if(NOT WIN32) add_subdirectory(goto-gcc) endif() diff --git a/regression/Makefile b/regression/Makefile index eefb1f9e047..64972660142 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -2,13 +2,10 @@ # running tests in parallel, it is important that these directories are # listed with decreasing runtimes (i.e. longest running at the top) DIRS = cbmc \ - cbmc-java \ goto-analyzer \ ansi-c \ - jbmc-strings \ goto-instrument \ cpp \ - strings-smoke-tests \ cbmc-cover \ goto-instrument-typedef \ smt2_solver \ @@ -17,7 +14,6 @@ DIRS = cbmc \ goto-diff \ test-script \ goto-analyzer-taint \ - cbmc-java-inheritance \ goto-gcc \ goto-cc-cbmc \ cbmc-cpp \ diff --git a/regression/goto-analyzer-taint/Makefile b/regression/goto-analyzer-taint/Makefile index 462e051669c..b36cc5b692d 100644 --- a/regression/goto-analyzer-taint/Makefile +++ b/regression/goto-analyzer-taint/Makefile @@ -9,7 +9,7 @@ tests.log: ../test.pl show: @for dir in *; do \ if [ -d "$$dir" ]; then \ - vim -o "$$dir/*.java" "$$dir/*.out"; \ + vim -o "$$dir/*.c" "$$dir/*.out"; \ fi; \ done; diff --git a/regression/jbmc-strings/Makefile b/regression/jbmc-strings/Makefile deleted file mode 100644 index 79788e2eb69..00000000000 --- a/regression/jbmc-strings/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -default: tests.log - -test: - @../test.pl -p -c ../../../src/jbmc/jbmc - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure - -testfuture: - @../test.pl -p -c ../../../src/jbmc/jbmc -CF - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CF - -testall: - @../test.pl -p -c ../../../src/jbmc/jbmc -CFTK - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CFTK - -tests.log: ../test.pl - @../test.pl -p -c ../../../src/jbmc/jbmc - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure - -show: - @for dir in *; do \ - if [ -d "$$dir" ]; then \ - vim -o "$$dir/*.c" "$$dir/*.out"; \ - fi; \ - done; - -clean: - find -name '*.out' -execdir $(RM) '{}' \; - find -name '*.gb' -execdir $(RM) '{}' \; - $(RM) tests.log - diff --git a/regression/strings-smoke-tests/Makefile b/regression/strings-smoke-tests/Makefile deleted file mode 100644 index 79788e2eb69..00000000000 --- a/regression/strings-smoke-tests/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -default: tests.log - -test: - @../test.pl -p -c ../../../src/jbmc/jbmc - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure - -testfuture: - @../test.pl -p -c ../../../src/jbmc/jbmc -CF - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CF - -testall: - @../test.pl -p -c ../../../src/jbmc/jbmc -CFTK - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure -CFTK - -tests.log: ../test.pl - @../test.pl -p -c ../../../src/jbmc/jbmc - @../test.pl -p -c "../../../src/jbmc/jbmc --symex-driven-lazy-loading" -X symex-driven-lazy-loading-expected-failure - -show: - @for dir in *; do \ - if [ -d "$$dir" ]; then \ - vim -o "$$dir/*.c" "$$dir/*.out"; \ - fi; \ - done; - -clean: - find -name '*.out' -execdir $(RM) '{}' \; - find -name '*.gb' -execdir $(RM) '{}' \; - $(RM) tests.log - diff --git a/src/goto-analyzer/CMakeLists.txt b/src/goto-analyzer/CMakeLists.txt index 354069d913a..0ad6aadc0de 100644 --- a/src/goto-analyzer/CMakeLists.txt +++ b/src/goto-analyzer/CMakeLists.txt @@ -21,7 +21,6 @@ target_link_libraries(goto-analyzer-lib util ) -add_if_library(goto-analyzer-lib java_bytecode) add_if_library(goto-analyzer-lib jsil) # Executable diff --git a/src/goto-diff/CMakeLists.txt b/src/goto-diff/CMakeLists.txt index ebaec4b3b99..080bb643e66 100644 --- a/src/goto-diff/CMakeLists.txt +++ b/src/goto-diff/CMakeLists.txt @@ -23,7 +23,6 @@ target_link_libraries(goto-diff-lib solvers ) -add_if_library(goto-diff-lib java_bytecode) add_if_library(goto-diff-lib jsil) # Executable diff --git a/src/goto-instrument/CMakeLists.txt b/src/goto-instrument/CMakeLists.txt index 95c707aaa76..30350ca03b2 100644 --- a/src/goto-instrument/CMakeLists.txt +++ b/src/goto-instrument/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(goto-instrument-lib solvers ) -add_if_library(goto-instrument-lib java_bytecode) add_if_library(goto-instrument-lib glpk) # Executable diff --git a/src/goto-programs/CMakeLists.txt b/src/goto-programs/CMakeLists.txt index 1cdb9d0425d..6f00811ad4f 100644 --- a/src/goto-programs/CMakeLists.txt +++ b/src/goto-programs/CMakeLists.txt @@ -4,4 +4,4 @@ add_library(goto-programs ${sources}) generic_includes(goto-programs) target_link_libraries( - goto-programs util assembler langapi analyses ansi-c java_bytecode) + goto-programs util assembler langapi analyses ansi-c) From 8dc0d740572c925e9fdae2b28394a2dfdb74d79b Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Thu, 17 May 2018 11:15:33 +0100 Subject: [PATCH 08/12] Remove obsolete jbmc-cover tests --- .../jbmc-cover/unique-bytecode1/Test.class | Bin 301 -> 0 bytes .../jbmc-cover/unique-bytecode1/Test.java | 6 ------ .../jbmc-cover/unique-bytecode1/test.desc | 7 ------- .../jbmc-cover/unique-bytecode2/Test.class | Bin 262 -> 0 bytes .../jbmc-cover/unique-bytecode2/Test.java | 3 --- .../jbmc-cover/unique-bytecode2/test.desc | 8 -------- .../jbmc-cover/unique-bytecode3/Test.class | Bin 292 -> 0 bytes .../jbmc-cover/unique-bytecode3/Test.java | 4 ---- .../jbmc-cover/unique-bytecode3/test.desc | 9 --------- 9 files changed, 37 deletions(-) delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode1/Test.class delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode1/Test.java delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode1/test.desc delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode2/Test.class delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode2/Test.java delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode2/test.desc delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode3/Test.class delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode3/Test.java delete mode 100644 jbmc/regression/jbmc-cover/unique-bytecode3/test.desc diff --git a/jbmc/regression/jbmc-cover/unique-bytecode1/Test.class b/jbmc/regression/jbmc-cover/unique-bytecode1/Test.class deleted file mode 100644 index 8fa774304fd6c9a88db55a668f645bad89ff2495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmYL_y-ve06ot=q(u9QmO)LnBu`tku1yQjeF%=k6u`oHos$5zZ1(zq_Nm!VfkQjIX zo(LfX90w#UUEk~D^Ic#0?d#uZ*BKw$7Zb z7Nw~tx|~yq7uq_(#^7>1(|39}*KRs2d~MzIFo2!H>+1Sc-~9RWV!5g-b7BLWP0X#| z3tSs9TI?1CLI1zic{wwc$2JtF3rjKR1xIAH#VpLN-Dk)X3qi^~X+%DNHO8;?fM|fb l(P%SyKz1+k`28Lj)i8N;%P(N_oN5O32_+vq2-X{0`v-w@HDCY$ diff --git a/jbmc/regression/jbmc-cover/unique-bytecode1/Test.java b/jbmc/regression/jbmc-cover/unique-bytecode1/Test.java deleted file mode 100644 index 8ffd0be984f..00000000000 --- a/jbmc/regression/jbmc-cover/unique-bytecode1/Test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - public static void main(String[] args) { - for (int i=0; i<3; i++) { - } - } -} diff --git a/jbmc/regression/jbmc-cover/unique-bytecode1/test.desc b/jbmc/regression/jbmc-cover/unique-bytecode1/test.desc deleted file mode 100644 index 1ac356b5204..00000000000 --- a/jbmc/regression/jbmc-cover/unique-bytecode1/test.desc +++ /dev/null @@ -1,7 +0,0 @@ -CORE -Test.class ---cover location --show-properties --verbosity 10 -^EXIT=0$ -^SIGNAL=0$ --- -^Ignoring block .* java::Test\.main diff --git a/jbmc/regression/jbmc-cover/unique-bytecode2/Test.class b/jbmc/regression/jbmc-cover/unique-bytecode2/Test.class deleted file mode 100644 index c949f8d85a47b363eb9074cd1767f0b7ef1e7878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmZ9GyAA:\(\)V block 2, location 4: bytecode-index 1 already instrumented -^Ignoring block 2 location .* file Test\.java line 2 function java::Test\.:\(\)V bytecode-index .* \(bytecode-index already instrumented\) --- diff --git a/jbmc/regression/jbmc-cover/unique-bytecode3/Test.class b/jbmc/regression/jbmc-cover/unique-bytecode3/Test.class deleted file mode 100644 index 7cd485fe136508e66742524c696d267ac2146d40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmYLD&1%A65S%stX{xC|N5M-$d#D$W(u*JnQV)vvBz{OFji9l#k0l<29{K=%DCvAb z^su|Lv$MPNclr4RFhI+Ph0ueEC!OjJ8V;HQ`C?2M-vWD>=4tUJFuJ{^z#MH?N>H1o zxq3f*#A>&Q;*5+tOtP!epKlMlM2%C;dkeKMUN_Na6u^TYz=jjRg~MBVBnb7epGEn) zKZ`diDbS%Aiw-N)QBLIQjgo=B0>J~jHmk5&FK5V+KoBt7B}q$oyh)!+j?2ag74rn+ QF8BFI|1x1vR4sAsA6o$@B>(^b diff --git a/jbmc/regression/jbmc-cover/unique-bytecode3/Test.java b/jbmc/regression/jbmc-cover/unique-bytecode3/Test.java deleted file mode 100644 index 857bb865a7d..00000000000 --- a/jbmc/regression/jbmc-cover/unique-bytecode3/Test.java +++ /dev/null @@ -1,4 +0,0 @@ -class Test { - static int x = 0; - static int y = 1; -} diff --git a/jbmc/regression/jbmc-cover/unique-bytecode3/test.desc b/jbmc/regression/jbmc-cover/unique-bytecode3/test.desc deleted file mode 100644 index ced64111931..00000000000 --- a/jbmc/regression/jbmc-cover/unique-bytecode3/test.desc +++ /dev/null @@ -1,9 +0,0 @@ -CORE -Test.class ---cover location --show-properties --verbosity 10 -^EXIT=0$ -^SIGNAL=0$ -^java::Test\.:\(\)V block 2, location 4: bytecode-index 1 already instrumented -^java::Test\.:\(\)V block 2: location 5, bytecode-index 3 selected for instrumentation --- -^Ignoring block 2 location .* file Test\.java line 3 function java::Test\.:\(\)V bytecode-index .* \(bytecode-index already instrumented\) From 03d6f5b199bc3c16d2cba0aad3df929c6feda320 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Wed, 16 May 2018 18:08:30 +0100 Subject: [PATCH 09/12] Shorten goto-analyzer-taint-ansi-c tests to goto-analyzer-taint --- .../goto-analyzer-taint-ansi-c/Makefile | 19 -------------- .../taint-basic1/main.c | 16 ------------ .../taint-basic1/main.o | Bin 6096 -> 0 bytes .../taint-basic1/taint.json | 6 ----- .../taint-basic1/test.desc | 10 -------- .../taint-copy1/main.c | 13 ---------- .../taint-copy1/main.o | Bin 5519 -> 0 bytes .../taint-copy1/taint.json | 4 --- .../taint-copy1/test.desc | 7 ----- .../taint-member1/main.c | 24 ------------------ .../taint-member1/main.o | Bin 6289 -> 0 bytes .../taint-member1/taint.json | 4 --- .../taint-member1/test.desc | 9 ------- .../taint-memcpy1/main.c | 15 ----------- .../taint-memcpy1/main.o | Bin 5637 -> 0 bytes .../taint-memcpy1/taint.json | 4 --- .../taint-memcpy1/test.desc | 7 ----- 17 files changed, 138 deletions(-) delete mode 100644 regression/goto-analyzer-taint-ansi-c/Makefile delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-basic1/main.c delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-basic1/main.o delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-basic1/taint.json delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-basic1/test.desc delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-copy1/main.c delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-copy1/main.o delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-copy1/taint.json delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-copy1/test.desc delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-member1/main.c delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-member1/main.o delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-member1/taint.json delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-member1/test.desc delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.c delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.o delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-memcpy1/taint.json delete mode 100644 regression/goto-analyzer-taint-ansi-c/taint-memcpy1/test.desc diff --git a/regression/goto-analyzer-taint-ansi-c/Makefile b/regression/goto-analyzer-taint-ansi-c/Makefile deleted file mode 100644 index 462e051669c..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -default: tests.log - -test: - @../test.pl -p -c ../../../src/goto-analyzer/goto-analyzer - -tests.log: ../test.pl - @../test.pl -p -c ../../../src/goto-analyzer/goto-analyzer - -show: - @for dir in *; do \ - if [ -d "$$dir" ]; then \ - vim -o "$$dir/*.java" "$$dir/*.out"; \ - fi; \ - done; - -clean: - find -name '*.out' -execdir $(RM) '{}' \; - find -name '*.gb' -execdir $(RM) '{}' \; - $(RM) tests.log diff --git a/regression/goto-analyzer-taint-ansi-c/taint-basic1/main.c b/regression/goto-analyzer-taint-ansi-c/taint-basic1/main.c deleted file mode 100644 index 5d06a69c547..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-basic1/main.c +++ /dev/null @@ -1,16 +0,0 @@ -#include - -void my_f(void *) { } -void my_h(void *) { } -void *my_g(void) { return malloc(1); } - -void my_function() -{ - void *o; - - my_f(o); // T1 source - my_h(o); // T1,T2 sink - - o=my_g(); // T2 source - my_h(o); // T1,T2 sink -} diff --git a/regression/goto-analyzer-taint-ansi-c/taint-basic1/main.o b/regression/goto-analyzer-taint-ansi-c/taint-basic1/main.o deleted file mode 100644 index eef88d71225af839feb707d2ea58a4b15a4b1df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6096 zcmbtYYj_mZ89rym02!i71Y5a?Xq47!NERYOv?;n9FD;IjsamUb-0aR~M|Nl8?5-r* zDi<$Ey;Q9hDWU@59^@vVNY%Dl5VxhZv8@)ow5W&>66nQNq3<_mc6S0U{^&jr580V> z-uL}(=ljmyanS`A%A;7K#Wt;s;V_L)Fj6gSi-j;~343kxoNGO|zY` zt0Pt<*>%rM~{OOsb{6-Z3&+$I@?!B(sK|iX`Ed z(?GPh@rz${${~nYUUqCkJ8nWK5Fko*;DEc7F+@}bSMLKp2ySoR1XpkT}VTJ;mi$pu*mWUHc z8HjP3eT8XXoy`jmm@1!`&;|-IgW#w^p{IEjJZb0_wy?oF8(HXnxypq8*NRuHS zlFCFuB}^sip`SEH?Nkd=B*xgFedNppEZ7(Bl=p?%h++NGX0v6)nr

PkL7xGaCD5 z%2iR@N@pTgh7I2?!Kb0;j;V_3u1P09A&EUYLJgJ?An?|z@+tiY2CGkIYS;}7JN4Oy z+M|C6KTriPoi@MWyr!&~%$Qbn#EB-%3^Fq77}e>FgDgxpz<&cz?@&f#ha0ZYR^b&k za+VTAa{L0I&ZoE?WL+I*N6DR6sT1S@JaKNU9PI*%Ut39!D(1(pVzOzw8 z@oNd~>tw0BZkA4Z#*nT6A=gSA|PjyRCVB4%aqYnP;TB-Z|0F$jEX|H<4hYh z!n9&WE7NKga3Nmzd8yWjI8LOEX+f8ZD3}^go3|QlbfYSdp{ITEwC>5gtCKb=RQOvB zpZ&s@dGt&C?Yas98vA*9DiXER5^^44)3D`rM43uy(!^*~%th!+XOi)U3F)&0R*q-Q8_iD3P9yAnLd z&w9zaQmiQ>g+8F$Ert`ZV!E4{Ild0`>xlk41%oCE=u6*`f@A&A6W5l4jwEs3q;P7% zp0xm6OMt2XyzDjQsP^C`*>kxdy<(mcq!vNthjU;gyL?S4(zw}b#PqoB=<%c-A?h`t zUPIJZdeotSCSboiR|!%>D8Oo~O2N{hKu1az?T!vn;I0DhD#E==;9kA**pen8JoF)x zt`XcLi>%jllwyt9*`}nSi%y#39boJr#_xHIp}@5Q?TjMYwaZGOc~eFKZW-W~5#09+ zaMuaA>mN~irO$OsOJTZ)RsO^(ATI^-QbPWLK)#{9v}@oN@(#I17wr9u#^{Sn5xW7& zJ7zKX7K87`gcg|)3N!%+?LPXLLMO=JSP!+r!YJgO;^MSvVwFt?{IBclgZ1^)HTH*X z)+rwdv$KX71^>i_!U08v@r9)n9^sXRP`MB)n}=X>NI<74bYAZt6mDYb9?3{1&6c#8 zX2anXlMOX{!a3f9KHfupe3Fop>^O>3MZ%F&Q$q6aqU6+qQj*bi3Nc&&wF@YQmY};V z6tD$U%Tr2_#+yRf*sDtcPIkkTIjnM419~-}Pr11O?EpG`s9cN$)ie{tVkS+lVi3qI z??1NJG3s>mFE)S2&f@Gu*G$n^hC1nwI_b~G4a<6-3I#CpP#>Q>Rl(3xRDMf)N#(Xv zI1SsOw;g(0%bIK(6KvZ#mYp$f&PI|q-N?vU?b+7vz;?eADjtQZgnVSPY-EqaYvS?Um5 zVb)eSY1kv4SwH1Vk5aSlIp~`8sAtw={2`@Rvwf5=DP>hUVLK=^Uj;9LO-rbPf9BCA zLxEWya>tVQGz|infA0>9rJj( zd#+EFs)#gZ#MyklSEi{(#|6ffiP%Y~papzcNEh=C-LG&#raNk-v<+82x?X~58}F32 zaWq?pkc@uAw{qFGBkvzGFC6~WrW>}uz137=n4to|0W#lUSL>&{5? zD>~)*6|8n1uUtkb%X#kn-WUD0bd7s4!+*jgap|AS-DvKWbFj5j-Yc{FUXnUc|0}32 zpYar}0SVQnA!4rxZ zwT3S$l~Htn7Fx_AZN?jrGi&F7^12L}^QrGeQKB?X$n=~Sm z5WD@5x*t-XLqR|9#_tToZzG>mj9>nu7k>fO?iTqbkN+2ZyD}!x&d*sZ z5wMl+0q`4S{bmmx#k|E6`5J#+8B^#ngzgse7M}Czwv5({E)Gjk(K+bNLGM=N!RwR< zIS=l){3E5VP(#H$!2913`Bsq!IljvWkCdhQjfgXN7qE8$dz*V&{2mN{Aci-H0W)I% z;_T)A8br_Cj)gylzQMaOcXgwocB7%b$SeQo>FVTrmAZV3>+*4X-Q2rHb%DDJ+{e)P z$)tW=;Xv7&q`OrO|B1iKGfvi^>*pbS0*w6`66L?}AxxddeZTg+g_h1(SNLsD@&I-4 zTcY60-{kqd?r%L(zkT6BV8}oGs{jPtcKiy&*uL-%590)N@b)jlXl8xh;X|}{`S^5O zstL1>DwCS`co!xO5~p5(pNcYud#ih&UlcQP7#LfBx9*a25SwcxO?L*|!M_w-B=3MUH@Kkvo&r|N=k^J$Uee{oNC8@;Rvo>-%Z@X~*r@@fMaG@Z$3z$F)TqsP0b@|KKt0pG9a| z=z7wN$u6 zHy!lQTY8H>L~FKD7F2`+2L-S;MT+^vV`oqJpdWmyM9!He`NU6`M9p5&8~#oyrrkyB zgxf=b>C)l8!OouWbjjzNy8(Ysag!%y4_q|EW4ScXf~_+oUuN7Zxn&A-V(u$n75)!R Cp%bkD diff --git a/regression/goto-analyzer-taint-ansi-c/taint-basic1/taint.json b/regression/goto-analyzer-taint-ansi-c/taint-basic1/taint.json deleted file mode 100644 index dc9129a43a8..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-basic1/taint.json +++ /dev/null @@ -1,6 +0,0 @@ -[ -{ "id": "my_f", "kind": "source", "where": "parameter1", "taint": "T1", "function": "my_f" }, -{ "id": "my_g", "kind": "source", "where": "return_value", "taint": "T2", "function": "my_g" }, -{ "id": "my_h1", "kind": "sink", "where": "parameter1", "taint": "T1", "function": "my_h", "message": "There is a T1 flow" }, -{ "id": "my_h2", "kind": "sink", "where": "parameter1", "taint": "T2", "function": "my_h", "message": "There is a T2 flow" } -] diff --git a/regression/goto-analyzer-taint-ansi-c/taint-basic1/test.desc b/regression/goto-analyzer-taint-ansi-c/taint-basic1/test.desc deleted file mode 100644 index 519166e0034..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-basic1/test.desc +++ /dev/null @@ -1,10 +0,0 @@ -CORE -main.o ---taint taint.json -^EXIT=0$ -^SIGNAL=0$ -^file main.c line 12( function .*)?: There is a T1 flow \(taint rule my_h1\)$ -^file main.c line 15( function .*)?: There is a T2 flow \(taint rule my_h2\)$ --- -^file main.c line 12( function .*)?: There is a T2 flow \(.*\)$ -^file main.c line 15( function .*)?: There is a T1 flow \(.*\)$ diff --git a/regression/goto-analyzer-taint-ansi-c/taint-copy1/main.c b/regression/goto-analyzer-taint-ansi-c/taint-copy1/main.c deleted file mode 100644 index 65b8ab36cf4..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-copy1/main.c +++ /dev/null @@ -1,13 +0,0 @@ -void my_f(void *) { } -void my_h(void *) { } - -void my_function() -{ - void *o1; - my_f(o1); // T1 source - - void *o2; - o2=o1; - - my_h(o2); // T1 sink -} diff --git a/regression/goto-analyzer-taint-ansi-c/taint-copy1/main.o b/regression/goto-analyzer-taint-ansi-c/taint-copy1/main.o deleted file mode 100644 index 67438a63d97b9bfc9918660f18a79c15076d2f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5519 zcmbtYYj_mZ89rxMbTb4OjT!-q)L3bim~4m$DP1WOyj91`h*~dos~pe zMXS~u_10QS5fu`yN#rJ=NEIT;#qGrwwY5a8y@*Jy^>3?vzd5tB8|dN>_j!08GBf9W z-|s!&_nmL%&I_iWA3lqvJ8aW(4Tq_Gnvv~ryOPcw|{uq_YTM6&sVFU4OmlpiVly`>Bv7Onb)vhH?$4I!g z)5VVdysBYl&Tw)KvmM*8aI>MqvD=-7L|Zmd-)_1Mj?wNIxg6*l+HKda*DXEMb(`VT zyWn^6XU?ooG>AVEc1Kr?;ivTQIcCyLvt!;5O=@O{CBz~j%git(>~?h+tO^f>UMm;a z(h_TFv717s7YD6DaYDPRJO`=GLA)=!_u4Cw4q2o$K5YMt}?31#~uuK=#HK>uroP! zJW~#aj7-Mt$eB4-voA!k($W+5#S?b60~?cMY~(<^zz5=c!vk?P?!?jHItlo-0{`T@ zq^6!yl|bFG%VLl znMj~^h9Y$<}sBI86Hj*>jEhE`>D{a)N?}a8pll)+~E@4|a zSGQbNBfoG|T|&4s?x~P?T*H1N;IGdJ9#g`nMF;^;k7G*ft$HSJu)62tjYs~$HaU7a z4Ee^A_|&$%nQ=|4UUw2{(?we59iu+yI!MJ_99Gqw(I+)wg|{K{9^nNWKVOQ$0(SbA zxTeXMUwPTpGp^LiAv9&?C6{PsPD85NhbS>9!jKj z2YABw38YP_sb3{EfkdRj**m$OOj0Rmc8aMD<4h}QbTYNEn+vsCnJqCxcO1QosZAai zQ7|QyGjB84#2HGsnXVp#tLHpj^fqIoE``BL>!g>y%)&1**z*QEa_)btvUL~M z-MlU%_Na!blSzltI%V%yqk<5!E!>2EEorrh0%L5#=1SWFEd{YO}D6CG+Q{2^cb zSlHA}m13YgLlm13#U?~Cb_QgfrnJ_{(ep(Z7c7%v$gX0_j%Vj@tb}D)NmI8hq!kc1 z0&ycDUMLVRnqPgyjgFD|a`a-s`n?`0c5XTA#TzQIW{oVmzh-wBj&3D2FEI;z1L!vp z{Ut#_mkMa*-B65rF6|3ya6G$oeI;l;gWi%wS3*4N0l1z3FB5>5@0N}jkC#kx^a??G znf3^%uXYzrEEt_Wo(_O*MWK+QL8?+9KA}w&RitLCYHlqwWbm*H3jM+ zc^q=oFoC-UxN8XaYJq#r>Jb$~!uHUQw&+^HJ-+1NwSARXlXku>V`$<4E$}`t_7UUv zeMUKYoj|+(32DfFU$?Rnq}N@FEha!-3FMVPz9FsNI8Bbu0xFKz8c}_sE@!dGthc;l zH8@ua{7tN5toP`#nox98Ph}4fKiNPY=t6bdJZZ?T>dPys_Utd(upFez$%aH=Ls9@5 z_ew+dGr6=9;9(9d1?W-&O$pHUz9U2;wv!@B3u57vR}bm#N}TBFf#Kbt>n1u=&|NM^ zZx&FqpOIoTcmxG@^V&*)b39wzL-KMhpw|NWv`he<1+?`=l{jJR>4;4xO&SfwxoY?eLwFqqhj@CznLu(o<2i?F4P62U2?= z)fv`i+Zo1k=UTRF+>+NbOmzeGc~Y;`-1;x6c}TjbbNoke;5c$L&+?y2CD~a$gK3$( zv5Yww2{#M=9 zOsEKg!8|y$BR>#8Km4cET-?Y{$`E{Eey9BefEHwwY{9w4o zpGR>2ZjP|;P+EV)-{myg;Lx4R4<1fnx7~~x3Nar9#X(Tq!_(@$93=PoBtPaKO3lGQ zRU*Ot`-$WpPAu#`zP}7TX?Vu!uGa+j1A9NP9{~1)g#D0@{V@Nx)EpcXC2ZWEN7xSt z?1%VgW!U~R;*dxS5mlxvh#LCGycvMoch zJ<4ekzflN7lrJN`ZlBu8b&$(%(Ov}W}9A+&!I^TEc7kr;I zu~>TG#P!I0K6scVP%sF}L5VeuiPXN0*NUL?F7VCyC0}`jj^(vpulFwW9UM_|a3Nn& z$-!LOcFn=3i!=-0&Yt08 zsQMCm&SmPeJ`sB4V&AtVe5W)q$XpsjlE#|w*taHUhm*>b+5y3}tv%nk#Cf8HB+mQ?QzFR5mY zD^V7!s4RMYtUmsc)J*SvUVAT<1@89~^GZ<`z5GB~ASk({7L@Y=gmQq&;yGXHHF9*d zzX4~KHefYhRcQnK4-7$NtilegqAgwHBd+DoRh+B+QO3)qbw2HSzCfZ$y2QSY_g7-~ zTIC^=O+OU$L&5W?CPztaK*4x*veCEgR1X;if(wz2d{3D@vHtr=qaj<1x^03Gj zAM^}QTYniq@%0aNBZ^+jQ-T$EKfwBF>we`MjoNwH_wW_IP>KbaK`H$*UtP(=;>lke ziB`kE)m{y4MGkNC(NQo1zQ|Yk>(a#FJP8VBfEUViTSlj=l~+vxdJE7Srq4$#w4I08 z*7&SpI|$!VT3_Qkxa;6WAHOf~i!!zoriXX&(M-9Umwl1gjRwlFb`Qz%Cd*N~x#wHe z4qjYK-zutc)uBKak)D zC7}F{G;aw8s1CF8~lQ#k-!u}HwWU?$Cfnw9yr^%`UgHm2|vmKvYX4% zy}pd=i{GEbTjQHNsXOg?g3K}XEm|UIX@&O)gb?%FTrVos5;#+d7?}88#7CB>{|M?o z5ePZ@4#zhz`hq49-hhe_7KF;A{u$5jD?Kkq2Ys32hsu1nT-cxxMkLeU;}_}p$k%R> z9xNV+5AqQuJ?{%E{zA)7^fpC~e&AEQ!iRGFl_%A|m23In5CgoW1Mv^a1O7V*{!v=w uhx#GEkh&mg+V8W?ERsRuejY7J{0ImKO5p_v-qJ&!{W!?3VIE9bI{ptNU{b^Y diff --git a/regression/goto-analyzer-taint-ansi-c/taint-copy1/taint.json b/regression/goto-analyzer-taint-ansi-c/taint-copy1/taint.json deleted file mode 100644 index 44a841f0cc4..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-copy1/taint.json +++ /dev/null @@ -1,4 +0,0 @@ -[ -{ "id": "my_f", "kind": "source", "where": "parameter1", "taint": "T1", "function": "my_f" }, -{ "id": "my_h", "kind": "sink", "where": "parameter1", "taint": "T1", "function": "my_h", "message": "There is a T1 flow" } -] diff --git a/regression/goto-analyzer-taint-ansi-c/taint-copy1/test.desc b/regression/goto-analyzer-taint-ansi-c/taint-copy1/test.desc deleted file mode 100644 index af2d62eb456..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-copy1/test.desc +++ /dev/null @@ -1,7 +0,0 @@ -CORE -main.o ---taint taint.json -^EXIT=0$ -^SIGNAL=0$ -^file main.c line 12( function .*)?: There is a T1 flow \(taint rule my_h\)$ --- diff --git a/regression/goto-analyzer-taint-ansi-c/taint-member1/main.c b/regression/goto-analyzer-taint-ansi-c/taint-member1/main.c deleted file mode 100644 index 5c372777154..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-member1/main.c +++ /dev/null @@ -1,24 +0,0 @@ -#include - -void my_f(void *) { } -void my_h(void *) { } - -void my_function() -{ - struct some_struct - { - void *data; - } whatnot; - - my_f(whatnot.data); // T1 source - my_h(whatnot.data); // T1 sink - - // via a copy - void *o=whatnot.data; - my_h(o); // T1 sink - - // copy entire struct - struct some_struct whatelse; - whatelse=whatnot; - my_h(whatelse.data); // T1 sink -} diff --git a/regression/goto-analyzer-taint-ansi-c/taint-member1/main.o b/regression/goto-analyzer-taint-ansi-c/taint-member1/main.o deleted file mode 100644 index 209a3a0924abf8ccede4e6829cdeacce84e7a3b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6289 zcmbtYd3+S*8UDUmux5ZP8m%0)rA_Y|lMRten^Y zP!tfXS3U3+!cF9oL!??;Er@ArHLWcb)LtTDSV25WrO!Lx?Cu1*_(%8mOMbsOzUO)0 z=RLmnn;Xs@cTT8=4T(8%lc|TfYi4t9%Y;Q^M65C+EgYJ>|rVtmW8D zVoW_TVWmtKdZsaLSoY~L+^I@gw#oX;k{fU_IFYks-phS)wWIG8$DL%^t$N&Y%~;lP z+u3oSR@7daG2Kk6Zv|8C(*KBpoOa_d#txnddF>E8%ex2#o zWI>t5WyY$B)ryO>nQk%N2*Xd^8EP|JBW-2@&OXPq=J4$>cYs5ini}OZ2Ba#;aS5jH%neV*U0sRU5Wr*WvlRP_-2|?W~os0MLJLQ@UMG zju}&UE)WLnZ;CnTHmDS5OxhQvcUTuEx!AsFcSym1HmvgajMZwJ@s`O9W`y66hSy{H zoKSVlu`^l2&a#28OK?ls)TcTo0&~Jcl31g|0r-0&c>H(OP}T7SgSSs$YIL%Z%9-q> zCmZXI{UiMF$%yIa7c`#LlCx4-%dRopSklTOSUK0M$z)vwDANdat4>)d*JA~OdK^=> z3ys*I`{W3uVJB~C)OBUT#EUL#ny3dMboJ8l<8>>eBY+Nc*wWY?+S17C1}C*4Wb@FS z(kRdKfiV6HcS^CO;ZiU=xU7UvCEL`hFD{qsLE+L>1EaS;Vm6B+9|lYO;G4SkL7%DDUWM+(}e9Av8ySdD(;>Cckz zGX(auK}5d!pNg~*b223OsmhDIIwfK>kZIo{JJjg6XEq%h>$9JdY@urWeJ80^lVgmX zy186fU`rR@j9_d=Fit}-gyJurv&)~&Ic(D;)RE~gIRciDkB|K8NF>0|KL3R~V zb`Tr6p&XWJ$1TIQkyb$50K^T1I9ec%xv&2*<&V@+dkCK?SkLN^BO`;XXRa^DiuQ$` zs5@<@YuIt!OUy359`x&p{<}qo8U^(Cc1e*DLFmSH<)Doe8cZ793jVAE;5q^vD*(@a zQ9hA1D!NE6mnGp;8bS5KrIgQ(YndM!~$eQG7#Bw){ZSdI)2 z!Zxig2TM(XdPokfpSmV+R|9u7;hrmS&s#O1tV;+F{m7;B1^1v*N}Rv49BbUkwWLg4 z>=9jjB^XzN@q(oG{jo}TJdi?a)miG`3-i?EiyNQcr$jyBt!lAHG3}z!nf7#xlR||~ z7_H9WfxYD713`!}VjoRT!Mw&SfB z@70nTx+JMx3Y#wz0E0>ZUYo`32RLn7j*WZ~``+dE_KzD`gJ=cF_>YbvqJI8i)M4GB zkD~0f${+ZVP{LOTm4A4b+^Y_*SXNGIuj>|CZ&C4OP<$B_pU^DX7RlC^T`4@cYQ7wy zy~r2hV6=;W5H0xK9Xd$n{79Iica%>IBn9OLIeE1(*_bEyO7*Lklr!1O$wF={fu&1e zY0DhigeY9bn=7;y11jDdixYMRdm5HMMt-_h)Ou1KqwJs{>%u&)WfY)0D29e ztDGWq8=$W}Tp>oD8k%|Haf^mlG3dA}`i7?&moe0pEYEh7wcK%w&A$WocEH}reOny#3N~dVYT3LtXQY@mwdg`S zxu8~Ew@+^9m9N^5{a27yla+8gYtPFi+tWr0!#oLOn^Q2R(P-4g^Ky46FSELz48c+0 zr(>1y^#Dg}yWtL*_L{+c{bsW>G>tQLuVkiDR$Io(uz`s9^=!cPd8B3@shP)MJDpb) zy0n;WF~-fnGP2fBi|JA|&Ej!0!EWT!0_M^7r&HhB)aNGts8qng0i-ySHP7_1ZszaF z4TZ$$34r)M`deuaeCvU4w{UW97KeAU2?6dUgPzUdOuLoO$AmMNC$(90Hh|%HmHy#G z&=14^JpL|C{E6NZKi(NIoA-Fl5n}d0haTu~8(@A$bhrBk-@)IN8;a#PCp6HXaq;|4 zj-cJf)#zP(7pHj{liclm@6k>AZOc5~~Y;-JxkRoBOQvC^xmocm={b6xsDSf3TEYg%d|&0soX+cEYkP z9DgyCE8&H{=N=>=n+kd;m=cg2QN!GlKe{$3&PP?X=%1|r& z*xN$Ai|)`Tw1+PDow!B`ukh_#$?uU1M*|!K2eB1=MOiD+Cj%4I3YfS8CU$y(pmWzv zoISyZQa6YhnJm**`F!aAt9|X)@U8OjVn!388tUY1HQyGHKbv$-Bd%LC8E!)aw#jVN zT91X!#OwIOrErV0-IIK%w!TER!6)0uAMYQjJA!R3XB+r}{-rkBX0@3(W#+uudO`p0 z(1QM~ZWGGoDJqxEKGxIx9l4>n0hG!G&$kfsCQ&Y%`JR9yD8;y5Eb~2ZWe=6hFMLza zQ^L>qaTr?4lV|wyauM*qb`&dSIYO`;A*g)TNBkv!qU<5gpPRk(e9ou6szm!7?<_~_ zb?hVN=T1;}g8Ek|#mQ>o*QhqH$e#E03VXpg4U%GU)DsmLuHk?Zye5sMV z=%)~Z=cN&A-tM!U;u+f+KrDQ9Kv9YoqUR{px_BqhJ1K}S`I4iUx_mW%%O8{@#T=pJ z?&7P;iCUO%3Pa~A2)fEEr{5u)fA6ECbYAw2`~!bU9$wsXily^1?+Vy$n^UuTuztE= zZx`$h(O$=-SGdG_qO*D5SBYS<8tvvUaLl+SHYs)(zc6EeL>NMU;zJlZ&uiEM8CLw6 zj1b%GYur<-;#FQ);C&PW^uDMB+``?z2pE9uz!QcKWqE^atmz$tcky%MW(*S*JpFJaBw1WStU;7WM6Z;ajBn0I(w+XEBc4VbX|2owD4q6r>YKDs+dxfhi05yl1J z>)|-gc?Voi!Cjyq4;#k^1l#Amuc<=gJU`#S_u5vQ{PA8LQ1a$|;m!V_HwS!gM)mgQ z19)?=WQ7twaD;kv2bLTNn*Jg1KcYoTDR3WShl3Hc_Z5xDMLxQW2h9HjYyKTrql6Fn z7X61mA=gtu`X@^f^H1qrKd}xKq x7i<8=Y$;p{*&JZpN*E#=iV)t~Bi@~hcjwW&o;=5V^)|`t5{S};9%G;%{1+B%P;&qP diff --git a/regression/goto-analyzer-taint-ansi-c/taint-member1/taint.json b/regression/goto-analyzer-taint-ansi-c/taint-member1/taint.json deleted file mode 100644 index 44a841f0cc4..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-member1/taint.json +++ /dev/null @@ -1,4 +0,0 @@ -[ -{ "id": "my_f", "kind": "source", "where": "parameter1", "taint": "T1", "function": "my_f" }, -{ "id": "my_h", "kind": "sink", "where": "parameter1", "taint": "T1", "function": "my_h", "message": "There is a T1 flow" } -] diff --git a/regression/goto-analyzer-taint-ansi-c/taint-member1/test.desc b/regression/goto-analyzer-taint-ansi-c/taint-member1/test.desc deleted file mode 100644 index 0c71bfa735d..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-member1/test.desc +++ /dev/null @@ -1,9 +0,0 @@ -CORE -main.o ---taint taint.json -^EXIT=0$ -^SIGNAL=0$ -^file main.c line 14( function .*)?: There is a T1 flow \(taint rule my_h\)$ -^file main.c line 18( function .*)?: There is a T1 flow \(taint rule my_h\)$ -^file main.c line 23( function .*)?: There is a T1 flow \(taint rule my_h\)$ --- diff --git a/regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.c b/regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.c deleted file mode 100644 index 806b14fa2b4..00000000000 --- a/regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.c +++ /dev/null @@ -1,15 +0,0 @@ -#include - -void my_f(void *) { } -void my_h(void *) { } - -void my_function() -{ - void *o1; - my_f(o1); // T1 source - - void *o2; - memcpy(o2, o1, 100); - - my_h(o2); // T1 sink -} diff --git a/regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.o b/regression/goto-analyzer-taint-ansi-c/taint-memcpy1/main.o deleted file mode 100644 index 566d8da99a72e7df83eeb8264b5ef93737bea913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5637 zcmbtYdwdkt6~1?u1u{fdjja;IqM=$_Lb4$uq;^XkP}|bcGF9t?j+5Ql?8xp+oSiiU zYZb88`e@Z!Tk%QdO@KsR0*Yu!L`Z>C(o!R?+ z-}&x2=bo9{F1`4Y=vY>pveO1rKH-kx79C4-JKGJ$hZf8>%SgB0%#=mE!%Vwb7I`Z& zzKJn;WA{S}E7GEhhCP^PO7oktzFP9kw&mwA!?^ z=@=>3b~@RxIa0%w1;Z&c%yewS!p(+u$8K{PQmy$^eVgevI7XXe6be9WXtQ0rUbpmI z=WN5NcOk&V$AVd(Y7igtMn2WvN!oWN#ougzlTdu#8TJ7>b%w*#lO`MacDIws z@w$RtbW(hksw1EG1ymjAlj}wdLFyy6xax+ycaQYIkUZB7T6%DJ)PCQouvK6=A{`sy)QYy z`(R05l8qio&}RaAlz=|#4hh*3hW-LmN6+U00aD`Zta>K7L5uJ!FW_~pdcn{vNMPse zOV;U@Z6O`x`=WJb+OS+RW5V*f{S;`nrKNPAoE*h!NA-Hw5ppj?^+ME`p@5IbcSq|| zwpDO-r0F0eaFl& zbdich$EYv34$`lXMC>)^cS}uJ;h8J%6v447cHY*crpZ@Kzx=AH)3xwoO}TQ~G|en% zNK6}HY(*GbldSQ}S@kOv$=Cyti4bsil!B;#Fp|pZ4w6w=IF3{)H4UqzCaNGW)f%^R zJ)Ne+*X#^a6QfNlZOme7(?TwEY9SlO8@l7@olI@^xQK!&nSwdnU>8hPq7&%q$+&vq zlcloH*{DKM`^uDwFMOJLpJFW)K7>!1bi0(-Q+9!@9w+bMbvdy+gP7VvI+Q72ef_gh zK?pHLoAG;5R&A!h7#p{x(zZa$0N;Ym*n-XY8a6{Xo)nIMy-P|^eS3~i-pS*(E+vp%rDUyQmu;$qWmsubw=AR;5H|sF6Cr*}Ab$JN>Jx5sg3OoW z(*)~xmP&~W!>rRbR$@gfMz7cGcEi!FwB{w|0N)7ujYO{m0bMSjuXr<(phijig6gYc zmv5*9t>#06neb$un$j5*6lYZ=?o zGC5l(>h+*rPt;fX)N=eP0ekfVDKS0_d)3-Xu+$W&hZJ$7(HRchwZL6VxZfAJ*Q`0I zVo2B?`k^hlR&ZC99lW-?5^LHnw&n~?j0yw18;spxye_L=KUt2?01^(uL83-P^~_+g z8E<$eR?x@?_&%&-tZVR?ANWe;xF%HG@UV1Lo@gs8N%6W;sWkTC_d5{w9>HDRlb~Ux461!)A$%YjmT|uNq5Kcw_w%sKiwV#<~l>m>6WEnu05olI` zn%yUeL~JKTa-$#?d*Ic>jY}$VqNfMOEdkvUqMIq`rps}Rb9B_?pOz9dJ_H4pTUQCN z!?VRbCNI|kdL5v-6+qj7Zl5cOv$dWM*L2#XVM?5+H?1Bv;ix8McMmI{rH)-hXTq73 zr5w*|$CwDS==*4G!(tj|9+dA4tum zjr=f#;0yCR?S~NbAq3sdv+5j z!shZL$8*@NH)4Q7*hj!}1T1%gaN!Z4*~lSub3^?VuR;SJ zi>&xHf2^DqrCBob2>&lPt&C}zc&Nd+CCBIcE1m!`A zHH~@9cjIxs@&sMVYqws%eZsfww6bMS@UBXh6|%O2rV{E_T?oC4y490Du_?!&@-gFO z%%}M3ikN61p_6Pi09ONWfoB`dzqhjA@R3w;DZSt_^=Y37eQ}|0)FQr98Xu%8jUGyL z0cQ(&f5lk`kGwFcthh6;=o4D8`iGXAYf13qVX8E z#hfkYi>u2$rrm5eFzgq-5odAr-ss|L*4TwQSV?uT%EwyG-;9!4mKQ3q$oM(xMrVQ`@L_{y)5C3de{9y8qZKtT@_Y(O=+O6FM< zj8`WceHSAhG71D2VjKCckXK^U3z{(t4~(?)yI|KY*tN;4^Ubsw&-pOV^Yv0wsVy^f zfWh9q*mHbC2$Aa4#Qchn2L7$_O6s>r>1{qb>ZjKi z*~fQFJGvA5{Ly4XOls|C1w(;KlK&NssUSYU~ z_nh)7zcg*6Fo@92zGThtvWC6Dd6}z!gB&3JT#moy%ebNR8cIAk{)wk`r>#hk z1*ZO)mIzu};e7={i1~G{my~KLoT)?%%)aDn{NytAK2X0wAl0DV&++bxUU3P8SD|7! z77PzbJs_mMNlR!G-r_rH$q=R< Date: Wed, 16 May 2018 09:58:23 +0100 Subject: [PATCH 10/12] Add JBMC README --- jbmc/README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 jbmc/README.md diff --git a/jbmc/README.md b/jbmc/README.md new file mode 100644 index 00000000000..b4605b7dcaf --- /dev/null +++ b/jbmc/README.md @@ -0,0 +1,52 @@ +[![Build Status][travis_img]][travis] [![Build Status][appveyor_img]][appveyor] + +About +===== + +JBMC is a Bounded Model Checker for Java programs. It supports +checking for runtime exceptions and user-definde assertions. +The verification is performed by unwinding the loops in the program +and passing the resulting equation to a decision procedure. + +[More info...](http://www.cprover.org/jbmc) + +Versions +======== + +Get the [latest release](https://github.com/diffblue/cbmc/releases) +* Releases are tested and for production use. + +Get the current *develop* version: `git clone https://github.com/diffblue/cbmc.git` +* Develop versions are not recommended for production use. + +Prerequisites +============ + +JBMC compiles CBMC as part of its build process and as such has all the pre-requisites of CBMC. These can be viewed at: [diffblue/cbmc:COMPILING](http://github.com/diffblue/cbmc/blob/master/COMPILING) + +Compilation +=========== + +To compile you need to run the command: + +```bash +make -C jbmc/src +``` +Output +====== + +Compiling produces an executable called `jbmc` which by default can be found in `jbmc/src/jbmc/jbmc` + +Reporting bugs and contributing to the code base +================================================ + +See [CBMC](https://github.com/diffblue/cbmc/blob/develop/README.md)) + +License +======= +4-clause BSD license, see `LICENSE` file. + +[travis]: https://travis-ci.org/diffblue/cbmc +[travis_img]: https://travis-ci.org/diffblue/cbmc.svg?branch=develop +[appveyor]: https://ci.appveyor.com/project/diffblue/cbmc/ +[appveyor_img]: https://ci.appveyor.com/api/projects/status/github/diffblue/cbmc?svg=true&branch=develop From f196e749627bc10ddcb0427a0c6e862e5a4ce3bd Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 15 May 2018 16:33:45 +0100 Subject: [PATCH 11/12] Update compilation instructions --- COMPILING.md | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index b1a5d45f856..92ec5012536 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -28,6 +28,17 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution. yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel ``` Note that you need g++ version 4.9 or newer. + + To compile JBMC, you additionally need the JDK: + On Debian-like distributions, do + ``` + apt-get install openjdk-7-jdk + ``` + On Red Hat/Fedora or derivates, do + ``` + yum install java-1.7.0-openjdk-devel + ``` + 2. As a user, get the CBMC source via ``` git clone https://github.com/diffblue/cbmc cbmc-git @@ -93,7 +104,11 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution. ``` pkg install bash gmake git www/p5-libwww patch flex bison openjdk ``` -2. As a user, get the CBMC source via + To compile JBMC, additionally install + ``` + pkg install openjdk + ``` + 2. As a user, get the CBMC source via ``` git clone https://github.com/diffblue/cbmc cbmc-git ``` @@ -183,14 +198,14 @@ require manual modification of build files. 1. Ensure you have all the build dependencies installed. Build dependencies are the same as for the makefile build, but with the addition of CMake version 3.2 or higher. The installed CMake version can be queried with `cmake - --version`. To install all build dependencies: + --version`. To install cmake: - On Debian-like distributions, do ``` - apt-get install cmake g++ gcc flex bison make git libwww-perl patch openjdk-7-jdk + apt-get install cmake ``` - On Red Hat/Fedora or derivates, do ``` - yum install cmake gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel + yum install cmake ``` - On macOS, do ``` From 29a88185e8b34945e59058a3d560b74882eced1e Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Thu, 17 May 2018 14:53:03 +0100 Subject: [PATCH 12/12] Build jbmc on CI --- .travis.yml | 6 +++++- appveyor.yml | 25 +++++++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7225e86db56..418404c6444 100644 --- a/.travis.yml +++ b/.travis.yml @@ -248,7 +248,7 @@ jobs: description: "Travis build of ${TRAVIS_COMMIT}" notification_email: "coverity-scan@diffblue.com" build_command_prepend: "make -C src minisat2-download" - build_command: "make -C src -j2" + build_command: "make -C src -j2; make -C jbmc/src -j2" branch_pattern: "develop" before_install: - | @@ -277,12 +277,16 @@ install: - make -C src/ansi-c library_check - make -C src "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j3 - make -C src "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j3 clobber.dir memory-models.dir + - make -C jbmc/src "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j3 script: - if [ -e bin/gcc ] ; then export PATH=$PWD/bin:$PATH ; fi ; - env UBSAN_OPTIONS=print_stacktrace=1 make -C regression test-parallel "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2 JOBS=2 - make -C unit "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2 - make -C unit test + - env UBSAN_OPTIONS=print_stacktrace=1 make -C jbmc/regression test-parallel "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2 JOBS=2 + - make -C jbmc/unit "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2 + - make -C jbmc/unit test before_cache: - ccache -s diff --git a/appveyor.yml b/appveyor.yml index 46779beda6b..64b0b0a7119 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,11 +53,11 @@ build_script: call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64 sed -i "s/BUILD_ENV[ ]*=.*/BUILD_ENV = MSVC/" src/config.inc make -C src -j2 + make -C jbmc/src -j2 test_script: - cmd: | cd regression - rem HACK disable failing tests rmdir /s /q ansi-c\arch_flags_mcpu_bad rmdir /s /q ansi-c\arch_flags_mcpu_good @@ -90,15 +90,24 @@ test_script: rmdir /s /q cpp\nullptr1 rmdir /s /q cpp\sizeof1 rmdir /s /q cpp\static_assert1 - rmdir /s /q cbmc-java\VarLengthArrayTrace1 - rmdir /s /q cbmc-java\classpath1 - rmdir /s /q cbmc-java\jar-file3 - rmdir /s /q cbmc-java\tableswitch2 rmdir /s /q goto-gcc rmdir /s /q goto-instrument\slice08 + cd .. - make test + make -C regression test - cd .. - make -C unit all + make -C unit all -j2 make -C unit test + + cd jbmc/regression + rmdir /s /q jbmc\VarLengthArrayTrace1 + rmdir /s /q jbmc\classpath1 + rmdir /s /q jbmc\jar-file3 + rmdir /s /q jbmc\tableswitch2 + rmdir /s /q jbmc-concurrency\explicit_thread_blocks + cd ../.. + + make -C jbmc/regression test + + make -C jbmc/unit all -j2 + make -C jbmc/unit test