From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 May 2022 22:00:05 +0000 (+0100)
Subject: shapelib bundle tests: Do not filter out "filenames" after ^:
X-Git-Tag: otter-1.1.0~99
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f3be2fa216e6050de4a7cb0f6cf485fb9a2d28ad;p=otter.git

shapelib bundle tests: Do not filter out "filenames" after ^:

These are actually extra field definitions.  If there are these, our
parser is too stupid.  We're just filtering out the source filenames
to know that otter isn't reading them.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index c7094ccc..b354ed67 100644
--- a/Makefile
+++ b/Makefile
@@ -413,7 +413,7 @@ examples/big-bundle/otter.toml: $(LIBRARY_FILES) $(MAKEFILE_DEP)
 		perl -p \
  -e 'BEGIN { print "# -- AUTOGENERATED FROM COPY IN OTTER SOURCE --\n" }' \
  -e 'if (m/^\[scraper]/..0) { unless (m/^\[(?!scraper)/..0) { s/^/\#/ } }' \
- -e 's/(?<=\s)\w\S*(?=\s)/-/ if m/^files = """/..m/^"""/;' \
+ -e 's/(?<=\s)\w\S*(?=\s)/-/ if m/^files = """/..m/^"""|^:/;' \
 			<$$l.toml >examples/big-bundle/$$l.toml; done
 	@set -e; echo 'LN for $@'; \
 	for e in $(LIBRARY_FILE_INPUTS); do \