diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-04-10 18:15:18 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-04-10 18:15:18 +0200 |
| commit | 31d57e6191a51b64bb0141cdc6b9aef849977208 (patch) | |
| tree | f81db7bcab6358e06610848ea3a960102d2dfaab /src/engine/SCons/ExecutorTests.py | |
| parent | aa3efbff633b3a37ef0b10f14e35af5f58b68bb6 (diff) | |
| parent | 301edd26f23e3d954dcea5cffc1ad13f969822ca (diff) | |
Merge tag 'upstream/2.5.0+repack'
Upstream version 2.5.0+repack
Diffstat (limited to 'src/engine/SCons/ExecutorTests.py')
| -rw-r--r-- | src/engine/SCons/ExecutorTests.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/ExecutorTests.py b/src/engine/SCons/ExecutorTests.py index 57fdf2b..8bade6c 100644 --- a/src/engine/SCons/ExecutorTests.py +++ b/src/engine/SCons/ExecutorTests.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001 - 2015 The SCons Foundation +# Copyright (c) 2001 - 2016 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/ExecutorTests.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog" +__revision__ = "src/engine/SCons/ExecutorTests.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" import sys import unittest @@ -83,7 +83,9 @@ class MyNode(object): executor(self) def get_env_scanner(self, env, kw): return MyScanner('dep-') - def get_implicit_deps(self, env, scanner, path): + def get_implicit_deps(self, env, scanner, path, kw={}): + if not scanner: + scanner = self.get_env_scanner(env, kw) return [scanner.prefix + str(self)] def add_to_implicit(self, deps): self.implicit.extend(deps) |