mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
It's possible that git doesn't like to create empty directories, so
create the generated_* directories themselves if they don't exist before running the script to generate them. Also modify the default invocation of prove to add -f, which reports the details of failing test cases.
This commit is contained in:
parent
c66975ffc5
commit
d4c4cbe62b
1 changed files with 9 additions and 6 deletions
|
@ -4,9 +4,10 @@ TESTS=simple.pl
|
|||
PARSER_DIR=..
|
||||
PARSER_BIN=apparmor_parser
|
||||
PARSER=$(PARSER_DIR)/$(PARSER_BIN)
|
||||
PROVE_ARG=-f
|
||||
|
||||
ifeq ($(VERBOSE),1)
|
||||
PROVE_ARG=-v
|
||||
PROVE_ARG+=-v
|
||||
endif
|
||||
|
||||
all: tests
|
||||
|
@ -14,9 +15,14 @@ all: tests
|
|||
.PHONY: tests error_output gen_xtrans parser_sanity caching
|
||||
tests: error_output gen_xtrans parser_sanity caching
|
||||
|
||||
gen_xtrans:
|
||||
GEN_TRANS_DIRS=simple_tests/generated_x/ simple_tests/generated_perms_leading/ simple_tests/generated_perms_safe/
|
||||
|
||||
gen_xtrans: $(GEN_TRANS_DIRS)
|
||||
./gen-xtrans.pl
|
||||
|
||||
$(GEN_TRANS_DIRS):
|
||||
mkdir $@
|
||||
|
||||
error_output: $(PARSER)
|
||||
$(PARSER) -S -I errors >/dev/null errors/okay.sd
|
||||
LANG=C $(PARSER) -S -I errors 2>&1 >/dev/null errors/single.sd | \
|
||||
|
@ -39,7 +45,4 @@ $(PARSER):
|
|||
make -C $(PARSER_DIR) $(PARSER_BIN)
|
||||
|
||||
clean:
|
||||
find simple_tests/generated_x/ \
|
||||
simple_tests/generated_perms_leading/ \
|
||||
simple_tests/generated_perms_safe/ \
|
||||
-type f | xargs rm -f
|
||||
find $(GEN_TRANS_DIRS) -type f | xargs rm -f
|
||||
|
|
Loading…
Add table
Reference in a new issue