summaryrefslogtreecommitdiff
path: root/test/Scanner
diff options
context:
space:
mode:
authorWilliam Blevins <wblevins@gmail.com>2015-05-17 23:38:23 -0400
committerWilliam Blevins <wblevins@gmail.com>2015-05-17 23:38:23 -0400
commite09b3525f07ab9cc155c0b777f6c46b828a445ee (patch)
tree3c9145bc9f48945012640053a697769999c74a3e /test/Scanner
parent570f237ed2861f1131c6dd7dce8514ca8db760eb (diff)
downloadscons-e09b3525f07ab9cc155c0b777f6c46b828a445ee.tar.gz
Issue 2264: Updated tests to reflect Node changes.
Diffstat (limited to 'test/Scanner')
-rw-r--r--test/Scanner/exception.py14
-rw-r--r--test/Scanner/generated.py1
2 files changed, 8 insertions, 7 deletions
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index 1a141520..de0a7954 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 845111ce..b41c7c8a 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"))