Skip to content

split up cbmc in cbmc and jbmc #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions regression/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ add_subdirectory(goto-diff)
add_subdirectory(goto-instrument)
add_subdirectory(goto-instrument-typedef)
add_subdirectory(invariants)
add_subdirectory(jbmc-strings)
add_subdirectory(strings)
add_subdirectory(strings-smoke-tests)
add_subdirectory(test-script)
1 change: 1 addition & 0 deletions regression/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DIRS = ansi-c \
goto-instrument-typedef \
invariants \
strings \
jbmc-strings \
strings-smoke-tests \
test-script \
# Empty last line
Expand Down
2 changes: 1 addition & 1 deletion regression/cbmc-java-inheritance/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
add_test_pl_tests(
"$<TARGET_FILE:cbmc>"
"$<TARGET_FILE:jbmc>"
)
4 changes: 2 additions & 2 deletions regression/cbmc-java-inheritance/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
default: tests.log

test:
@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi

tests.log: ../test.pl
@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi
Expand Down
2 changes: 1 addition & 1 deletion regression/cbmc-java/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
add_test_pl_tests(
"$<TARGET_FILE:cbmc>"
"$<TARGET_FILE:jbmc>"
)
4 changes: 2 additions & 2 deletions regression/cbmc-java/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
default: tests.log

test:
@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi

tests.log: ../test.pl
@if ! ../test.pl -c ../../../src/cbmc/cbmc ; then \
@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi
Expand Down
3 changes: 3 additions & 0 deletions regression/jbmc-strings/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
add_test_pl_tests(
"$<TARGET_FILE:jbmc>"
)
38 changes: 38 additions & 0 deletions regression/jbmc-strings/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
default: tests.log

test:
@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi

testfuture:
@if ! ../test.pl -c ../../../src/jbmc/jbmc -CF ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi

testall:
@if ! ../test.pl -c ../../../src/jbmc/jbmc -CFTK ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi

tests.log: ../test.pl
@if ! ../test.pl -c ../../../src/jbmc/jbmc ; then \
../failed-tests-printer.pl ; \
exit 1 ; \
fi

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

Loading