diff --git a/Makefile b/Makefile index d824565c..63673d1d 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ testargs = \ %.json.check: ./tippecanoe -q -a@ -f -o $@.mbtiles $(call testargs,$(patsubst %.json.check,%,$(word 4,$(subst /, ,$@)))) $(foreach suffix,$(suffixes),$(sort $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.$(suffix)))) < /dev/null ./tippecanoe-decode -x generator $@.mbtiles > $@.out - cmp $@.out $(patsubst %.check,%,$@) + diff $@.out $(patsubst %.check,%,$@) rm $@.out $@.mbtiles # Don't test overflow with geobuf, because it fails (https://github.com/mapbox/geobuf/issues/87) @@ -137,7 +137,7 @@ fewer-tests: tippecanoe tippecanoe-decode geobuf-test raw-tiles-test parallel-te for i in $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.json.gz); do gzip -dc $$i | ./tippecanoe-json-tool -w | ./node_modules/geobuf/bin/json2geobuf > $$i.geobuf; done ./tippecanoe -q -a@ -f -o $@.mbtiles $(call testargs,$(patsubst %.json.checkbuf,%,$(word 4,$(subst /, ,$@)))) $(foreach suffix,$(suffixes),$(addsuffix .geobuf,$(sort $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.$(suffix))))) < /dev/null ./tippecanoe-decode -x generator $@.mbtiles | sed 's/checkbuf/check/g' | sed 's/\.geobuf//g' > $@.out - cmp $@.out $(patsubst %.checkbuf,%,$@) + diff $@.out $(patsubst %.checkbuf,%,$@) rm $@.out $@.mbtiles parallel-test: $(eval SHELL:=$(ADVSHELL))