summaryrefslogtreecommitdiffstats
path: root/test/Dir
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2020-01-10 14:49:48 (GMT)
committerMats Wichmann <mats@linux.com>2020-01-10 15:31:38 (GMT)
commit5c708ef1fbc6767582ccb71f2dffc28e6efd11c8 (patch)
tree1cdee0d544a7fe836d3212774910750556f1b5ba /test/Dir
parent9340ef85fea770d01d416ac2dbc2f4991a67e027 (diff)
downloadSCons-5c708ef1fbc6767582ccb71f2dffc28e6efd11c8.zip
SCons-5c708ef1fbc6767582ccb71f2dffc28e6efd11c8.tar.gz
SCons-5c708ef1fbc6767582ccb71f2dffc28e6efd11c8.tar.bz2
Clean up some manpage duplication, File, Dir
Removed some dupes in the Construction Variables section - the JAR entries plus File, Dir. Tweaked the File and Dir function entries, and the File and Directory Nodes section. The end-to-end tests for File and Dir didn't test the case of supplying a list-of-strings (thus returning a list-of-nodes) to those two functions, added a primitive one. Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/Dir')
-rw-r--r--test/Dir/Dir.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/test/Dir/Dir.py b/test/Dir/Dir.py
index e726b94..42a48f3 100644
--- a/test/Dir/Dir.py
+++ b/test/Dir/Dir.py
@@ -36,28 +36,34 @@ test = TestSCons.TestSCons()
test.write('SConstruct', """
DefaultEnvironment(tools=[])
-env = Environment(tools=[], FOO = 'fff', BAR = 'bbb')
+env = Environment(tools=[], FOO='fff', BAR='bbb')
print(Dir('ddd'))
print(Dir('$FOO'))
print(Dir('${BAR}_$BAR'))
+rv = Dir(['mmm', 'nnn'])
+rv_msg = [node.path for node in rv]
+print(rv_msg)
print(env.Dir('eee'))
print(env.Dir('$FOO'))
print(env.Dir('${BAR}_$BAR'))
+rv = env.Dir(['ooo', 'ppp'])
+rv_msg = [node.path for node in rv]
+print(rv_msg)
""")
-test.run(stdout = test.wrap_stdout(read_str = """\
+test.run(stdout=test.wrap_stdout(read_str="""\
ddd
$FOO
${BAR}_$BAR
+['mmm', 'nnn']
eee
fff
bbb_bbb
-""", build_str = """\
+['ooo', 'ppp']
+""", build_str="""\
scons: `.' is up to date.
"""))
-
-
test.write('SConstruct', """\
DefaultEnvironment(tools=[])
import os
@@ -66,7 +72,7 @@ def my_mkdir(target=None, source=None, env=None):
MDBuilder = Builder(action=my_mkdir, target_factory=Dir)
env = Environment(tools=[])
-env.Append(BUILDERS = {'MD':MDBuilder})
+env.Append(BUILDERS={'MD': MDBuilder})
env.MD(target='sub1', source=['SConstruct'])
env.MD(target='sub2', source=['SConstruct'], OVERRIDE='foo')
""")