diff options
| author | Steven Knight <knight@baldmt.com> | 2003-04-26 13:02:02 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-04-26 13:02:02 (GMT) |
| commit | a925fbfbbecd978b6275ba0592e3bd21b0bd7781 (patch) | |
| tree | 292853eb221ebe82c9e9b47c03c74b78a155add0 /test/F77PATH.py | |
| parent | dbb26a739bda888c1b7e206dbf6753ebadc68ebc (diff) | |
| download | SCons-a925fbfbbecd978b6275ba0592e3bd21b0bd7781.zip SCons-a925fbfbbecd978b6275ba0592e3bd21b0bd7781.tar.gz SCons-a925fbfbbecd978b6275ba0592e3bd21b0bd7781.tar.bz2 | |
Portability fixes for test. (Chad Austin)
Diffstat (limited to 'test/F77PATH.py')
| -rw-r--r-- | test/F77PATH.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/test/F77PATH.py b/test/F77PATH.py index 2e99b90..f64abb0 100644 --- a/test/F77PATH.py +++ b/test/F77PATH.py @@ -33,6 +33,8 @@ if sys.platform == 'win32': else: _exe = '' +FTN_LIB = TestSCons.fortran_lib + prog = 'prog' + _exe subdir_prog = os.path.join('subdir', 'prog' + _exe) variant_prog = os.path.join('variant', 'prog' + _exe) @@ -47,16 +49,16 @@ if not test.where_is('g77'): test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2') test.write('SConstruct', """ -env = Environment(F77PATH = ['$FOO'], LIBS = 'g2c', FOO='include') +env = Environment(F77PATH = ['$FOO'], LIBS = r'%s', FOO='include') obj = env.Object(target='foobar/prog', source='subdir/prog.f') env.Program(target='prog', source=obj) SConscript('subdir/SConscript', "env") BuildDir('variant', 'subdir', 0) include = Dir('include') -env = Environment(F77PATH=[include], LIBS = 'g2c') +env = Environment(F77PATH=[include], LIBS = r'%s') SConscript('variant/SConscript', "env") -""") +""" % (FTN_LIB, FTN_LIB)) test.write(['subdir', 'SConscript'], """ @@ -159,16 +161,16 @@ test.up_to_date(arguments = args) # Change F77PATH and make sure we don't rebuild because of it. test.write('SConstruct', """ -env = Environment(F77PATH = Split('inc2 include'), LIBS = 'g2c') +env = Environment(F77PATH = Split('inc2 include'), LIBS = r'%s') obj = env.Object(target='foobar/prog', source='subdir/prog.f') env.Program(target='prog', source=obj) SConscript('subdir/SConscript', "env") BuildDir('variant', 'subdir', 0) include = Dir('include') -env = Environment(F77PATH=['inc2', include], LIBS = 'g2c') +env = Environment(F77PATH=['inc2', include], LIBS = r'%s') SConscript('variant/SConscript', "env") -""") +""" % (FTN_LIB, FTN_LIB)) test.up_to_date(arguments = args) @@ -194,9 +196,11 @@ test.up_to_date(arguments = args) # Check that a null-string F77PATH doesn't blow up. test.write('SConstruct', """ -env = Environment(F77PATH = '', LIBS = 'g2c') -env.Library('foo', source = '') -""") +env = Environment(F77PATH = '', LIBS = r'%s') +env.Library('foo', source = 'empty.f') +""" % FTN_LIB) + +test.write('empty.f', '') test.run(arguments = '.') |