summaryrefslogtreecommitdiffstats
path: root/test/BuildDir.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-05-02 04:09:02 (GMT)
committerSteven Knight <knight@baldmt.com>2003-05-02 04:09:02 (GMT)
commit77568a787451a72ef62198db424ac62bbaf50294 (patch)
tree1c9a820e32ea1a4eb89d70d9ef895ed6557cb2a4 /test/BuildDir.py
parent8adc0857c2ebd976314a29ca338d6ce82ece251f (diff)
downloadSCons-77568a787451a72ef62198db424ac62bbaf50294.zip
SCons-77568a787451a72ef62198db424ac62bbaf50294.tar.gz
SCons-77568a787451a72ef62198db424ac62bbaf50294.tar.bz2
Fix regression tests that use test.whereis(). (Anthony Roach)
Diffstat (limited to 'test/BuildDir.py')
-rw-r--r--test/BuildDir.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/test/BuildDir.py b/test/BuildDir.py
index 1f04c92..c10ef3e 100644
--- a/test/BuildDir.py
+++ b/test/BuildDir.py
@@ -37,15 +37,7 @@ else:
test = TestSCons.TestSCons()
-test.write('SConstruct', """
-try:
- print Environment()['F77']
-except:
- print 'There is no fortran compiler.'
-""")
-test.run(arguments = ".")
-f77 = test.where_is(test.stdout()[:-1])
-test.unlink('SConstruct')
+f77 = test.detect('F77')
foo11 = test.workpath('test', 'build', 'var1', 'foo1' + _exe)
foo12 = test.workpath('test', 'build', 'var1', 'foo2' + _exe)
@@ -139,7 +131,7 @@ try:
except:
f77 = None
-if f77 and WhereIs(env['F77']):
+if f77 and env.Detect(env['F77']):
env.Command(target='b2.f', source='b2.in', action=buildIt)
env.Copy(LIBS = [r'%s']).Program(target='bar2', source='b2.f')
env.Copy(LIBS = [r'%s']).Program(target='bar1', source='b1.f')