summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-06-02 21:54:58 (GMT)
committerSteven Knight <knight@baldmt.com>2005-06-02 21:54:58 (GMT)
commit97bdb1f4e23bac6d3b3d02f855c5a25882212afb (patch)
treeaad52cb29da8e5b54f393dcf93c0c2e8b9961fcd /test
parent08db2bcf45cc262fb87acac1b008e74a86418349 (diff)
downloadSCons-97bdb1f4e23bac6d3b3d02f855c5a25882212afb.zip
SCons-97bdb1f4e23bac6d3b3d02f855c5a25882212afb.tar.gz
SCons-97bdb1f4e23bac6d3b3d02f855c5a25882212afb.tar.bz2
Don't print duplicate stats when --profile is used.
Diffstat (limited to 'test')
-rw-r--r--test/option/profile.py (renamed from test/option--profile.py)41
1 files changed, 29 insertions, 12 deletions
diff --git a/test/option--profile.py b/test/option/profile.py
index 412b8ce..b6a0027 100644
--- a/test/option--profile.py
+++ b/test/option/profile.py
@@ -33,12 +33,13 @@ import TestSCons
test = TestSCons.TestSCons()
+test.write('SConstruct', "\n")
+
scons_prof = test.workpath('scons.prof')
-test.run(arguments = "--profile=%s -v " % scons_prof)
-test.fail_test(string.find(test.stdout(), 'SCons by ') == -1)
-test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and
- string.find(test.stdout(), '__COPYRIGHT__') == -1)
+test.run(arguments = "--profile=%s -h" % scons_prof)
+test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1)
+test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1)
stats = pstats.Stats(scons_prof)
stats.sort_stats('time')
@@ -54,17 +55,17 @@ finally:
sys.stdout = save_stdout
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.main()') == -1)
+test.fail_test(string.find(s, 'print_help') == -1)
+test.fail_test(string.find(s, '_main') == -1)
test.fail_test(string.find(s, 'option_parser.py') == -1)
+
scons_prof = test.workpath('scons2.prof')
-test.run(arguments = "--profile %s -v " % scons_prof)
-test.fail_test(string.find(test.stdout(), 'SCons by ') == -1)
-test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and
- string.find(test.stdout(), '__COPYRIGHT__') == -1)
+test.run(arguments = "--profile %s -h" % scons_prof)
+test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1)
+test.fail_test(string.find(test.stdout(), 'Options:') == -1)
stats = pstats.Stats(scons_prof)
stats.sort_stats('time')
@@ -76,9 +77,25 @@ stats.strip_dirs().print_stats()
s = sys.stdout.getvalue()
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.main()') == -1)
+test.fail_test(string.find(s, 'print_help') == -1)
+test.fail_test(string.find(s, '_main') == -1)
test.fail_test(string.find(s, 'option_parser.py') == -1)
+
+
+
+scons_prof = test.workpath('scons3.prof')
+
+test.run(arguments = "--profile %s --debug=memory -h" % scons_prof)
+print test.stdout()
+test.fail_test(string.find(test.stdout(), 'usage: scons [OPTION]') == -1)
+test.fail_test(string.find(test.stdout(), 'Options:') == -1)
+
+expect = 'Memory before reading SConscript files'
+lines = string.split(test.stdout(), '\n')
+memory_lines = filter(lambda l, e=expect: string.find(l, e) != -1, lines)
+
+test.fail_test(len(memory_lines) != 1)
+
test.pass_test()