summaryrefslogtreecommitdiff
path: root/src/engine/SCons/SConfTests.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-03-10 14:14:33 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-03-10 14:14:33 +0100
commitdf69433d6a185b997f1ec3c0d30768061c5b500f (patch)
treef976ed6769e1273e04dca843c18d8bf87fc9b976 /src/engine/SCons/SConfTests.py
parentda3aa9be25ad2463a8f27318b914d2322f782a9e (diff)
parent68e4fe5ac49effe8959bc8532584edf04553c931 (diff)
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'src/engine/SCons/SConfTests.py')
-rw-r--r--src/engine/SCons/SConfTests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index 1ad3298..ba9eb02 100644
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/SConfTests.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/SConfTests.py 4691 2010/03/06 16:22:36 bdbaddog"
import os
import re
@@ -168,7 +168,8 @@ class SConfTestCase(unittest.TestCase):
sconf = self.SConf.SConf(self.scons_env,
conf_dir=self.test.workpath('config.tests'),
log_file=self.test.workpath('config.log'))
- class MyBuilder:
+ import SCons.Builder
+ class MyBuilder(SCons.Builder.BuilderBase):
def __init__(self):
self.prefix = ''
self.suffix = ''