summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Scanner
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-02-26 17:40:22 (GMT)
committerSteven Knight <knight@baldmt.com>2003-02-26 17:40:22 (GMT)
commitc98c5391f5afa134589db88ebe986368a1b6097f (patch)
tree1a7e0f06222b16f346e09b1dcfc185e470fbd3e5 /src/engine/SCons/Scanner
parent8a816e6362b715a238183ae25551dbb6df7cddc3 (diff)
downloadSCons-c98c5391f5afa134589db88ebe986368a1b6097f.zip
SCons-c98c5391f5afa134589db88ebe986368a1b6097f.tar.gz
SCons-c98c5391f5afa134589db88ebe986368a1b6097f.tar.bz2
Fix str(Node.FS) in an SConscript file, and add a separate src_dir argument to SConscript(). (Charles Crain)
Diffstat (limited to 'src/engine/SCons/Scanner')
-rw-r--r--src/engine/SCons/Scanner/CTests.py1
-rw-r--r--src/engine/SCons/Scanner/FortranTests.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/engine/SCons/Scanner/CTests.py b/src/engine/SCons/Scanner/CTests.py
index 332f7e1..c865e6e 100644
--- a/src/engine/SCons/Scanner/CTests.py
+++ b/src/engine/SCons/Scanner/CTests.py
@@ -324,6 +324,7 @@ class CScannerTestCase10(unittest.TestCase):
path = s.path(env)
test.write('include/fa.cpp', test.read('fa.cpp'))
deps = s(fs.File('#include/fa.cpp'), env, path)
+ fs.chdir(fs.Dir('..'))
deps_match(self, deps, [ 'include/fa.h', 'include/fb.h' ])
test.unlink('include/fa.cpp')
diff --git a/src/engine/SCons/Scanner/FortranTests.py b/src/engine/SCons/Scanner/FortranTests.py
index b2cf14c..7564c1e 100644
--- a/src/engine/SCons/Scanner/FortranTests.py
+++ b/src/engine/SCons/Scanner/FortranTests.py
@@ -338,6 +338,7 @@ class FortranScannerTestCase12(unittest.TestCase):
path = s.path(env)
test.write('include/fff4.f', test.read('fff4.f'))
deps = s(fs.File('#include/fff4.f'), env, path)
+ fs.chdir(fs.Dir('..'))
deps_match(self, deps, ['include/f4.f'])
test.unlink('include/fff4.f')