diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | src/CHANGES.txt | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 3 | ||||
| -rw-r--r-- | test/Fortran/FORTRANPPFILESUFFIXES.py | 89 | ||||
| -rw-r--r-- | test/option-s.py | 5 |
5 files changed, 104 insertions, 1 deletions
@@ -5,3 +5,4 @@ syntax:glob *.py[co] .sconsign* .svn +*~ diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d1ae455..f759622 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,10 @@ RELEASE 2.X.X - + From Mortoray: + - Make -s (silent mode) be silent about entering subdirs (#2976). + - Fix cloning of builders when cloning environment (#2821). + From Gary Oberbrunner: - Show valid Visual Studio architectures in error message when user passes invalid arch. @@ -25,6 +29,9 @@ RELEASE 2.X.X - From Rob Managan: - Updated the TeX builder to support LaTeX's multibib package. + From Arve Knudsen: + - Test for FORTRANPPFILESUFFIXES (#2129). + RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700 diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 0e029b5..bcb013e 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -869,7 +869,8 @@ def _main(parser): script_dir = '' if script_dir and script_dir != os.getcwd(): - display("scons: Entering directory `%s'" % script_dir) + if not options.silent: + display("scons: Entering directory `%s'" % script_dir) try: os.chdir(script_dir) except OSError: diff --git a/test/Fortran/FORTRANPPFILESUFFIXES.py b/test/Fortran/FORTRANPPFILESUFFIXES.py new file mode 100644 index 0000000..e0c6974 --- /dev/null +++ b/test/Fortran/FORTRANPPFILESUFFIXES.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +""" Test manipulating FORTRANPPFILESUFFIXES. """ + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os +import string +import sys +import TestSCons + +from common import write_fake_link + +_python_ = TestSCons._python_ +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + +write_fake_link(test) + +test.write('myfortran.py', r""" +import getopt +import sys + +comment = '#' + sys.argv[1] +args = sys.argv[2:] +# First parse defines, since getopt won't have it +defines = [] +for a in args[:]: + if a.startswith("-D") or a.startswith("/D"): + defines.append(a[2:]) + args.remove(a) + +opts, args = getopt.getopt(args, 'co:') +for opt, arg in opts: + if opt == '-o': out = arg +infile = open(args[0], 'rb') +outfile = open(out, 'wb') +for d in defines: + outfile.write("#define %s\n" % (d,)) +for l in infile.readlines(): + if l[:len(comment)] != comment: + outfile.write(l) +sys.exit(0) +""") + +# Test non default file suffix: .f, .f90 and .f95 for FORTRAN +test.write('SConstruct', """ +env = Environment(LINK=r'%(_python_)s mylink.py', + LINKFLAGS=[], + CPPDEFINES=["mosdef"], + F77=r'%(_python_)s myfortran.py g77', + FORTRAN=r'%(_python_)s myfortran.py fortran', + FORTRANPPFILESUFFIXES=['.f', '.fpp'], + tools=['default', 'fortran']) +env.Program(target = 'test01', source = 'test01.f') +env.Program(target = 'test02', source = 'test02.fpp') +""" % locals()) + +test.write('test01.f', "This is a .f file.\n#link\n#fortran\n") +test.write('test02.fpp', "This is a .fpp file.\n#link\n#fortran\n") + +test.run(arguments='.', stderr=None) + +test.must_match('test01' + _exe, "#define mosdef\nThis is a .f file.\n") +test.must_match('test02' + _exe, "#define mosdef\nThis is a .fpp file.\n") + +test.pass_test() diff --git a/test/option-s.py b/test/option-s.py index 6950fc9..f79c347 100644 --- a/test/option-s.py +++ b/test/option-s.py @@ -67,6 +67,11 @@ test.run(arguments = '--quiet f1.out f2.out', stdout = "") test.fail_test(not os.path.exists(test.workpath('f1.out'))) test.fail_test(not os.path.exists(test.workpath('f2.out'))) +# -C should also be quiet Issue#2796 +test.subdir( 'sub' ) +test.write(['sub','SConstruct'],"") +test.run(arguments = '-s -C sub', stdout = "" ) + test.pass_test() |