From eb632d7676e92fd5750413ab6a6d16f3a6fda5c4 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 4 Mar 2012 08:09:09 +0000 Subject: Ensure appending private variables in pattern-specific target variables. Fixes Savannah bug #35468. --- tests/ChangeLog | 5 +++++ tests/scripts/variables/private | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) (limited to 'tests') diff --git a/tests/ChangeLog b/tests/ChangeLog index 7e7db50..9d98731 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2012-03-04 Paul Smith + + * scripts/variables/private: Test appending private variables in + pattern-specific target rules. See Savannah bug #35468. + 2012-03-03 Paul Smith * scripts/variables/SHELL: Ensure .SHELLFLAGS works with options diff --git a/tests/scripts/variables/private b/tests/scripts/variables/private index 1797745..012274e 100644 --- a/tests/scripts/variables/private +++ b/tests/scripts/variables/private @@ -87,4 +87,36 @@ bar1 bar2 bar3: ; @echo '$@: $(DEFS)' !, '', "bar3: FOO 3\nbar2: FOO\nbar1: FOO 1\n"); +# 10: Test append with pattern-specific variables and private + +run_make_test(q! +IA = global +PA = global +PS = global +S = global +PS = global +SV = global +b%: IA += b% +b%: private PA += b% +b%: private PS = b% +bar: all +bar: IA += bar +bar: private PA += bar +bar: private PS = bar +a%: IA += a% +a%: private PA += a% +a%: private PS = a% +all: IA += all +all: private PA += all +all: private PS = all + +bar all: ; @echo '$@: IA=$(IA)'; echo '$@: PA=$(PA)'; echo '$@: PS=$(PS)' +!, + '', "all: IA=global b% bar a% all +all: PA=global a% all +all: PS=all +bar: IA=global b% bar +bar: PA=global b% bar +bar: PS=bar\n"); + 1; -- cgit v1.2.3