Skip to content

Commit d169b18

Browse files
committed
Unify make and cmake behaviours
This fixes the inconsistencies between cmake and make behaviours.
1 parent 58d64d8 commit d169b18

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

regression/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ test:
8585
.PHONY: $(DIRS)
8686
$(DIRS):
8787
@echo "Running $@..." ;
88-
$(MAKE) -C "$@" test || exit 1;
88+
$(MAKE) -C "$@" || exit 1;
8989

9090
# Run all test directories using GNU Parallel
9191
.PHONY: test-parallel

regression/cbmc/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
THIS_FILE := $(lastword $(MAKEFILE_LIST))
2+
13
default: test
24

35
include ../../src/config.inc
@@ -11,6 +13,8 @@ endif
1113

1214
test:
1315
@../test.pl -e -p -c "../../../src/cbmc/cbmc --validate-goto-model --validate-ssa-equation" -X smt-backend $(GCC_ONLY)
16+
@$(MAKE) -f $(THIS_FILE) test-paths-lifo
17+
@$(MAKE) -f $(THIS_FILE) test-cprover-smt2
1418

1519
test-cprover-smt2:
1620
@../test.pl -e -p -c "../../../src/cbmc/cbmc --cprover-smt2" \

0 commit comments

Comments
 (0)