diff --git a/Makefile b/Makefile index f915ad35..4d3ff06d 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ SRC_EXAMPLES=$(shell find src/examples -type f) SOLUTIONS=$(patsubst src/examples/%, build/solutions/%, $(SRC_EXAMPLES)) EXERCISES=$(patsubst src/examples/%, build/exercises/%, $(SRC_EXAMPLES)) -CN=cn verify +CN="cn verify" exercises: $(EXERCISES) $(SOLUTIONS) @@ -47,15 +47,15 @@ build/exercises.zip: $(EXERCISES) ############################################################################## # Check that the examples all run correctly -CN_PATH ?= cn +CN_PATH?="cn verify" check-archive: @echo Check archive examples - @$(MAKEFILE_DIR)/src/example-archive/check-all.sh "$(CN_PATH)" + @$(MAKEFILE_DIR)/src/example-archive/check-all.sh $(CN_PATH) check-tutorial: @echo Check tutorial examples - @$(MAKEFILE_DIR)/check.sh "$(CN_PATH)" + @$(MAKEFILE_DIR)/check.sh $(CN_PATH) check: check-tutorial check-archive diff --git a/src/example-archive/check-all.sh b/src/example-archive/check-all.sh index 085b17ce..37a0d476 100755 --- a/src/example-archive/check-all.sh +++ b/src/example-archive/check-all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# #!/usr/bin/env bash SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" @@ -7,7 +7,7 @@ then echo "check-all.sh: using CN=$1 in $PWD" CN="$1" else - CN=cn verify + CN="cn verify" fi subdirs=( diff --git a/src/example-archive/check.sh b/src/example-archive/check.sh index 40addd36..6f713d5c 100755 --- a/src/example-archive/check.sh +++ b/src/example-archive/check.sh @@ -5,7 +5,7 @@ then echo "check.sh: using CN=$1 in $PWD" CN="$1" else - CN=cn verify + CN="cn verify" fi process_files() { diff --git a/src/example-archive/open-sut/working/mps_1.c b/src/example-archive/open-sut/working/mps_1.c index 8f3e29f9..9f64148c 100644 --- a/src/example-archive/open-sut/working/mps_1.c +++ b/src/example-archive/open-sut/working/mps_1.c @@ -19,7 +19,7 @@ typedef uint8_t w2; typedef uint8_t w8; /*@ - function (bool) P_Coincidence_2_4(bool a, bool b, bool c, bool d) { + function (boolean) P_Coincidence_2_4(boolean a, boolean b, boolean c, boolean d) { (a&&b) || ((a||b) && (c||d)) || (c&&d) }