[build-path-prefix-map-spec] 06/50: Move data out of Makefile

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository build-path-prefix-map-spec.

commit 8bd5f99a9b64d85e714ca8e76002d9316d26de26
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jan 17 19:56:55 2017 +0100

    Move data out of Makefile
---
 consume/0.0-split.env            |  1 +
 consume/0.0-urlencode.env        |  1 +
 consume/{apply.out.1 => 0.0.out} |  0
 consume/{apply.out.2 => 0.in}    |  0
 consume/Makefile                 | 14 +++++---------
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/consume/0.0-split.env b/consume/0.0-split.env
new file mode 100644
index 0000000..fa5d629
--- /dev/null
+++ b/consume/0.0-split.env
@@ -0,0 +1 @@
+/a/b=yyy=ERROR	/a=lol	/b=foo	/a/b=yyy=secreteh
\ No newline at end of file
diff --git a/consume/0.0-urlencode.env b/consume/0.0-urlencode.env
new file mode 100644
index 0000000..bb2a70d
--- /dev/null
+++ b/consume/0.0-urlencode.env
@@ -0,0 +1 @@
+/a/b%3Dyyy=ERROR&/a=lol&/b=foo&/a/b%3Dyyy=secreteh
\ No newline at end of file
diff --git a/consume/apply.out.1 b/consume/0.0.out
similarity index 100%
rename from consume/apply.out.1
rename to consume/0.0.out
diff --git a/consume/apply.out.2 b/consume/0.in
similarity index 100%
rename from consume/apply.out.2
rename to consume/0.in
diff --git a/consume/Makefile b/consume/Makefile
index 945d9ff..b0a538c 100644
--- a/consume/Makefile
+++ b/consume/Makefile
@@ -1,12 +1,8 @@
 TMPDIR = /run/shm/rb-prefix-map
 
 ALL = split
-
 ALLCHECK_split = split split.py
-envvar_1_split = /a/b=yyy=ERROR	/a=lol		/b=foo	/a/b=yyy=secreteh
-
 ALLCHECK_urlencode = urlencode.py
-envvar_1_urlencode = /a/b%3Dyyy=ERROR&/a=lol&/b=foo&/a/b%3Dyyy=secreteh
 
 .PHONY: all
 all: $(ALL)
@@ -16,23 +12,23 @@ all: $(ALL)
 
 check-apply-generic = \
 	set -ex; for i in $(1); do \
-	  SOURCE_PREFIX_MAP='$(2)' \
-	  ./$$i /a/d /b/1234 /a/b=yyy/xxx | diff -ru - apply.out.1; \
+	  SOURCE_PREFIX_MAP="$$(cat 0.$(2)-$(3).env)" \
+	  ./$$i $$(cat 0.in) | diff -ru - 0.$(2).out; \
 	done
 
 check-apply-none = \
 	set -ex; for i in $(1); do \
-	  ./$$i /a/d /b/1234 /a/b=yyy/xxx | diff -ru - apply.out.2; \
+	  ./$$i $$(cat 0.in) | diff -ru - 0.in; \
 	done
 
 .PHONY: check
 check: check-apply-split check-apply-urlencode
 
 .PHONY: check-apply-%
-check-apply-%: apply.out.1 apply.out.2
+check-apply-%:
 	$(MAKE) $(ALLCHECK_$*)
-	$(call check-apply-generic,$(ALLCHECK_$*),$(envvar_1_$*))
 	$(call check-apply-none,$(ALLCHECK_$*))
+	$(call check-apply-generic,$(ALLCHECK_$*),0,$*)
 
 .PHONY: fuzz-%
 fuzz-%: %

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/build-path-prefix-map-spec.git