Add regression/libcprover-cpp to Makefile builds

Ensure that both CMake and Make run the same set of tests, and
facilitate cleanup after running tests (for either build system).

Author: tautschnig

.github/workflows/pull-request-checks.yaml

@@ -69,7 +69,7 @@ jobs:
           make TAGS="[!shouldfail]" -C jbmc/unit test IPASIR=$PWD/riss.git/riss
       - name: Run regression tests
         run: |
-          make -C regression test-parallel JOBS=2
+          make -C regression test-parallel JOBS=2 LIBS="$PWD/riss.git/release/lib/libriss-coprocessor.a -lpthread" IPASIR=$PWD/riss.git/riss
           make -C regression/cbmc test-paths-lifo
           env PATH=$PATH:`pwd`/src/solvers make -C regression/cbmc test-cprover-smt2
           make -C jbmc/regression test-parallel JOBS=2

regression/Makefile

@@ -62,6 +62,7 @@ DIRS = cbmc-shadow-memory \
        cbmc-sequentialization \
        cpp-linter \
        catch-framework \
+       libcprover-cpp \
        # Empty last line
 
 ifeq ($(OS),Windows_NT)

regression/libcprover-cpp/Makefile

@@ -0,0 +1,41 @@
+default: tests.log
+
+SRC = call_bmc.cpp $(wildcard ../../src/libcprover-cpp/*.cpp)
+
+OBJ += ../../src/libcprover-cpp/libcprover-cpp$(LIBEXT)
+
+INCLUDES = -I ../../src/ -I ../../src/goto-programs/
+
+CLEANFILES = api-binary-driver$(EXEEXT)
+
+include ../../src/config.inc
+include ../../src/common
+
+api-binary-driver$(EXEEXT): $(OBJ)
+	$(LINKBIN)
+
+DIRS = \
+  model_loading
+
+test:
+	@for dir in $(DIRS); do \
+		$(MAKE) -C "$$dir" test || exit 1; \
+	done;
+
+tests.log:
+	@for dir in $(DIRS); do \
+		$(MAKE) -C "$$dir" tests.log || exit 1; \
+	done;
+
+test tests.log: api-binary-driver$(EXEEXT)
+
+clean: regression_clean
+
+.PHONY: regression_clean
+regression_clean:
+	@for dir in *; do \
+		if [ -d "$$dir" ]; then \
+			$(MAKE) -C "$$dir" clean; \
+		fi; \
+	done;
+	$(RM) tests.log

regression/libcprover-cpp/model_loading/Makefile

@@ -0,0 +1,12 @@
+default: tests.log
+
+test:
+	@../../test.pl -e -p -c ../../api-binary-driver
+
+tests.log:
+	@../../test.pl -e -p -c ../../api-binary-driver
+
+clean:
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log