fix some tests depending on old perl

1@@ -1,3 +1,3 @@
2 
3-hello.x::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait bye.x out $@
4-bye.x::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl sleep 1 file $@
5+hello.x::; @testhelp -q wait bye.x out $@
6+bye.x::; @testhelp sleep 1 file $@

M tests/mk/gnu/features/implicit_search/t003/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello
3 %: %.c; $(info hello.c)
4 %: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t008/mk

+1, -1

1@@ -2,5 +2,5 @@
2 all: hello
3 %: %.c; $(info $<)
4 %: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1
7 unrelated: hello.c

M tests/mk/gnu/features/implicit_search/t009/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello
3 %: %.c; $(info $<)
4 %: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1

M tests/mk/gnu/features/implicit_search/t012/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello
3 %:: %.c; $(info hello.c)
4 %:: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t017/mk

+1, -1

1@@ -2,5 +2,5 @@
2 all: hello
3 %:: %.c; $(info $<)
4 %:: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1
7 unrelated: hello.c

M tests/mk/gnu/features/implicit_search/t018/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello
3 %:: %.c; $(info $<)
4 %:: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1

M tests/mk/gnu/features/implicit_search/t021/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello.o
3 %.o: %.c; $(info hello.c)
4 %.o: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t026/mk

+1, -1

1@@ -2,5 +2,5 @@
2 all: hello.o
3 %.o: %.c; $(info $<)
4 %.o: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1
7 unrelated: hello.c

M tests/mk/gnu/features/implicit_search/t027/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello.o
3 %.o: %.c; $(info $<)
4 %.o: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1

M tests/mk/gnu/features/implicit_search/t030/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello.o
3 %.o:: %.c; $(info hello.c)
4 %.o:: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t035/mk

+1, -1

1@@ -2,5 +2,5 @@
2 all: hello.o
3 %.o:: %.c; $(info $<)
4 %.o:: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1
7 unrelated: hello.c

M tests/mk/gnu/features/implicit_search/t036/mk

+1, -1

1@@ -2,4 +2,4 @@
2 all: hello.o
3 %.o:: %.c; $(info $<)
4 %.o:: %.f; $(info $<)
5-.DEFAULT:; @$(info $@) /usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+.DEFAULT:; @$(info $@) testhelp fail 1

M tests/mk/gnu/features/implicit_search/t055/mk

+1, -1

1@@ -3,4 +3,4 @@ all: hello.tsk
2 %.tsk: %; $(info hello.tsk)
3 %: %.c; $(info hello.c)
4 %: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t056/mk

+1, -1

1@@ -3,4 +3,4 @@ all: hello.tsk
2 %.tsk: %; $(info hello.tsk)
3 %:: %.c; $(info hello.c)
4 %:: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t057/mk

+1, -1

1@@ -3,4 +3,4 @@ all: hello.tsk
2 %.tsk: %.o; $(info hello.tsk)
3 %.o: %.c; $(info hello.c)
4 %.o: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/implicit_search/t058/mk

+1, -1

1@@ -3,4 +3,4 @@ all: hello.tsk
2 %.tsk: %.o; $(info hello.tsk)
3 %.o:: %.c; $(info hello.c)
4 %.o:: %.f; $(info hello.f)
5-hello.c:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
6+hello.c:; @testhelp fail 1

M tests/mk/gnu/features/parallelism/t001/mk

+3, -3

1@@ -1,5 +1,5 @@
2 
3 all : def_1 def_2 def_3
4-def_1 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE wait THREE out TWO
5-def_2 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait FOUR file THREE
6-def_3 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE file FOUR
7+def_1 : ; @testhelp file ONE wait THREE out TWO
8+def_2 : ; @testhelp wait FOUR file THREE
9+def_3 : ; @testhelp wait ONE file FOUR

M tests/mk/gnu/features/parallelism/t002/mk

+3, -3

 1@@ -1,6 +1,6 @@
 2 
 3 MAKEFLAGS += -j4
 4 all : def_1 def_2 def_3
 5-def_1 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE wait THREE out TWO
 6-def_2 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait FOUR file THREE
 7-def_3 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE file FOUR
 8+def_1 : ; @testhelp file ONE wait THREE out TWO
 9+def_2 : ; @testhelp wait FOUR file THREE
10+def_3 : ; @testhelp wait ONE file FOUR

M tests/mk/gnu/features/parallelism/t003/mk

+3, -3

 1@@ -1,6 +1,6 @@
 2 
 3 MAKEFLAGS += -j2
 4 all : def_1 def_2 def_3
 5-def_1 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE wait THREE out TWO
 6-def_2 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait FOUR file THREE
 7-def_3 : ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE file FOUR
 8+def_1 : ; @testhelp file ONE wait THREE out TWO
 9+def_2 : ; @testhelp wait FOUR file THREE
10+def_3 : ; @testhelp wait ONE file FOUR

M tests/mk/gnu/features/parallelism/t004/mk

+5, -5

 1@@ -1,10 +1,10 @@
 2 
 3-all: 1 2; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl out success
 4+all: 1 2; @testhelp out success
 5 -include 1.inc 2.inc
 6 .RECIPEPREFIX := >
 7 1.inc:
 8-> @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE.inc wait THREE.inc file TWO.inc
 9-> @echo '1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE wait THREE file TWO' > $@
10+> @testhelp file ONE.inc wait THREE.inc file TWO.inc
11+> @echo '1: ; @testhelp file ONE wait THREE file TWO' > $@
12 2.inc:
13-> @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE.inc file THREE.inc
14-> @echo '2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE file THREE' > $@
15+> @testhelp wait ONE.inc file THREE.inc
16+> @echo '2: ; @testhelp wait ONE file THREE' > $@

M tests/mk/gnu/features/parallelism/t005/mk

+3, -3

 1@@ -1,11 +1,11 @@
 2 
 3 recurse: ; @$(MAKE) --no-print-directory -f t005.mk INC=yes all
 4-all: 1 2; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl out success
 5+all: 1 2; @testhelp out success
 6 
 7 INC = no
 8 ifeq ($(INC),yes)
 9 -include 1.inc 2.inc
10 endif
11 
12-1.inc: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE.inc wait THREE.inc file TWO.inc; echo '1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file ONE wait THREE file TWO' > $@
13-2.inc: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE.inc file THREE.inc; echo '2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait ONE file THREE' > $@
14+1.inc: ; @testhelp file ONE.inc wait THREE.inc file TWO.inc; echo '1: ; @testhelp file ONE wait THREE file TWO' > $@
15+2.inc: ; @testhelp wait ONE.inc file THREE.inc; echo '2: ; @testhelp wait ONE file THREE' > $@

M tests/mk/gnu/features/parallelism/t006/mk

+3, -3

 1@@ -1,9 +1,9 @@
 2 
 3 export HI = $(shell $($@.CMD))
 4-first.CMD = /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hi
 5-second.CMD = /usr/bin/perl /tmp/shin-extract/tests/thelp.pl sleep 4
 6+first.CMD = testhelp out hi
 7+second.CMD = testhelp sleep 4
 8 
 9 .PHONY: all first second
10 all: first second
11 
12-first second: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl out $@ sleep 1 out $@
13+first second: ; @testhelp out $@ sleep 1 out $@

M tests/mk/gnu/features/parallelism/t007/mk

+4, -4

 1@@ -2,8 +2,8 @@
 2 .PHONY: all fail.1 fail.2 fail.3 ok
 3 all: fail.1 ok fail.2 fail.3
 4 
 5-fail.1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q sleep 1 out $@ file fail.1 fail 1
 6-fail.2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q sleep 2 out $@ wait fail.1 file fail.2 fail 1
 7-fail.3: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q sleep 3 out $@ wait fail.2 file fail.3 fail 1
 8+fail.1: ; @testhelp -q sleep 1 out $@ file fail.1 fail 1
 9+fail.2: ; @testhelp -q sleep 2 out $@ wait fail.1 file fail.2 fail 1
10+fail.3: ; @testhelp -q sleep 3 out $@ wait fail.2 file fail.3 fail 1
11 
12-ok: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q sleep 4 wait fail.3 out OK
13+ok: ; @testhelp -q sleep 4 wait fail.3 out OK

M tests/mk/gnu/features/parallelism/t008/mk

+2, -2

 1@@ -4,8 +4,8 @@ all:; @:
 2 
 3 -include foo.d
 4 
 5-foo.d: comp ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl out $@
 6+foo.d: comp ; @testhelp out $@
 7 
 8 comp: mod_a.o mod_b.o; @:
 9 
10-mod_a.o mod_b.o: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl fail 1
11+mod_a.o mod_b.o: ; @testhelp fail 1

M tests/mk/gnu/features/parallelism/t009/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2-target: intermed ; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl file $@
 3+target: intermed ; testhelp file $@
 4 
 5 .INTERMEDIATE: intermed
 6-intermed: | phony ; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl file $@
 7+intermed: | phony ; testhelp file $@
 8 
 9 .PHONY: phony
10 phony: ; : phony

M tests/mk/gnu/features/parallelism/t010/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2 
 3 things = thing1 thing2
 4 all: $(things)
 5-thing1:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait thing2start file $@start wait thing2end out $@end
 6-thing2:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl file $@start wait thing1start file $@end
 7+thing1:; @testhelp wait thing2start file $@start wait thing2end out $@end
 8+thing2:; @testhelp file $@start wait thing1start file $@end
 9 -include inc.mk
10 inc.mk: ; @touch $@

M tests/mk/gnu/features/parallelism/t012/mk

+2, -2

1@@ -1,6 +1,6 @@
2 
3 all: one two
4-one: ;@ /usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait TWO file ONE
5-two: ;@ /usr/bin/perl /tmp/shin-extract/tests/thelp.pl file TWO
6+one: ;@ testhelp wait TWO file ONE
7+two: ;@ testhelp file TWO
8 include fff1.mk
9 fff1.mk: ; touch $@

M tests/mk/gnu/features/parallelism/t013/mk

+3, -3

 1@@ -1,9 +1,9 @@
 2 
 3 all: ; @$(MAKE) -f t013.mk recurse
 4 
 5-recurse: one two ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl out $@
 6-one: ;@ /usr/bin/perl /tmp/shin-extract/tests/thelp.pl wait TWO file ONE
 7-two: ;@ /usr/bin/perl /tmp/shin-extract/tests/thelp.pl file TWO
 8+recurse: one two ; @testhelp out $@
 9+one: ;@ testhelp wait TWO file ONE
10+two: ;@ testhelp file TWO
11 
12 mkinclude: ; touch fff1.mk
13

M tests/mk/gnu/options/dash-l/t001/mk

+1, -1

1@@ -1,5 +1,5 @@
2 
3-test = /usr/bin/perl /tmp/shin-extract/tests/thelp.pl noexist test-file file test-file sleep 2 rm test-file
4+test = testhelp noexist test-file file test-file sleep 2 rm test-file
5 
6 all : ONE TWO THREE
7 ONE : ; @$(test)

M tests/mk/gnu/options/warn/t001/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t002/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t003/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t004/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t005/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t006/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t007/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t008/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 $(info MF=$(MAKEFLAGS))
4-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
5+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t009/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 MAKEFLAGS += --warn=error --warn=warn
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t010/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 MAKEFLAGS += --warn=ignore --warn=error --warn=ignore --warn=invalid-ref,invalid-var,undefined-var
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t011/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 MAKEFLAGS += --warn
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t012/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 MAKEFLAGS += --warn --warn=error
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t013/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 MAKEFLAGS += --warn=warn
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/options/warn/t014/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 MAKEFLAGS += --warn=invalid-ref:ignore --warn=error --warn=invalid-var:warn,,,,,undefined-var:error,,,,,
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/targets/IGNORE/t001/mk

+1, -1

1@@ -1,2 +1,2 @@
2 
3-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
4+all: ; @testhelp -q fail 1

M tests/mk/gnu/targets/IGNORE/t002/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 .IGNORE:
4-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+all: ; @testhelp -q fail 1

M tests/mk/gnu/targets/IGNORE/t003/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 .IGNORE: all
4-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+all: ; @testhelp -q fail 1

M tests/mk/gnu/targets/POSIX/t001/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 .POSIX:
4-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @testhelp -q fail 1; testhelp out hello

M tests/mk/gnu/targets/POSIX/t002/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .POSIX:
4-all: ; @-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @-testhelp -q fail 1; testhelp out hello
6 .SHELLFLAGS = -c

M tests/mk/gnu/targets/POSIX/t003/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .POSIX:
4-all: ; @-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @-testhelp -q fail 1; testhelp out hello
6 all: .SHELLFLAGS = -c

M tests/mk/gnu/targets/POSIX/t004/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 .POSIX:
4-all: ; @-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @-testhelp -q fail 1; testhelp out hello

M tests/mk/gnu/targets/POSIX/t005/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 .POSIX:
4-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @testhelp -q fail 1; testhelp out hello

M tests/mk/gnu/targets/POSIX/t006/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .POSIX:
4 .IGNORE:
5-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
6+all: ; @testhelp -q fail 1; testhelp out hello

M tests/mk/gnu/targets/POSIX/t007/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .POSIX:
4 .IGNORE: all
5-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
6+all: ; @testhelp -q fail 1; testhelp out hello

M tests/mk/gnu/targets/POSIX/t008/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .POSIX:
4-all: ; @-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @-testhelp -q fail 1; testhelp out hello
6 .SHELLFLAGS = -ec

M tests/mk/gnu/targets/POSIX/t009/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .POSIX:
4-all: ; @-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl out hello
5+all: ; @-testhelp -q fail 1; testhelp out hello
6 all: .SHELLFLAGS = -ec

M tests/mk/gnu/targets/POSIX/t010/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .SHELLFLAGS = -xc
4 .POSIX:
5-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; true
6+all: ; @testhelp -q fail 1; true

M tests/mk/gnu/targets/POSIX/t010/out

+1, -1

1@@ -1,2 +1,2 @@
2-+ /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
3++ testhelp -q fail 1
4 + true

M tests/mk/gnu/targets/WAIT/t004/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2 
 3 all : pre1 .WAIT pre2
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 7+pre2: ; @testhelp -q out $@
 8 
 9 # This is just here so we don't fail with older versions of make
10 .WAIT:

M tests/mk/gnu/targets/WAIT/t005/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2 
 3 all : pre1 .WAIT pre2
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 7+pre2: ; @testhelp -q out $@
 8 
 9 # This is just here so we don't fail with older versions of make
10 .WAIT:

M tests/mk/gnu/targets/WAIT/t006/mk

+2, -2

1@@ -1,6 +1,6 @@
2 
3-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
4-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
5+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
6+pre2: ; @testhelp -q out $@
7 
8 # This is just here so we don't fail with older versions of make
9 .WAIT:

M tests/mk/gnu/targets/WAIT/t007/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2 
 3 all : pre1 .WAIT .WAIT .WAIT pre2
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 7+pre2: ; @testhelp -q out $@
 8 
 9 # This is just here so we don't fail with older versions of make
10 .WAIT:

M tests/mk/gnu/targets/WAIT/t008/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2 
 3 all : .WAIT pre1 .WAIT pre2 .WAIT
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 7+pre2: ; @testhelp -q out $@
 8 
 9 # This is just here so we don't fail with older versions of make
10 .WAIT:

M tests/mk/gnu/targets/WAIT/t013/mk

+3, -3

 1@@ -1,8 +1,8 @@
 2 
 3 all : pre1 .WAIT pre2 pre3
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ file TWO wait THREE out end-$@
 6-pre3: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait TWO out $@ file THREE
 7+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 8+pre2: ; @testhelp -q out start-$@ file TWO wait THREE out end-$@
 9+pre3: ; @testhelp -q wait TWO out $@ file THREE
10 
11 # This is just here so we don't fail with older versions of make
12 .WAIT:

M tests/mk/gnu/targets/WAIT/t014/mk

+3, -3

 1@@ -1,7 +1,7 @@
 2 
 3-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 4-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ file TWO wait THREE out end-$@
 5-pre3: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait TWO out $@ file THREE
 6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 7+pre2: ; @testhelp -q out start-$@ file TWO wait THREE out end-$@
 8+pre3: ; @testhelp -q wait TWO out $@ file THREE
 9 
10 # This is just here so we don't fail with older versions of make
11 .WAIT:

M tests/mk/gnu/targets/WAIT/t015/mk

+4, -4

 1@@ -1,10 +1,10 @@
 2 
 3 all : pre1 pre2 .WAIT post1 post2
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ file PRE1 wait PRE2 sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait PRE1 out $@ file PRE2
 6+pre1: ; @testhelp -q out start-$@ file PRE1 wait PRE2 sleep 1 out end-$@
 7+pre2: ; @testhelp -q wait PRE1 out $@ file PRE2
 8 
 9-post1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait POST2 out $@ file POST1
10-post2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q file POST2 wait POST1 out $@
11+post1: ; @testhelp -q wait POST2 out $@ file POST1
12+post2: ; @testhelp -q file POST2 wait POST1 out $@
13 
14 # This is just here so we don't fail with older versions of make
15 .WAIT:

M tests/mk/gnu/targets/WAIT/t016/mk

+4, -4

 1@@ -1,9 +1,9 @@
 2 
 3-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ file PRE1 wait PRE2 sleep 1 out end-$@
 4-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait PRE1 out $@ file PRE2
 5+pre1: ; @testhelp -q out start-$@ file PRE1 wait PRE2 sleep 1 out end-$@
 6+pre2: ; @testhelp -q wait PRE1 out $@ file PRE2
 7 
 8-post1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait POST2 out $@ file POST1
 9-post2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q file POST2 wait POST1 out $@
10+post1: ; @testhelp -q wait POST2 out $@ file POST1
11+post2: ; @testhelp -q file POST2 wait POST1 out $@
12 
13 # This is just here so we don't fail with older versions of make
14 .WAIT:

M tests/mk/gnu/targets/WAIT/t017/mk

+2, -2

 1@@ -2,8 +2,8 @@
 2 all : one two
 3 one: pre1 .WAIT pre2
 4 two: pre2 pre1
 5-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ file PRE1 wait PRE2 out end-$@
 6-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait PRE1 out $@ file PRE2
 7+pre1: ; @testhelp -q out start-$@ file PRE1 wait PRE2 out end-$@
 8+pre2: ; @testhelp -q wait PRE1 out $@ file PRE2
 9 
10 
11 # This is just here so we don't fail with older versions of make

M tests/mk/gnu/targets/WAIT/t018/mk

+2, -2

 1@@ -1,8 +1,8 @@
 2 
 3 all: pre
 4 p% : p%1 .WAIT p%2;
 5-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 6-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 7+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 8+pre2: ; @testhelp -q out $@
 9 
10 # This is just here so we don't fail with older versions of make
11 .WAIT:

M tests/mk/gnu/targets/WAIT/t019/mk

+3, -3

 1@@ -1,9 +1,9 @@
 2 
 3 .SECONDEXPANSION:
 4 all: $$(pre)
 5-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 6-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 7-pre3: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 8+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 9+pre2: ; @testhelp -q out $@
10+pre3: ; @testhelp -q out $@
11 
12 pre = .WAIT pre1 .WAIT pre2 | .WAIT pre3
13

M tests/mk/gnu/targets/WAIT/t020/mk

+2, -2

1@@ -1,6 +1,6 @@
2 
3 all : pre1 pre2
4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
7+pre2: ; @testhelp -q out $@
8 
9 .NOTPARALLEL:

M tests/mk/gnu/targets/WAIT/t021/mk

+4, -4

 1@@ -2,12 +2,12 @@
 2 all : p1 .WAIT np1
 3 
 4 p1: pre1 pre2
 5-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ file PRE1 wait PRE2 out end-$@
 6-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait PRE1 out $@ file PRE2
 7+pre1: ; @testhelp -q out start-$@ file PRE1 wait PRE2 out end-$@
 8+pre2: ; @testhelp -q wait PRE1 out $@ file PRE2
 9 
10 
11 np1: npre1 npre2
12-npre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
13-npre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
14+npre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
15+npre2: ; @testhelp -q out $@
16 
17 .NOTPARALLEL: np1

M tests/mk/gnu/targets/WAIT/t022/mk

+2, -2

 1@@ -1,7 +1,7 @@
 2 
 3 all : pre1 .WAIT pre2
 4-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
 5-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
 6+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
 7+pre2: ; @testhelp -q out $@
 8 
 9 # This is just here so we don't fail with older versions of make
10 .WAIT:

M tests/mk/gnu/targets/WAIT/t023/mk

+2, -2

1@@ -1,6 +1,6 @@
2 
3-pre1: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out start-$@ sleep 1 out end-$@
4-pre2: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@
5+pre1: ; @testhelp -q out start-$@ sleep 1 out end-$@
6+pre2: ; @testhelp -q out $@
7 
8 # This is just here so we don't fail with older versions of make
9 .WAIT:

M tests/mk/gnu/targets/WAIT/t025/mk

+6, -6

 1@@ -1,11 +1,11 @@
 2 
 3 all: A B
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-1 file A-1-done wait B-1-done out A-1-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-2 file A-2-done wait B-2-done out A-2-done
 6-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-3 file A-3-done wait B-3-done out A-3-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-1-done out B-1 out B-1-done file B-1-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-2-done out B-2 out B-2-done file B-2-done
 9-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-3-done out B-3 out B-3-done file B-3-done
10+A ::; @testhelp -q out A-1 file A-1-done wait B-1-done out A-1-done
11+A ::; @testhelp -q out A-2 file A-2-done wait B-2-done out A-2-done
12+A ::; @testhelp -q out A-3 file A-3-done wait B-3-done out A-3-done
13+B ::; @testhelp -q wait A-1-done out B-1 out B-1-done file B-1-done
14+B ::; @testhelp -q wait A-2-done out B-2 out B-2-done file B-2-done
15+B ::; @testhelp -q wait A-3-done out B-3 out B-3-done file B-3-done
16 
17 # This is just here so we don't fail with older versions of make
18 .WAIT:

M tests/mk/gnu/targets/WAIT/t026/mk

+6, -6

 1@@ -1,11 +1,11 @@
 2 
 3 all: A .WAIT B
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 6-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 9-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
10+A ::; @testhelp -q out $@-1 out $@-1-done
11+A ::; @testhelp -q out $@-2 out $@-2-done
12+A ::; @testhelp -q out $@-3 out $@-3-done
13+B ::; @testhelp -q out $@-1 out $@-1-done
14+B ::; @testhelp -q out $@-2 out $@-2-done
15+B ::; @testhelp -q out $@-3 out $@-3-done
16 
17 # This is just here so we don't fail with older versions of make
18 .WAIT:

M tests/mk/gnu/targets/WAIT/t027/mk

+6, -6

 1@@ -1,10 +1,10 @@
 2 
 3-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-1 file A-1-done wait B-1-done out A-1-done
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-2 file A-2-done wait B-2-done out A-2-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-3 file A-3-done wait B-3-done out A-3-done
 6-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-1-done out B-1 out B-1-done file B-1-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-2-done out B-2 out B-2-done file B-2-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-3-done out B-3 out B-3-done file B-3-done
 9+A ::; @testhelp -q out A-1 file A-1-done wait B-1-done out A-1-done
10+A ::; @testhelp -q out A-2 file A-2-done wait B-2-done out A-2-done
11+A ::; @testhelp -q out A-3 file A-3-done wait B-3-done out A-3-done
12+B ::; @testhelp -q wait A-1-done out B-1 out B-1-done file B-1-done
13+B ::; @testhelp -q wait A-2-done out B-2 out B-2-done file B-2-done
14+B ::; @testhelp -q wait A-3-done out B-3 out B-3-done file B-3-done
15 
16 # This is just here so we don't fail with older versions of make
17 .WAIT:

M tests/mk/gnu/targets/WAIT/t028/mk

+6, -6

 1@@ -1,10 +1,10 @@
 2 
 3-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 6-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 9+A ::; @testhelp -q out $@-1 out $@-1-done
10+A ::; @testhelp -q out $@-2 out $@-2-done
11+A ::; @testhelp -q out $@-3 out $@-3-done
12+B ::; @testhelp -q out $@-1 out $@-1-done
13+B ::; @testhelp -q out $@-2 out $@-2-done
14+B ::; @testhelp -q out $@-3 out $@-3-done
15 
16 # This is just here so we don't fail with older versions of make
17 .WAIT:

M tests/mk/gnu/targets/WAIT/t029/mk

+8, -8

 1@@ -1,15 +1,15 @@
 2 
 3 all: C .WAIT A B
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-1 file A-1-done wait B-1-done out A-1-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-2 file A-2-done wait B-2-done out A-2-done
 6-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-3 file A-3-done wait B-3-done out A-3-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-1-done out B-1 out B-1-done file B-1-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-2-done out B-2 out B-2-done file B-2-done
 9-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-3-done out B-3 out B-3-done file B-3-done
10+A ::; @testhelp -q out A-1 file A-1-done wait B-1-done out A-1-done
11+A ::; @testhelp -q out A-2 file A-2-done wait B-2-done out A-2-done
12+A ::; @testhelp -q out A-3 file A-3-done wait B-3-done out A-3-done
13+B ::; @testhelp -q wait A-1-done out B-1 out B-1-done file B-1-done
14+B ::; @testhelp -q wait A-2-done out B-2 out B-2-done file B-2-done
15+B ::; @testhelp -q wait A-3-done out B-3 out B-3-done file B-3-done
16 
17 C: D E
18-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D file D wait E-done out D-done
19-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait D out E out E-done file E-done
20+D:; @testhelp -q out D file D wait E-done out D-done
21+E:; @testhelp -q wait D out E out E-done file E-done
22 
23 .PHONY: C D E
24

M tests/mk/gnu/targets/WAIT/t030/mk

+8, -8

 1@@ -1,15 +1,15 @@
 2 
 3 all: C .WAIT A .WAIT B
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 6-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 9-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
10+A ::; @testhelp -q out $@-1 out $@-1-done
11+A ::; @testhelp -q out $@-2 out $@-2-done
12+A ::; @testhelp -q out $@-3 out $@-3-done
13+B ::; @testhelp -q out $@-1 out $@-1-done
14+B ::; @testhelp -q out $@-2 out $@-2-done
15+B ::; @testhelp -q out $@-3 out $@-3-done
16 
17 C: D E
18-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D file D wait E-done out D-done
19-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait D out E out E-done file E-done
20+D:; @testhelp -q out D file D wait E-done out D-done
21+E:; @testhelp -q wait D out E out E-done file E-done
22 
23 .PHONY: C D E
24

M tests/mk/gnu/targets/WAIT/t031/mk

+8, -8

 1@@ -1,14 +1,14 @@
 2 
 3-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-1 file A-1-done wait B-1-done out A-1-done
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-2 file A-2-done wait B-2-done out A-2-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-3 file A-3-done wait B-3-done out A-3-done
 6-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-1-done out B-1 out B-1-done file B-1-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-2-done out B-2 out B-2-done file B-2-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-3-done out B-3 out B-3-done file B-3-done
 9+A ::; @testhelp -q out A-1 file A-1-done wait B-1-done out A-1-done
10+A ::; @testhelp -q out A-2 file A-2-done wait B-2-done out A-2-done
11+A ::; @testhelp -q out A-3 file A-3-done wait B-3-done out A-3-done
12+B ::; @testhelp -q wait A-1-done out B-1 out B-1-done file B-1-done
13+B ::; @testhelp -q wait A-2-done out B-2 out B-2-done file B-2-done
14+B ::; @testhelp -q wait A-3-done out B-3 out B-3-done file B-3-done
15 
16 C: D E
17-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D file D wait E-done out D-done
18-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait D out E out E-done file E-done
19+D:; @testhelp -q out D file D wait E-done out D-done
20+E:; @testhelp -q wait D out E out E-done file E-done
21 
22 .PHONY: C D E
23

M tests/mk/gnu/targets/WAIT/t032/mk

+8, -8

 1@@ -1,14 +1,14 @@
 2 
 3-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 6-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 9+A ::; @testhelp -q out $@-1 out $@-1-done
10+A ::; @testhelp -q out $@-2 out $@-2-done
11+A ::; @testhelp -q out $@-3 out $@-3-done
12+B ::; @testhelp -q out $@-1 out $@-1-done
13+B ::; @testhelp -q out $@-2 out $@-2-done
14+B ::; @testhelp -q out $@-3 out $@-3-done
15 
16 C: D E
17-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D file D wait E-done out D-done
18-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait D out E out E-done file E-done
19+D:; @testhelp -q out D file D wait E-done out D-done
20+E:; @testhelp -q wait D out E out E-done file E-done
21 
22 .PHONY: C D E
23

M tests/mk/gnu/targets/WAIT/t033/mk

+8, -8

 1@@ -1,14 +1,14 @@
 2 
 3 all: A B
 4-A :: D; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-1 file A-1-done wait B-1-done out A-1-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-2 file A-2-done wait B-2-done out A-2-done
 6-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-3 file A-3-done wait B-3-done out A-3-done
 7-B :: E; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-1-done out B-1 out B-1-done file B-1-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-2-done out B-2 out B-2-done file B-2-done
 9-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-3-done out B-3 out B-3-done file B-3-done
10+A :: D; @testhelp -q out A-1 file A-1-done wait B-1-done out A-1-done
11+A ::; @testhelp -q out A-2 file A-2-done wait B-2-done out A-2-done
12+A ::; @testhelp -q out A-3 file A-3-done wait B-3-done out A-3-done
13+B :: E; @testhelp -q wait A-1-done out B-1 out B-1-done file B-1-done
14+B ::; @testhelp -q wait A-2-done out B-2 out B-2-done file B-2-done
15+B ::; @testhelp -q wait A-3-done out B-3 out B-3-done file B-3-done
16 
17-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D file D wait E-done out D-done
18-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait D out E out E-done file E-done
19+D:; @testhelp -q out D file D wait E-done out D-done
20+E:; @testhelp -q wait D out E out E-done file E-done
21 
22 .PHONY: D E
23

M tests/mk/gnu/targets/WAIT/t034/mk

+8, -8

 1@@ -1,14 +1,14 @@
 2 
 3 all: A .WAIT B
 4-A :: D; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 5-A ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 6-A ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 7-B :: E; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 8-B ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 9-B ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
10+A :: D; @testhelp -q out $@-1 out $@-1-done
11+A ::  ; @testhelp -q out $@-2 out $@-2-done
12+A ::  ; @testhelp -q out $@-3 out $@-3-done
13+B :: E; @testhelp -q out $@-1 out $@-1-done
14+B ::  ; @testhelp -q out $@-2 out $@-2-done
15+B ::  ; @testhelp -q out $@-3 out $@-3-done
16 
17-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D out D-done
18-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out E out E-done
19+D:; @testhelp -q out D out D-done
20+E:; @testhelp -q out E out E-done
21 
22 .PHONY: D E
23

M tests/mk/gnu/targets/WAIT/t035/mk

+9, -9

 1@@ -1,13 +1,13 @@
 2 
 3-A :: D; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-1 file A-1-done wait B-1-done out A-1-done
 4-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-2 file A-2-done wait B-2-done out A-2-done
 5-A ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out A-3 file A-3-done wait B-3-done out A-3-done
 6-B :: E; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-1-done out B-1 out B-1-done file B-1-done
 7-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-2-done out B-2 out B-2-done file B-2-done
 8-B ::; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait A-3-done out B-3 out B-3-done file B-3-done
 9-
10-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D file D wait E-done out D-done
11-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q wait D out E out E-done file E-done
12+A :: D; @testhelp -q out A-1 file A-1-done wait B-1-done out A-1-done
13+A ::; @testhelp -q out A-2 file A-2-done wait B-2-done out A-2-done
14+A ::; @testhelp -q out A-3 file A-3-done wait B-3-done out A-3-done
15+B :: E; @testhelp -q wait A-1-done out B-1 out B-1-done file B-1-done
16+B ::; @testhelp -q wait A-2-done out B-2 out B-2-done file B-2-done
17+B ::; @testhelp -q wait A-3-done out B-3 out B-3-done file B-3-done
18+
19+D:; @testhelp -q out D file D wait E-done out D-done
20+E:; @testhelp -q wait D out E out E-done file E-done
21 
22 .PHONY: D E
23

M tests/mk/gnu/targets/WAIT/t036/mk

+9, -9

 1@@ -1,13 +1,13 @@
 2 
 3-A :: D; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 4-A ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 5-A ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 6-B :: E; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-1 out $@-1-done
 7-B ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-2 out $@-2-done
 8-B ::  ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out $@-3 out $@-3-done
 9-
10-D:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out D out D-done
11-E:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q out E out E-done
12+A :: D; @testhelp -q out $@-1 out $@-1-done
13+A ::  ; @testhelp -q out $@-2 out $@-2-done
14+A ::  ; @testhelp -q out $@-3 out $@-3-done
15+B :: E; @testhelp -q out $@-1 out $@-1-done
16+B ::  ; @testhelp -q out $@-2 out $@-2-done
17+B ::  ; @testhelp -q out $@-3 out $@-3-done
18+
19+D:; @testhelp -q out D out D-done
20+E:; @testhelp -q out E out E-done
21 
22 .PHONY: D E
23

M tests/mk/gnu/variables/GNUMAKEFLAGS/t004/mk

+1, -1

1@@ -1,2 +1,2 @@
2 
3-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env GNUMAKEFLAGS
4+all: ; @testhelp env GNUMAKEFLAGS

M tests/mk/gnu/variables/GNUMAKEFLAGS/t005/mk

+1, -1

1@@ -1,2 +1,2 @@
2 
3-all: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env GNUMAKEFLAGS
4+all: ; @testhelp env GNUMAKEFLAGS

M tests/mk/gnu/variables/MAKEFLAGS/t142/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 > $(info $(MAKEFLAGS))
5-> /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+> testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t142/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t142.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t143/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 > $(info $(MAKEFLAGS))
5-> /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+> testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t143/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t143.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t144/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 > $(info $(MAKEFLAGS))
5-> /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+> testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t144/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t144.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t145/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 > $(info $(MAKEFLAGS))
5-> /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+> testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t145/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t145.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t146/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t146/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t146.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t147/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t147/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t147.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t148/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t148/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t148.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t149/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t149/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t149.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t150/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t150/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t150.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t151/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t151/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t151.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t152/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t152/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t152.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t153/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t153/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t153.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t154/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t154/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t154.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t155/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t155/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t155.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t156/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t156/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t156.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t157/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t157/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t157.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t158/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t158/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t158.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t159/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t159/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t159.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t160/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t160/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t160.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t161/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t161/out

+1, -1

1@@ -1,4 +1,4 @@
2 S
3 S
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t161.mk:7: one] Error 1

M tests/mk/gnu/variables/MAKEFLAGS/t162/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t162/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t162.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t163/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t163/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t163.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t164/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t164/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t164.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t165/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t165/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t165.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t166/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t166/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t166.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t167/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t167/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t167.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t168/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t168/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t168.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/MAKEFLAGS/t169/mk

+1, -1

1@@ -4,5 +4,5 @@ $(info $(MAKEFLAGS))
2 all: one two
3 one:
4 	 $(info $(MAKEFLAGS))
5-	 /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
6+	 testhelp -q fail 1
7 two:; $(info $@)

M tests/mk/gnu/variables/MAKEFLAGS/t169/out

+1, -1

1@@ -1,6 +1,6 @@
2 k
3 k
4-/usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
5+testhelp -q fail 1
6 shin-make: *** [t169.mk:7: one] Error 1
7 two
8 shin-make: Target 'all' not remade because of errors.

M tests/mk/gnu/variables/SHELL/t008/mk

+1, -1

1@@ -1,3 +1,3 @@
2 
3 .SHELLFLAGS = -xec
4-all: ; @true; /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1; true
5+all: ; @true; testhelp -q fail 1; true

M tests/mk/gnu/variables/SHELL/t008/out

+1, -1

1@@ -1,3 +1,3 @@
2 + true
3-+ /usr/bin/perl /tmp/shin-extract/tests/thelp.pl -q fail 1
4++ testhelp -q fail 1
5 shin-make: *** [t008.mk:3: all] Error 1

M tests/mk/gnu/variables/WARNINGS/t001/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .WARNINGS = error
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/variables/WARNINGS/t002/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .WARNINGS = error
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/variables/WARNINGS/t003/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .WARNINGS = error
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/variables/WARNINGS/t004/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .WARNINGS = error
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/variables/WARNINGS/t005/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 .WARNINGS = error
4 $(info MF=$(MAKEFLAGS))
5-all:; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env MAKEFLAGS
6+all:; @testhelp env MAKEFLAGS

M tests/mk/gnu/variables/private/t005/mk

+2, -2

1@@ -1,6 +1,6 @@
2 
3 private export F = global
4-$(info $(shell /usr/bin/perl /tmp/shin-extract/tests/thelp.pl env F))
5+$(info $(shell testhelp env F))
6 a: b
7 b: export F=b
8-a b: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl raw $@ env F
9+a b: ; @testhelp raw $@ env F

M tests/mk/gnu/variables/private/t012/mk

+1, -1

1@@ -1,4 +1,4 @@
2 
3 a: private export FOO := a
4 a: b
5-b: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env FOO
6+b: ; @testhelp env FOO

M tests/mk/gnu/variables/private/t013/mk

+1, -1

1@@ -2,4 +2,4 @@
2 a: private export FOO := a
3 a: b
4 b: FOO := b
5-b: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env FOO
6+b: ; @testhelp env FOO

M tests/mk/gnu/variables/private/t014/mk

+1, -1

1@@ -3,4 +3,4 @@ export FOO := g
2 a: private export FOO := a
3 a: b
4 b:
5-b: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env FOO
6+b: ; @testhelp env FOO

M tests/mk/gnu/variables/private/t015/mk

+1, -1

1@@ -3,4 +3,4 @@ export FOO := g
2 a: private export FOO := a
3 a: b
4 b: FOO := b
5-b: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env FOO
6+b: ; @testhelp env FOO

M tests/mk/gnu/variables/private/t016/mk

+1, -1

1@@ -3,4 +3,4 @@ private export FOO := g
2 a: private export FOO := a
3 a: b
4 b: FOO := b
5-b: ; @/usr/bin/perl /tmp/shin-extract/tests/thelp.pl env FOO
6+b: ; @testhelp env FOO

commit dcccc2d

commit `dcccc2d`