summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-08-13 15:33:43 (GMT)
committerSteven Knight <knight@baldmt.com>2005-08-13 15:33:43 (GMT)
commitb48f4cb7b1bc00ca606bd71191fcddcc99be53f6 (patch)
tree681c616530aecc39d192ff2270578a7c58430621 /test
parent52fcda2435759339de636e5d5abad71b0f5372ad (diff)
downloadSCons-b48f4cb7b1bc00ca606bd71191fcddcc99be53f6.zip
SCons-b48f4cb7b1bc00ca606bd71191fcddcc99be53f6.tar.gz
SCons-b48f4cb7b1bc00ca606bd71191fcddcc99be53f6.tar.bz2
Handle Visual Studio project and solution files in Unicode. (Chen Lee)
Diffstat (limited to 'test')
-rw-r--r--test/CPPPATH.py143
-rw-r--r--test/Fortran/F77PATH.py207
-rw-r--r--test/Fortran/F90PATH.py134
3 files changed, 401 insertions, 83 deletions
diff --git a/test/CPPPATH.py b/test/CPPPATH.py
index 6b41a38..9ce5e15 100644
--- a/test/CPPPATH.py
+++ b/test/CPPPATH.py
@@ -38,10 +38,14 @@ args = prog + ' ' + subdir_prog + ' ' + variant_prog
test = TestSCons.TestSCons()
-test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2')
+test.subdir('foobar',
+ 'include',
+ 'subdir',
+ ['subdir', 'include'],
+ 'inc2')
test.write('SConstruct', """
-env = Environment(CPPPATH = ['$FOO'],
+env = Environment(CPPPATH = ['$FOO', '${TARGET.dir}', '${SOURCE.dir}'],
FOO='include')
obj = env.Object(target='foobar/prog', source='subdir/prog.c')
env.Program(target='prog', source=obj)
@@ -49,7 +53,7 @@ SConscript('subdir/SConscript', "env")
BuildDir('variant', 'subdir', 0)
include = Dir('include')
-env = Environment(CPPPATH=[include])
+env = Environment(CPPPATH=[include, '#foobar', '#subdir'])
SConscript('variant/SConscript', "env")
""")
@@ -70,9 +74,26 @@ r"""
#define BAR_STRING "include/bar.h 1\n"
""")
+test.write(['subdir', 'sss.h'],
+r"""
+#define SSS_STRING "subdir/sss.h\n"
+""")
+
+test.write(['foobar', 'ttt.h'],
+r"""
+#define TTT_STRING "foobar/ttt.h\n"
+""")
+
+test.write(['subdir', 'ttt.h'],
+r"""
+#define TTT_STRING "subdir/ttt.h\n"
+""")
+
test.write(['subdir', 'prog.c'],
r"""
#include <foo.h>
+#include <sss.h>
+#include <ttt.h>
#include <stdio.h>
int
@@ -82,6 +103,8 @@ main(int argc, char *argv[])
printf("subdir/prog.c\n");
printf(FOO_STRING);
printf(BAR_STRING);
+ printf(SSS_STRING);
+ printf(TTT_STRING);
return 0;
}
""")
@@ -102,13 +125,33 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = "subdir/prog.c\ninclude/foo.h 1\ninclude/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 1
+include/bar.h 1
+subdir/sss.h
+foobar/ttt.h
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = "subdir/prog.c\nsubdir/include/foo.h 1\nsubdir/include/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+subdir/include/foo.h 1
+subdir/include/bar.h 1
+subdir/sss.h
+subdir/ttt.h
+""")
test.run(program = test.workpath(variant_prog),
- stdout = "subdir/prog.c\ninclude/foo.h 1\ninclude/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 1
+include/bar.h 1
+subdir/sss.h
+foobar/ttt.h
+""")
+
+
# Make sure we didn't duplicate the source file in the variant subdirectory.
test.fail_test(os.path.exists(test.workpath('variant', 'prog.c')))
@@ -124,19 +167,41 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 2
+include/bar.h 1
+subdir/sss.h
+foobar/ttt.h
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = "subdir/prog.c\nsubdir/include/foo.h 1\nsubdir/include/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+subdir/include/foo.h 1
+subdir/include/bar.h 1
+subdir/sss.h
+subdir/ttt.h
+""")
test.run(program = test.workpath(variant_prog),
- stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 2
+include/bar.h 1
+subdir/sss.h
+foobar/ttt.h
+""")
+
+
# Make sure we didn't duplicate the source file in the variant subdirectory.
test.fail_test(os.path.exists(test.workpath('variant', 'prog.c')))
test.up_to_date(arguments = args)
+
+
#
test.write(['include', 'bar.h'],
r"""
@@ -146,34 +211,56 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 2\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 2
+include/bar.h 2
+subdir/sss.h
+foobar/ttt.h
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = "subdir/prog.c\nsubdir/include/foo.h 1\nsubdir/include/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+subdir/include/foo.h 1
+subdir/include/bar.h 1
+subdir/sss.h
+subdir/ttt.h
+""")
test.run(program = test.workpath(variant_prog),
- stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 2\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 2
+include/bar.h 2
+subdir/sss.h
+foobar/ttt.h
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
test.fail_test(os.path.exists(test.workpath('variant', 'prog.c')))
test.up_to_date(arguments = args)
+
+
# Change CPPPATH and make sure we don't rebuild because of it.
test.write('SConstruct', """
-env = Environment(CPPPATH = Split('inc2 include'))
+env = Environment(CPPPATH = Split('inc2 include ${TARGET.dir} ${SOURCE.dir}'))
obj = env.Object(target='foobar/prog', source='subdir/prog.c')
env.Program(target='prog', source=obj)
SConscript('subdir/SConscript', "env")
BuildDir('variant', 'subdir', 0)
include = Dir('include')
-env = Environment(CPPPATH=['inc2', include])
+env = Environment(CPPPATH=['inc2', include, '#foobar', '#subdir'])
SConscript('variant/SConscript', "env")
""")
test.up_to_date(arguments = args)
+
+
#
test.write(['inc2', 'foo.h'],
r"""
@@ -184,16 +271,36 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = "subdir/prog.c\ninc2/foo.h 1\ninclude/bar.h 2\n")
+ stdout = """\
+subdir/prog.c
+inc2/foo.h 1
+include/bar.h 2
+subdir/sss.h
+foobar/ttt.h
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = "subdir/prog.c\nsubdir/include/foo.h 1\nsubdir/include/bar.h 1\n")
+ stdout = """\
+subdir/prog.c
+subdir/include/foo.h 1
+subdir/include/bar.h 1
+subdir/sss.h
+subdir/ttt.h
+""")
test.run(program = test.workpath(variant_prog),
- stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 2\n")
+ stdout = """\
+subdir/prog.c
+include/foo.h 2
+include/bar.h 2
+subdir/sss.h
+foobar/ttt.h
+""")
test.up_to_date(arguments = args)
+
+
# Check that neither a null-string CPPPATH nor a
# a CPPPATH containing null values blows up.
test.write('SConstruct', """
@@ -213,4 +320,6 @@ test.run(arguments = '.',
stderr=TestSCons.noisy_ar,
match=TestSCons.match_re_dotall)
+
+
test.pass_test()
diff --git a/test/Fortran/F77PATH.py b/test/Fortran/F77PATH.py
index 4308bed..2869d27 100644
--- a/test/Fortran/F77PATH.py
+++ b/test/Fortran/F77PATH.py
@@ -34,62 +34,85 @@ prog = 'prog' + _exe
subdir_prog = os.path.join('subdir', 'prog' + _exe)
variant_prog = os.path.join('variant', 'prog' + _exe)
-args = prog + ' ' + subdir_prog + ' ' + variant_prog
+args = prog + ' ' + variant_prog + ' ' + subdir_prog
test = TestSCons.TestSCons()
-if not test.detect('F77', 'g77'):
+if not test.detect('_F77G', 'g77'):
test.skip_test('Found no $F77 tool; skipping test.\n')
-test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2')
+test.subdir('include',
+ 'subdir',
+ ['subdir', 'include'],
+ 'foobar',
+ 'inc2')
+
+
test.write('SConstruct', """
-env = Environment(F77PATH = ['$FOO'], LIBS = %s, FOO='include')
-obj = env.Object(target='foobar/prog', source='subdir/prog.f')
+env = Environment(F77PATH = ['$FOO', '${TARGET.dir}', '${SOURCE.dir}'],
+ LIBS = %s,
+ FOO='include',
+ F77FLAGS = '-x f77')
+obj = env.Object(target='foobar/prog', source='subdir/prog.f77')
env.Program(target='prog', source=obj)
SConscript('subdir/SConscript', "env")
BuildDir('variant', 'subdir', 0)
include = Dir('include')
-env = Environment(F77PATH=[include], LIBS = %s)
+env = Environment(F77PATH=[include, '#foobar', '#subdir'],
+ LIBS = %s,
+ F77FLAGS = '-x f77')
SConscript('variant/SConscript', "env")
""" % (FTN_LIB, FTN_LIB))
test.write(['subdir', 'SConscript'],
"""
Import("env")
-env.Program(target='prog', source='prog.f')
+env.Program(target='prog', source='prog.f77')
""")
-test.write(['include', 'foo.f'],
+test.write(['include', 'foo.f77'],
r"""
- PRINT *, 'include/foo.f 1'
- INCLUDE 'bar.f'
+ PRINT *, 'include/foo.f77 1'
+ INCLUDE 'bar.f77'
""")
-test.write(['include', 'bar.f'],
+test.write(['include', 'bar.f77'],
r"""
- PRINT *, 'include/bar.f 1'
+ PRINT *, 'include/bar.f77 1'
""")
-test.write(['subdir', 'prog.f'],
+test.write(['subdir', 'prog.f77'],
r"""
PROGRAM PROG
- PRINT *, 'subdir/prog.f'
- include 'foo.f'
+ PRINT *, 'subdir/prog.f77'
+ include 'foo.f77'
+ include 'sss.f77'
+ include 'ttt.f77'
STOP
END
""")
-test.write(['subdir', 'include', 'foo.f'],
+test.write(['subdir', 'include', 'foo.f77'],
+r"""
+ PRINT *, 'subdir/include/foo.f77 1'
+ INCLUDE 'bar.f77'
+""")
+
+test.write(['subdir', 'include', 'bar.f77'],
+r"""
+ PRINT *, 'subdir/include/bar.f77 1'
+""")
+
+test.write(['subdir', 'sss.f77'],
r"""
- PRINT *, 'subdir/include/foo.f 1'
- INCLUDE 'bar.f'
+ PRINT *, 'subdir/sss.f77'
""")
-test.write(['subdir', 'include', 'bar.f'],
+test.write(['subdir', 'ttt.f77'],
r"""
- PRINT *, 'subdir/include/bar.f 1'
+ PRINT *, 'subdir/ttt.f77'
""")
@@ -97,106 +120,192 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f\n include/foo.f 1\n include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 1
+ include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f\n subdir/include/foo.f 1\n subdir/include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ subdir/include/foo.f77 1
+ subdir/include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f\n include/foo.f 1\n include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 1
+ include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
-test.must_not_exist(test.workpath('variant', 'prog.f'))
+test.must_not_exist(test.workpath('variant', 'prog.f77'))
test.up_to_date(arguments = args)
-test.write(['include', 'foo.f'],
+
+
+test.write(['include', 'foo.f77'],
r"""
- PRINT *, 'include/foo.f 2'
- INCLUDE 'bar.f'
+ PRINT *, 'include/foo.f77 2'
+ INCLUDE 'bar.f77'
""")
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f\n include/foo.f 2\n include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 2
+ include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f\n subdir/include/foo.f 1\n subdir/include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ subdir/include/foo.f77 1
+ subdir/include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f\n include/foo.f 2\n include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 2
+ include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
-test.must_not_exist(test.workpath('variant', 'prog.f'))
+test.must_not_exist(test.workpath('variant', 'prog.f77'))
test.up_to_date(arguments = args)
+
+
#
-test.write(['include', 'bar.f'],
+test.write(['include', 'bar.f77'],
r"""
- PRINT *, 'include/bar.f 2'
+ PRINT *, 'include/bar.f77 2'
""")
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f\n include/foo.f 2\n include/bar.f 2\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 2
+ include/bar.f77 2
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f\n subdir/include/foo.f 1\n subdir/include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ subdir/include/foo.f77 1
+ subdir/include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f\n include/foo.f 2\n include/bar.f 2\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 2
+ include/bar.f77 2
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
-test.must_not_exist(test.workpath('variant', 'prog.f'))
+test.must_not_exist(test.workpath('variant', 'prog.f77'))
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 = %s)
-obj = env.Object(target='foobar/prog', source='subdir/prog.f')
+env = Environment(F77PATH = Split('inc2 include ${TARGET.dir} ${SOURCE.dir}'),
+ LIBS = %s,
+ F77FLAGS = '-x f77')
+obj = env.Object(target='foobar/prog', source='subdir/prog.f77')
env.Program(target='prog', source=obj)
SConscript('subdir/SConscript', "env")
BuildDir('variant', 'subdir', 0)
include = Dir('include')
-env = Environment(F77PATH=['inc2', include], LIBS = %s)
+env = Environment(F77PATH=['inc2', include, '#foobar', '#subdir'],
+ LIBS = %s,
+ F77FLAGS = '-x f77')
SConscript('variant/SConscript', "env")
""" % (FTN_LIB, FTN_LIB))
test.up_to_date(arguments = args)
#
-test.write(['inc2', 'foo.f'],
+test.write(['inc2', 'foo.f77'],
r"""
- PRINT *, 'inc2/foo.f 1'
- INCLUDE 'bar.f'
+ PRINT *, 'inc2/foo.f77 1'
+ INCLUDE 'bar.f77'
""")
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f\n inc2/foo.f 1\n include/bar.f 2\n")
+ stdout = """\
+ subdir/prog.f77
+ inc2/foo.f77 1
+ include/bar.f77 2
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f\n subdir/include/foo.f 1\n subdir/include/bar.f 1\n")
+ stdout = """\
+ subdir/prog.f77
+ subdir/include/foo.f77 1
+ subdir/include/bar.f77 1
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f\n include/foo.f 2\n include/bar.f 2\n")
+ stdout = """\
+ subdir/prog.f77
+ include/foo.f77 2
+ include/bar.f77 2
+ subdir/sss.f77
+ subdir/ttt.f77
+""")
test.up_to_date(arguments = args)
+
+
# Check that a null-string F77PATH doesn't blow up.
test.write('SConstruct', """
-env = Environment(F77PATH = '', LIBS = %s)
-env.Library('foo', source = 'empty.f')
+env = Environment(F77PATH = '', LIBS = %s, F77FLAGS = '-x f77')
+env.Object('foo', source = 'empty.f77')
""" % FTN_LIB)
-test.write('empty.f', '')
+test.write('empty.f77', '')
test.run(arguments = '.')
+
+
test.pass_test()
diff --git a/test/Fortran/F90PATH.py b/test/Fortran/F90PATH.py
index c1b6f49..87ddda1 100644
--- a/test/Fortran/F90PATH.py
+++ b/test/Fortran/F90PATH.py
@@ -58,11 +58,17 @@ LIBPATH = os.path.join(base, 'lib')
LIBS = ['irc']
os.environ['LD_LIBRARY_PATH'] = LIBPATH
-test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2')
+test.subdir('include',
+ 'subdir',
+ ['subdir', 'include'],
+ 'foobar',
+ 'inc2')
+
+
test.write('SConstruct', """
env = Environment(F90 = r'%s',
- F90PATH = ['$FOO'],
+ F90PATH = ['$FOO', '${TARGET.dir}', '${SOURCE.dir}'],
LINK = '$F90',
LIBPATH = %s,
LIBS = %s,
@@ -74,7 +80,7 @@ SConscript('subdir/SConscript', "env")
BuildDir('variant', 'subdir', 0)
include = Dir('include')
env = Environment(F90 = r'%s',
- F90PATH=[include],
+ F90PATH=[include, '#foobar', '#subdir'],
LINK = '$F90',
LIBPATH = %s,
LIBS = %s)
@@ -103,6 +109,8 @@ r"""
PROGRAM PROG
PRINT *, 'subdir/prog.f90'
include 'foo.f90'
+ include 'sss.f90'
+ include 'ttt.f90'
STOP
END
""")
@@ -118,24 +126,54 @@ r"""
PRINT *, 'subdir/include/bar.f90 1'
""")
+test.write(['subdir', 'sss.f90'],
+r"""
+ PRINT *, 'subdir/sss.f90'
+""")
+
+test.write(['subdir', 'ttt.f90'],
+r"""
+ PRINT *, 'subdir/ttt.f90'
+""")
+
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f90\n include/foo.f90 1\n include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 1
+ include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f90\n subdir/include/foo.f90 1\n subdir/include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ subdir/include/foo.f90 1
+ subdir/include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f90\n include/foo.f90 1\n include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 1
+ include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
test.must_not_exist(test.workpath('variant', 'prog.f90'))
test.up_to_date(arguments = args)
+
+
test.write(['include', 'foo.f90'],
r"""
PRINT *, 'include/foo.f90 2'
@@ -145,19 +183,39 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f90\n include/foo.f90 2\n include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 2
+ include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f90\n subdir/include/foo.f90 1\n subdir/include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ subdir/include/foo.f90 1
+ subdir/include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f90\n include/foo.f90 2\n include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 2
+ include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
test.must_not_exist(test.workpath('variant', 'prog.f90'))
test.up_to_date(arguments = args)
+
+
#
test.write(['include', 'bar.f90'],
r"""
@@ -167,23 +225,43 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f90\n include/foo.f90 2\n include/bar.f90 2\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 2
+ include/bar.f90 2
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f90\n subdir/include/foo.f90 1\n subdir/include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ subdir/include/foo.f90 1
+ subdir/include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f90\n include/foo.f90 2\n include/bar.f90 2\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 2
+ include/bar.f90 2
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
# Make sure we didn't duplicate the source file in the variant subdirectory.
test.must_not_exist(test.workpath('variant', 'prog.f90'))
test.up_to_date(arguments = args)
+
+
# Change F90PATH and make sure we don't rebuild because of it.
test.write('SConstruct', """
env = Environment(F90 = r'%s',
- F90PATH = Split('inc2 include'),
+ F90PATH = Split('inc2 include ${TARGET.dir} ${SOURCE.dir}'),
LINK = '$F90',
LIBPATH = %s,
LIBS = %s)
@@ -194,7 +272,7 @@ SConscript('subdir/SConscript', "env")
BuildDir('variant', 'subdir', 0)
include = Dir('include')
env = Environment(F90 = r'%s',
- F90PATH=['inc2', include],
+ F90PATH=['inc2', include, '#foobar', '#subdir'],
LINK = '$F90',
LIBPATH = %s,
LIBS = %s)
@@ -203,6 +281,8 @@ SConscript('variant/SConscript', "env")
test.up_to_date(arguments = args)
+
+
#
test.write(['inc2', 'foo.f90'],
r"""
@@ -213,14 +293,34 @@ r"""
test.run(arguments = args)
test.run(program = test.workpath(prog),
- stdout = " subdir/prog.f90\n inc2/foo.f90 1\n include/bar.f90 2\n")
+ stdout = """\
+ subdir/prog.f90
+ inc2/foo.f90 1
+ include/bar.f90 2
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(subdir_prog),
- stdout = " subdir/prog.f90\n subdir/include/foo.f90 1\n subdir/include/bar.f90 1\n")
+ stdout = """\
+ subdir/prog.f90
+ subdir/include/foo.f90 1
+ subdir/include/bar.f90 1
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.run(program = test.workpath(variant_prog),
- stdout = " subdir/prog.f90\n include/foo.f90 2\n include/bar.f90 2\n")
+ stdout = """\
+ subdir/prog.f90
+ include/foo.f90 2
+ include/bar.f90 2
+ subdir/sss.f90
+ subdir/ttt.f90
+""")
test.up_to_date(arguments = args)
+
+
test.pass_test()