Skip to content

Commit 0dff1ff

Browse files
committed
Makefile: Do not automatically rebuild backend
Automatically rebuilding the backend makes it impossible to test an out-of-tree build with the Makefile.
1 parent 4f3a751 commit 0dff1ff

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Use `docker.sh` to run commands inside the container:
6060

6161
``` sh
6262
./docker/build.sh # run once when dependencies change
63+
./docker/run.sh make # build the backend
6364
./docker/run.sh make test # run all tests
6465
./docker/run.sh make -C test/imp test # run all tests in test/imp
6566
```

include.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ KORE_REPL_OPTS = --no-bug-report
4848
export KORE_REPL
4949
export KORE_REPL_OPTS
5050

51-
$(KORE_EXEC):
51+
$(BUILD_DIR)/kore/bin/kore-exec:
5252
$(STACK) $(STACK_BUILD) $(STACK_NO_PROFILE) --copy-bins kore:exe:kore-exec
5353

54-
$(KORE_REPL):
54+
$(BUILD_DIR)/kore/bin/kore-repl:
5555
$(STACK) $(STACK_BUILD) $(STACK_NO_PROFILE) --copy-bins kore:exe:kore-repl
5656

57-
$(KORE_PARSER):
57+
$(BUILD_DIR)/kore/bin/kore-parser:
5858
$(STACK) $(STACK_BUILD) $(STACK_NO_PROFILE) --copy-bins kore:exe:kore-parser

test/include.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ KOMPILED := $(TEST_DIR)/$(DEF)-kompiled
1919
export KOMPILED
2020
DEF_KORE_DEFAULT = $(KOMPILED)/definition.kore
2121
DEF_KORE ?= $(DEF_KORE_DEFAULT)
22-
TEST_DEPS = $(K) $(KORE_PARSER) $(DEF_KORE) $(KORE_EXEC)
22+
TEST_DEPS = $(K) $(DEF_KORE)
2323

2424
TESTS = \
2525
$(wildcard $(DEF_DIR)/*.verify) \
@@ -44,7 +44,7 @@ KORE_EXEC_OPTS += \
4444
KPROVE_REPL_OPTS += -d $(DEF_DIR) -m $(KPROVE_MODULE)
4545
KPROVE_SPEC = $<
4646

47-
$(DEF_KORE_DEFAULT): $(DEF_DIR)/$(DEF).k $(K) $(KORE_PARSER)
47+
$(DEF_KORE_DEFAULT): $(DEF_DIR)/$(DEF).k $(K)
4848
@echo ">>>" $(CURDIR) "kompile" $<
4949
rm -fr $(KOMPILED)
5050
$(KOMPILE) $(KOMPILE_OPTS) $<
@@ -112,10 +112,10 @@ PATTERN_OPTS = --pattern "$$(cat $*.k)"
112112
%.save-proofs.kore: %.out
113113
[ -f $@ ]
114114

115-
%-spec.k.repl: $(TEST_DIR)/%-spec.k $(KORE_REPL) $(TEST_DEPS)
115+
%-spec.k.repl: $(TEST_DIR)/%-spec.k $(TEST_DEPS)
116116
$(KPROVE) $(KPROVE_REPL_OPTS) $<
117117

118-
%-spec.k.run-repl-script: $(TEST_DIR)/%-spec.k $(KORE_REPL) $(TEST_DEPS)
118+
%-spec.k.run-repl-script: $(TEST_DIR)/%-spec.k $(TEST_DEPS)
119119
$(KPROVE) $(KPROVE_REPL_OPTS) $<
120120
%-spec.k.run-repl-script: KORE_REPL_OPTS= -r --repl-script $@
121121

@@ -133,15 +133,15 @@ PATTERN_OPTS = --pattern "$$(cat $*.k)"
133133

134134
### MERGE
135135

136-
%.merge.out: $(TEST_DIR)/%.merge $(DEF_KORE) $(KORE_EXEC)
136+
%.merge.out: $(TEST_DIR)/%.merge $(DEF_KORE)
137137
@echo ">>>" $(CURDIR) "kore-exec --merge-rules" $<
138138
rm -f $@
139139
$(KORE_EXEC) $(DEF_KORE) --module $(KORE_MODULE) --merge-rules $< --output $@
140140
$(DIFF) $@.golden $@ || $(FAILED)
141141

142142
### SCRIPTS
143143

144-
test-%.sh.out: $(KORE_EXEC) $(TEST_DIR)/test-%.sh
144+
test-%.sh.out: $(TEST_DIR)/test-%.sh
145145
@echo ">>>" $(CURDIR) $(@:.out=)
146146
rm -f $@
147147
$(TEST_DIR)/$(@:.out=) > $@ || true

test/no-injection-into-hooked/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ clean:
1717

1818
.PHONY: test-k test golden clean
1919

20-
test-kompiled/definition.kore: test.k $(K) $(KORE_PARSER)
20+
test-kompiled/definition.kore: test.k $(K)
2121
@echo ">>>" $(CURDIR) "kompile" $<
2222
rm -fr $(KOMPILED)
2323
$(KOMPILE) $(KOMPILE_OPTS) $<; if [ $$? -eq 0 ]; then exit 1; fi

test/parser/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TESTS = $(wildcard *.kore)
1313
OUTS += $(foreach TEST, $(TESTS), $(TEST).out)
1414
GOLDEN += $(foreach TEST, $(TESTS), $(TEST).golden)
1515

16-
%.kore.out : %.kore $(KORE_PARSER)
16+
%.kore.out : %.kore
1717
$(KORE_PARSER) --no-print-definition $< 2>$@ || true
1818
$(DIFF) $*.kore.golden $@ || $(FAILED)
1919

0 commit comments

Comments
 (0)