Skip to content

Commit c0f7935

Browse files
test Makefile: quick fix: running 'make' works
1 parent 90a2b2c commit c0f7935

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
libjade-*
44
.vscode
55
result
6+
src/

test/Makefile

+7-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ RANDSRC := $(COMMON)/notrandombytes.c
6969
FILTER ?= $(SRC)/crypto_%
7070
export FILTER
7171

72-
JAZZ ?= $(filter $(FILTER), $(filter-out $(addprefix $(SRC)/,$(EXCLUDE)), $(sort $(dir $(shell find $(SRC) -name '*.jazz')))))
72+
JAZZ ?= $(filter $(FILTER), $(filter-out $(addprefix $(SRC)/,$(EXCLUDE)), $(sort $(dir $(shell test -d $(SRC) && find $(SRC) -name '*.jazz')))))
7373
TESTDIR := $(subst $(SRC),$(BIN), $(JAZZ))
7474

7575
CHECKSUMSMALL := $(addsuffix checksumsmall, $(TESTDIR))
@@ -113,15 +113,18 @@ COMPILE_P = $(CC) $(CFLAGS) -o $@ $(DEFINE) $(DNAMESPACES) $(INCLUDES) crypto_
113113
# --------------------------------------------------------------------
114114
.PHONY: __phony default compile-and-run reporter-and-err
115115

116-
default: compile-and-run
116+
default: compile-and-run reporter-and-err
117117

118-
compile-and-run:
118+
compile-and-run: $(SRC)
119119
$(MAKE) CI=1 all
120120

121121
reporter-and-err:
122122
$(MAKE) CI=1 reporter
123123
$(MAKE) CI=1 err
124124

125+
$(SRC):
126+
$(shell ../scripts/extract-all.sh > /dev/null)
127+
125128
# --------------------------------------------------------------------
126129
$(TESTS):
127130

@@ -256,5 +259,5 @@ clean:
256259
rm -fr $(BIN) $(LOGS)
257260

258261
distclean: clean clean-external
259-
$(MAKE) -C $(SRC) distclean
262+
rm -fr $(SRC)
260263

0 commit comments

Comments
 (0)