Jan Lindemann
61c9479e79
The mypy module names of the test tree derive from the full path, anchored by the top-level test/__init__.py, but a file below a path component that is not a valid identifier - the dashes in jw-pkg - falls back to the bare file name, so two same-named test.py drivers collide (the duplicate module error that drove the runme.py and main.py renames). Rename the directory a sane Python name - jw_pkg, that's the better fix. Then name the driver test.py like all the others for consistency. Signed-off-by: Jan Lindemann <jan@janware.com>
23 lines
668 B
Makefile
23 lines
668 B
Makefile
TOPDIR = ../../../../..
|
|
|
|
OUTPUT = test-out.txt
|
|
REFERENCE = test-expected.txt
|
|
|
|
# Relative topdir keeps the rendered project paths relocatable; dropping the
|
|
# log position keeps the error output free of volatile line numbers.
|
|
TEST_CMD_ARGS = --topdir-format relative --log-flags prio,stderr
|
|
|
|
include $(TOPDIR)/make/proj.mk
|
|
include $(TOPDIR)/make/test-jw-pkg.mk
|
|
|
|
all:
|
|
|
|
$(OUTPUT): Makefile test.sh templates/basic.tmpl templates/list.tmpl
|
|
bash ./test.sh $(TEST_CMD_LINE) > $(OUTPUT).tmp 2>&1
|
|
diff $(REFERENCE) $(OUTPUT).tmp
|
|
mv $(OUTPUT).tmp $(OUTPUT)
|
|
|
|
test: $(OUTPUT)
|
|
clean: test.integration.in-tree.clean
|
|
test.integration.in-tree.clean:
|
|
rm -f $(OUTPUT) $(OUTPUT).tmp
|