diff options
| author | Alexey Klimkin <klimkin@gmail.com> | 2015-01-20 21:26:56 (GMT) |
|---|---|---|
| committer | Alexey Klimkin <klimkin@gmail.com> | 2015-01-20 21:26:56 (GMT) |
| commit | 8e4b5aca7a47a60ed3a5f0b98bf0804e91e182b4 (patch) | |
| tree | 13427f02edd42e3a0fde536c550c161102891b39 /src/engine/SCons/Scanner/ProgTests.py | |
| parent | 505226b97a4aaf41695e3e1c818f768e35565bf9 (diff) | |
| download | SCons-8e4b5aca7a47a60ed3a5f0b98bf0804e91e182b4.zip SCons-8e4b5aca7a47a60ed3a5f0b98bf0804e91e182b4.tar.gz SCons-8e4b5aca7a47a60ed3a5f0b98bf0804e91e182b4.tar.bz2 | |
Improve readability of LIB substitution code
Diffstat (limited to 'src/engine/SCons/Scanner/ProgTests.py')
| -rw-r--r-- | src/engine/SCons/Scanner/ProgTests.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py index 98e20cc..ace3ff4 100644 --- a/src/engine/SCons/Scanner/ProgTests.py +++ b/src/engine/SCons/Scanner/ProgTests.py @@ -32,6 +32,7 @@ import TestUnit import SCons.Node.FS import SCons.Scanner.Prog +import SCons.Subst test = TestCmd.TestCmd(workdir = '') @@ -72,12 +73,7 @@ class DummyEnvironment(object): del self.Dictionary()[key] def subst(self, s, target=None, source=None, conv=None): - try: - if isinstance(s, str) and s[0] == '$': - return self._dict[s[1:]] - except IndexError: - return '' - return s + return SCons.Subst.scons_subst(s, self, gvars=self._dict, lvars=self._dict) def subst_path(self, path, target=None, source=None, conv=None): if not isinstance(path, list): @@ -241,7 +237,8 @@ class ProgramScannerTestCase10(unittest.TestCase): LIBS=['foo', '$LIBBAR'], LIBPREFIXES=['lib'], LIBSUFFIXES=['.a'], - LIBBAR='sub/libbar xyz.other') + LIBBAR='sub/libbar $LIBBAR2', + LIBBAR2=['xyz.other']) s = SCons.Scanner.Prog.ProgramScanner() path = s.path(env) deps = s(DummyNode('dummy'), env, path) |