diff options
author | Steven Knight <knight@baldmt.com> | 2005-01-08 22:38:53 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2005-01-08 22:38:53 (GMT) |
commit | 69e3c442cdfb846cbcba7702d500e237b66be71e (patch) | |
tree | 7efb9d5d344c6d7cd76ae432a075d5ac4276aace /test | |
parent | 3c23f9969cea7931a8dea998a33b15ab51fe1a5f (diff) | |
download | SCons-69e3c442cdfb846cbcba7702d500e237b66be71e.zip SCons-69e3c442cdfb846cbcba7702d500e237b66be71e.tar.gz SCons-69e3c442cdfb846cbcba7702d500e237b66be71e.tar.bz2 |
Support 'from SConsScript import *' to allow Python modules imported by SConscript files to get at the global builders and functions more easily.
Diffstat (limited to 'test')
-rw-r--r-- | test/NodeOps.py | 2 | ||||
-rw-r--r-- | test/Script-import.py | 60 | ||||
-rw-r--r-- | test/option--profile.py | 19 |
3 files changed, 72 insertions, 9 deletions
diff --git a/test/NodeOps.py b/test/NodeOps.py index ffb8994..9a28c87 100644 --- a/test/NodeOps.py +++ b/test/NodeOps.py @@ -152,7 +152,7 @@ def exists_test(node): node.is_derived() node.is_pseudo_derived() import SCons.Script - if SCons.Script.options.noexec: + if SCons.Script.Main.options.noexec: if (before,via_node,after) != (False,False,False): import sys sys.stderr.write('BuildDir exits() populated during dryrun!\n') diff --git a/test/Script-import.py b/test/Script-import.py new file mode 100644 index 0000000..90052a5 --- /dev/null +++ b/test/Script-import.py @@ -0,0 +1,60 @@ +#!/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. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Test that a module that we import into an SConscript file +can itself easily import the global SCons variables. +""" + +import TestSCons + +test = TestSCons.TestSCons() + +test.write('SConstruct', """\ +import m1 +""") + +test.write("m1.py", """\ +from SCons.Script import * +SConscript('SConscript') +""") + +test.write('SConscript', """\ +import m2 +""") + +test.write("m2.py", """\ +from SCons.Script import * +Command("file.out", "file.in", Copy("$TARGET", "$SOURCE")) +""") + +test.write("file.in", "file.in\n") + +test.run(arguments = '.') + +test.must_match("file.out", "file.in\n") + +test.pass_test() diff --git a/test/option--profile.py b/test/option--profile.py index 5a6e473..412b8ce 100644 --- a/test/option--profile.py +++ b/test/option--profile.py @@ -43,15 +43,19 @@ test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and stats = pstats.Stats(scons_prof) stats.sort_stats('time') -sys.stdout = StringIO.StringIO() +try: + save_stdout = sys.stdout + sys.stdout = StringIO.StringIO() -stats.strip_dirs().print_stats() + stats.strip_dirs().print_stats() -s = sys.stdout.getvalue() + s = sys.stdout.getvalue() +finally: + sys.stdout = save_stdout -test.fail_test(string.find(s, '__init__.py') == -1) +test.fail_test(string.find(s, 'Main.py') == -1) test.fail_test(string.find(s, 'print_version') == -1) -test.fail_test(string.find(s, 'SCons.Script.main()') == -1) +test.fail_test(string.find(s, 'SCons.Script.Main.main()') == -1) test.fail_test(string.find(s, 'option_parser.py') == -1) @@ -71,11 +75,10 @@ stats.strip_dirs().print_stats() s = sys.stdout.getvalue() -test.fail_test(string.find(s, '__init__.py') == -1) +test.fail_test(string.find(s, 'Main.py') == -1) test.fail_test(string.find(s, 'print_version') == -1) -test.fail_test(string.find(s, 'SCons.Script.main()') == -1) +test.fail_test(string.find(s, 'SCons.Script.Main.main()') == -1) test.fail_test(string.find(s, 'option_parser.py') == -1) test.pass_test() - |