diff options
author | Dirk Baechle <dl9obn@darc.de> | 2015-08-06 23:50:31 +0200 |
---|---|---|
committer | Dirk Baechle <dl9obn@darc.de> | 2015-08-06 23:50:31 +0200 |
commit | 13347dff82754e520e42a22669bb8b7cd8cd6b2a (patch) | |
tree | 4a4d0d6b99d47221bcab4166c90adbf041de07e1 /test/Glob | |
parent | 6e8fbb1b6111941690fcf531fdda2f5c888f9bc0 (diff) | |
download | scons-13347dff82754e520e42a22669bb8b7cd8cd6b2a.tar.gz |
- fixed several tests and tools that still used Node attributes directly
(found by disabling the __getattr__ in Node/FS.py)
Diffstat (limited to 'test/Glob')
-rw-r--r-- | test/Glob/Repository.py | 2 | ||||
-rw-r--r-- | test/Glob/exclude.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Glob/Repository.py b/test/Glob/Repository.py index 0a2e3267..22a7f887 100644 --- a/test/Glob/Repository.py +++ b/test/Glob/Repository.py @@ -75,7 +75,7 @@ test.write(['repository', 'src', 'SConscript'], """ Import("env") env.Build('xxx.out', Glob('x*.in')) env.Build('yyy.out', Glob('yy?.in')) -env.Build('zzz.out', sorted(Glob('*/zzz.in'), key=lambda t: t.abspath)) +env.Build('zzz.out', sorted(Glob('*/zzz.in'), key=lambda t: t.get_abspath())) """) test.write(['repository', 'src', 'xxx.in'], "repository/src/xxx.in\n") diff --git a/test/Glob/exclude.py b/test/Glob/exclude.py index 56b58a82..fe93b82f 100644 --- a/test/Glob/exclude.py +++ b/test/Glob/exclude.py @@ -46,9 +46,9 @@ def concatenate(target, source, env): env['BUILDERS']['Concatenate'] = Builder(action=concatenate) -env.Concatenate('fa.out', sorted(Glob('f*.in' , exclude=['f2.in', 'f4.*'] , strings=False), key=lambda t: t.path)) +env.Concatenate('fa.out', sorted(Glob('f*.in' , exclude=['f2.in', 'f4.*'] , strings=False), key=lambda t: t.get_internal_path())) env.Concatenate('fb.out', sorted(Glob('f*.in' , exclude=['f2.in', 'f4.*'] , strings=True))) -env.Concatenate('fc.out', sorted(Glob('d?/f*.in', exclude=['d?/f1.*', 'f2.in'], strings=False), key=lambda t: t.path)) +env.Concatenate('fc.out', sorted(Glob('d?/f*.in', exclude=['d?/f1.*', 'f2.in'], strings=False), key=lambda t: t.get_internal_path())) env.Concatenate('fd.out', sorted(Glob('d?/f*.in', exclude=['d?/f1.*', 'f2.in'], strings=True))) env.Concatenate('fe.out', sorted(Glob('f*.in', exclude='f1.in' , strings=True))) env.Concatenate('ff.out', sorted(Glob('f*.in', exclude='other' , strings=True))) |