Issue 2264: Updated tests to reflect Node changes.

6 files changed, 55 insertions, 45 deletions

diff --git a/src/engine/SCons/ExecutorTests.py b/src/engine/SCons/ExecutorTests.py
index 9df0b2d..f390319 100644
--- a/src/engine/SCons/ExecutorTests.py
+++ b/src/engine/SCons/ExecutorTests.py
@@ -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)
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index a6471b4..4639cf9 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -132,7 +132,12 @@ class Environment(object):
     def get_factory(self, factory):
         return factory or MyNode
     def get_scanner(self, scanner_key):
-        return self._dict['SCANNERS'][0]
+        try:
+            return self._dict['SCANNERS'][0]
+        except:
+            pass
+
+        return []
 
 class Builder(object):
     def __init__(self, env=None, is_explicit=1):
@@ -185,7 +190,7 @@ class Scanner(object):
     def __call__(self, node):
         self.called = 1
         return node.GetTag('found_includes')
-    def path(self, env, dir, target=None, source=None):
+    def path(self, env, dir=None, target=None, source=None, kw={}):
         return ()
     def select(self, node):
         return self
@@ -928,7 +933,7 @@ class NodeTestCase(unittest.TestCase):
         node.Tag('found_includes', [d1, d2])
 
         # Simple return of the found includes
-        deps = node.get_implicit_deps(env, s, target)
+        deps = node.get_implicit_deps(env, s, s.path)
         assert deps == [d1, d2], deps
 
         # By default, our fake scanner recurses
@@ -938,24 +943,24 @@ class NodeTestCase(unittest.TestCase):
         d1.Tag('found_includes', [e, f])
         d2.Tag('found_includes', [e, f])
         f.Tag('found_includes', [g])
-        deps = node.get_implicit_deps(env, s, target)
+        deps = node.get_implicit_deps(env, s, s.path)
         assert deps == [d1, d2, e, f, g], list(map(str, deps))
 
         # Recursive scanning eliminates duplicates
         e.Tag('found_includes', [f])
-        deps = node.get_implicit_deps(env, s, target)
+        deps = node.get_implicit_deps(env, s, s.path)
         assert deps == [d1, d2, e, f, g], list(map(str, deps))
 
         # Scanner method can select specific nodes to recurse
         def no_fff(nodes):
             return [n for n in nodes if str(n)[0] != 'f']
         s.recurse_nodes = no_fff
-        deps = node.get_implicit_deps(env, s, target)
+        deps = node.get_implicit_deps(env, s, s.path)
         assert deps == [d1, d2, e, f], list(map(str, deps))
 
         # Scanner method can short-circuit recursing entirely
         s.recurse_nodes = lambda nodes: []
-        deps = node.get_implicit_deps(env, s, target)
+        deps = node.get_implicit_deps(env, s, s.path)
         assert deps == [d1, d2], list(map(str, deps))
 
     def test_get_env_scanner(self):
diff --git a/test/Fortran/FORTRANSUFFIXES.py b/test/Fortran/FORTRANSUFFIXES.py
index 583b71b..9673e6f 100644
--- a/test/Fortran/FORTRANSUFFIXES.py
+++ b/test/Fortran/FORTRANSUFFIXES.py
@@ -56,51 +56,51 @@ env = Environment(FORTRANPATH = ['.'],
 env.Append(FORTRANSUFFIXES = ['.x'])
 env.Object(target = 'test1', source = 'test1.f')
 env.InstallAs('test1_f', 'test1.f')
-env.InstallAs('test1_h', 'test1.h')
 env.InstallAs('test1_x', 'test1.x')
+env.InstallAs('test2_f', 'test2.f')
 """ % locals())
 
 test.write('test1.f', """\
       test1.f 1
-      INCLUDE 'test1.h'
+      INCLUDE 'test2.f'
       INCLUDE 'test1.x'
 """)
 
-test.write('test1.h', """\
-      test1.h 1
-      INCLUDE 'foo.h'
+test.write('test2.f', """\
+      test2.f 1
+      INCLUDE 'foo.f'
 """)
 
 test.write('test1.x', """\
       test1.x 1
-      INCLUDE 'foo.h'
+      INCLUDE 'foo.f'
 """)
 
-test.write('foo.h', """\
-      foo.h 1
+test.write('foo.f', """\
+      foo.f 1
 """)
 
 expect = test.wrap_stdout("""\
 %(_python_)s myfc.py test1.o test1.f
 Install file: "test1.f" as "test1_f"
-Install file: "test1.h" as "test1_h"
 Install file: "test1.x" as "test1_x"
+Install file: "test2.f" as "test2_f"
 """ % locals())
 
 test.run(arguments='.', stdout=expect)
 
 test.must_match('test1.o', """\
       test1.f 1
-      test1.h 1
-      foo.h 1
+      test2.f 1
+      foo.f 1
       test1.x 1
-      foo.h 1
+      foo.f 1
 """)
 
 test.up_to_date(arguments='.')
 
-test.write('foo.h', """\
-      foo.h 2
+test.write('foo.f', """\
+      foo.f 2
 """)
 
 expect = test.wrap_stdout("""\
@@ -111,17 +111,17 @@ test.run(arguments='.', stdout=expect)
 
 test.must_match('test1.o', """\
       test1.f 1
-      test1.h 1
-      foo.h 2
+      test2.f 1
+      foo.f 2
       test1.x 1
-      foo.h 2
+      foo.f 2
 """)
 
 test.up_to_date(arguments='.')
 
 test.write('test1.x', """\
       test1.x 2
-      INCLUDE 'foo.h'
+      INCLUDE 'foo.f'
 """)
 
 expect = test.wrap_stdout("""\
@@ -133,32 +133,32 @@ test.run(arguments='.', stdout=expect)
 
 test.must_match('test1.o', """\
       test1.f 1
-      test1.h 1
-      foo.h 2
+      test2.f 1
+      foo.f 2
       test1.x 2
-      foo.h 2
+      foo.f 2
 """)
 
 test.up_to_date(arguments='.')
 
-test.write('test1.h', """\
-      test1.h 2
-      INCLUDE 'foo.h'
+test.write('test2.f', """\
+      test2.f 2
+      INCLUDE 'foo.f'
 """)
 
 expect = test.wrap_stdout("""\
 %(_python_)s myfc.py test1.o test1.f
-Install file: "test1.h" as "test1_h"
+Install file: "test2.f" as "test2_f"
 """ % locals())
 
 test.run(arguments='.', stdout=expect)
 
 test.must_match('test1.o', """\
       test1.f 1
-      test1.h 2
-      foo.h 2
+      test2.f 2
+      foo.f 2
       test1.x 2
-      foo.h 2
+      foo.f 2
 """)
 
 test.up_to_date(arguments='.')
diff --git a/test/QT/manual.py b/test/QT/manual.py
index ff38f32..d911fb3 100644
--- a/test/QT/manual.py
+++ b/test/QT/manual.py
@@ -46,13 +46,15 @@ sources = ['aaa.cpp', 'bbb.cpp', 'ddd.cpp', 'eee.cpp', 'main.cpp']
 
 # normal invocation
 sources.append(env.Moc('include/aaa.h'))
-env.Moc('bbb.cpp')
+moc = env.Moc('bbb.cpp')
+env.Ignore( moc, moc )
 sources.extend(env.Uic('ui/ccc.ui')[1:])
 
 # manual target specification
 sources.append(env.Moc('moc-ddd.cpp', 'include/ddd.h',
                QT_MOCHPREFIX='')) # Watch out !
-env.Moc('moc_eee.cpp', 'eee.cpp')
+moc = env.Moc('moc_eee.cpp', 'eee.cpp')
+env.Ignore( moc, moc )
 sources.extend(env.Uic(['include/uic_fff.hpp', 'fff.cpp', 'fff.moc.cpp'],
                        'ui/fff.ui')[1:])
 
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index 1a14152..de0a795 100644
--- a/test/Scanner/exception.py
+++ b/test/Scanner/exception.py
@@ -83,23 +83,23 @@ env.Cat('bar', bar_in)
 
 test.write('foo.k', 
 """foo.k 1 line 1
-include xxx
-include yyy
+include xxx.k
+include yyy.k
 foo.k 1 line 4
 """)
 
 test.write('bar.in', 
-"""include yyy
+"""include yyy.k
 bar.in 1 line 2
 bar.in 1 line 3
-include zzz
+include zzz.k
 """)
 
-test.write('xxx', "xxx 1\n")
+test.write('xxx.k', "xxx 1\n")
 
-test.write('yyy', "exception yyy 1\n")
+test.write('yyy.k', "exception yyy 1\n")
 
-test.write('zzz', "zzz 1\n")
+test.write('zzz.k', "zzz 1\n")
 
 test.run(arguments = '.',
          status = 2,
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index 845111c..b41c7c8 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -338,6 +338,7 @@ class CScannerCounter(object):
 import SCons.Tool
 MyCScanner = CScannerCounter(SCons.Script.CScanner)
 SCons.Tool.SourceFileScanner.add_scanner('.c', MyCScanner)
+SCons.Tool.SourceFileScanner.add_scanner('.h', MyCScanner)
 
 env = Environment(CPPPATH = ".")
 l = env.StaticLibrary("g", Split("libg_1.c libg_2.c libg_3.c"))