Restore the ability for _stripixes() to call a custom _concat() function in the construction environment.

1 files changed, 54 insertions, 0 deletions

diff --git a/test/custom-concat.py b/test/custom-concat.py
new file mode 100644
index 00000000..987c12ef
--- /dev/null
+++ b/test/custom-concat.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify that _stripixes() can use a custom _concat() function through
+the construction environment.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+def my_concat1(pref, list, suff, env, f=None):
+    if f:
+        list = f(list)
+    list = map(lambda x, p=pref, s=suff: 'my'+p+x+s+'1', list)
+    return list
+myflags = '${_stripixes(MYPREFIX, LIST, MYSUFFIX, STRIPPREFIX, STRIPSUFFIX, __env__)}'
+env1 = Environment(MYFLAGS=myflags, _concat = my_concat1,
+                   MYPREFIX='p', MYSUFFIX='s',
+                   STRIPPREFIX='xxx', STRIPSUFFIX='yyy',
+                   LIST=['a', 'xxxb', 'cyyy', 'd'])
+print env1.subst('$MYFLAGS')
+""")
+
+expect = test.wrap_stdout(read_str = "mypas1 mypbs1 mypcs1 mypds1\n",
+                          build_str = "scons: `.' is up to date.\n")
+test.run(arguments = '.', stdout = expect)
+
+test.pass_test()