Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- lib/am/header-vars.am | 4 ++-- lib/am/parallel-tests.am | 2 +- t/internals.tap | 30 +++++++++++++++--------------- 3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 1035ef6..e3a0ee1 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -179,11 +179,11 @@ am.util.uniq = $(strip \ ## tolower="\$(subst $C,$c,$tolower)" ## done ## echo "am.util.tolower = $tolower" -## echo "am__toupper = $toupper" +## echo "am.util.toupper = $toupper" am.util.tolower = $(subst Z,z,$(subst Y,y,$(subst X,x,$(subst W,w,$(subst V,v,$(subst U,u,$(subst T,t,$(subst S,s,$(subst R,r,$(subst Q,q,$(subst P,p,$(subst O,o,$(subst N,n,$(subst M,m,$(subst L,l,$(subst K,k,$(subst J,j,$(subst I,i,$(subst H,h,$(subst G,g,$(subst F,f,$(subst E,e,$(subst D,d,$(subst C,c,$(subst B,b,$(subst A,a,$1)))))))))))))))))))))))))) -am__toupper = $(subst z,Z,$(subst y,Y,$(subst x,X,$(subst w,W,$(subst v,V,$(subst u,U,$(subst t,T,$(subst s,S,$(subst r,R,$(subst q,Q,$(subst p,P,$(subst o,O,$(subst n,N,$(subst m,M,$(subst l,L,$(subst k,K,$(subst j,J,$(subst i,I,$(subst h,H,$(subst g,G,$(subst f,F,$(subst e,E,$(subst d,D,$(subst c,C,$(subst b,B,$(subst a,A,$1)))))))))))))))))))))))))) +am.util.toupper = $(subst z,Z,$(subst y,Y,$(subst x,X,$(subst w,W,$(subst v,V,$(subst u,U,$(subst t,T,$(subst s,S,$(subst r,R,$(subst q,Q,$(subst p,P,$(subst o,O,$(subst n,N,$(subst m,M,$(subst l,L,$(subst k,K,$(subst j,J,$(subst i,I,$(subst h,H,$(subst g,G,$(subst f,F,$(subst e,E,$(subst d,D,$(subst c,C,$(subst b,B,$(subst a,A,$1)))))))))))))))))))))))))) # Canonicalize the given filename. See also the &canonicalize function # in the automake script. diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am index 86d9fbe..be9fdd1 100644 --- a/lib/am/parallel-tests.am +++ b/lib/am/parallel-tests.am @@ -64,7 +64,7 @@ am__runtest = \ ## Turn e.g., ".test" in "_TEST", and return the empty string unchanged. am__tpfx = \ - $(if $1,$(call am__toupper,$(patsubst .%,%_,$1))) + $(if $1,$(call am.util.toupper,$(patsubst .%,%_,$1))) !define am__handle_per_suffix_test ! diff --git a/t/internals.tap b/t/internals.tap index 256784c..ef26cbe 100755 --- a/t/internals.tap +++ b/t/internals.tap @@ -114,20 +114,20 @@ test-strip-suffixes: .PHONY: test-toupper test-toupper: - test '$(call am__toupper,a)' = A - test '$(call am__toupper,A)' = A - test '$(call am__toupper,aba)' = ABA - test '$(call am__toupper,a b)' = 'A B' - test '$(call am__toupper, a B)' = ' A B' - test '$(call am__toupper,Ab )' = 'AB ' - test '$(call am__toupper,A B c )' = 'A B C ' - test '$(call am__toupper,0)' = 0 - test '$(call am__toupper,0d)' = 0D - test '$(call am__toupper,@:&/?-)' = '@:&/?-' - test '$(call am__toupper,a@B)' = A@B - test '$(call am__toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX - test '$(call am__toupper,$(lower))' = '$(upper)' - test '$(call am__toupper,$(upper))' = '$(upper)' + test '$(call am.util.toupper,a)' = A + test '$(call am.util.toupper,A)' = A + test '$(call am.util.toupper,aba)' = ABA + test '$(call am.util.toupper,a b)' = 'A B' + test '$(call am.util.toupper, a B)' = ' A B' + test '$(call am.util.toupper,Ab )' = 'AB ' + test '$(call am.util.toupper,A B c )' = 'A B C ' + test '$(call am.util.toupper,0)' = 0 + test '$(call am.util.toupper,0d)' = 0D + test '$(call am.util.toupper,@:&/?-)' = '@:&/?-' + test '$(call am.util.toupper,a@B)' = A@B + test '$(call am.util.toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX + test '$(call am.util.toupper,$(lower))' = '$(upper)' + test '$(call am.util.toupper,$(upper))' = '$(upper)' .PHONY: test-tolower test-tolower: @@ -190,7 +190,7 @@ command_ok_ am.util.strip-last-word $MAKE test-strip-last-word command_ok_ am.util.uniq $MAKE test-uniq command_ok_ am.util.strip-suffixes $MAKE test-strip-suffixes command_ok_ am.util.tolower $MAKE test-tolower -command_ok_ am__toupper $MAKE test-toupper +command_ok_ am.util.toupper $MAKE test-toupper command_ok_ am__canon $MAKE test-canonicalize command_ok_ "am__newline (1)" $MAKE test-newline-1 command_ok_ "am__newline (2)" $MAKE test-newline-2 -- 1.7.10.4