From deebd01636d26337e15527e6b9a24c68e9796521 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 23 Jan 2017 12:36:27 +0000 Subject: [PATCH 1/2] Fix package_friendly1 test This used to check for an interface method getting added as a goto function, which doesn't happen anymore. --- regression/cbmc-java/package_friendly1/test.desc | 1 - 1 file changed, 1 deletion(-) diff --git a/regression/cbmc-java/package_friendly1/test.desc b/regression/cbmc-java/package_friendly1/test.desc index 4559f083646..108ea5defb1 100644 --- a/regression/cbmc-java/package_friendly1/test.desc +++ b/regression/cbmc-java/package_friendly1/test.desc @@ -2,7 +2,6 @@ CORE main.class package_friendly1.class package_friendly2.class --show-goto-functions ^main[.]main[(][)].*$ -^package_friendly1[.]operation1[(][)].*$ ^package_friendly2[.]operation2[(][)].*$ ^EXIT=0$ ^SIGNAL=0$ From ab066ea2dc6b669fcde343709cff369167b39f90 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 23 Jan 2017 12:37:06 +0000 Subject: [PATCH 2/2] Enable Java regression tests The primary `make test` goal now also runs the cbmc-java test subdirectory. --- regression/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression/Makefile b/regression/Makefile index e8a0f506983..1243ec9a468 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -1,5 +1,5 @@ -DIRS = ansi-c cbmc cpp goto-instrument goto-analyzer +DIRS = ansi-c cbmc cpp goto-instrument goto-analyzer cbmc-java test: $(foreach var,$(DIRS), $(MAKE) -C $(var) test || exit 1;)