From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 19 Apr 2003 23:30:23 +0000 (+0000)
Subject: Fixes for __COPYRIGHT__ in tests; eliminate unnecessary output.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=318c2e7157f607146ed79bd55821413e270e51b6;p=scons.git

Fixes for __COPYRIGHT__ in tests; eliminate unnecessary output.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@651 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/test/GSFLAGS.py b/test/GSFLAGS.py
index a28d3743..2ea02a9e 100644
--- a/test/GSFLAGS.py
+++ b/test/GSFLAGS.py
@@ -69,7 +69,6 @@ This is a .ps test.
 
 test.run(arguments = '.', stderr = None)
 
-print test.read('test1.pdf')
 test.fail_test(test.read('test1.pdf') != " -x\nThis is a .ps test.\n")
 
 
diff --git a/test/option--profile.py b/test/option--profile.py
index ca0ec051..5a6e4734 100644
--- a/test/option--profile.py
+++ b/test/option--profile.py
@@ -37,7 +37,8 @@ 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)
+test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and
+               string.find(test.stdout(), '__COPYRIGHT__') == -1)
 
 stats = pstats.Stats(scons_prof)
 stats.sort_stats('time')
@@ -58,7 +59,8 @@ 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)
+test.fail_test(string.find(test.stdout(), 'Copyright') == -1 and
+               string.find(test.stdout(), '__COPYRIGHT__') == -1)
 
 stats = pstats.Stats(scons_prof)
 stats.sort_stats('time')
diff --git a/test/option-v.py b/test/option-v.py
index e3cd91bb..ab9fef0c 100644
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -37,13 +37,13 @@ test.write('SConstruct', "")
 # depending on whether it's invoked through scons.py or scons.bat.
 expect1 = r"""SCons by Steven Knight et al.:
 \tengine: v\S+, [^,]*, by \S+ on \S+
-Copyright \(c\) 2001, 2002, 2003 Steven Knight
+(__COPYRIGHT__|Copyright \(c\) 2001, 2002, 2003 Steven Knight)
 """
 
 expect2 = r"""SCons by Steven Knight et al.:
 \tscript: v\S+, [^,]*, by \S+ on \S+
 \tengine: v\S+, [^,]*, by \S+ on \S+
-Copyright \(c\) 2001, 2002, 2003 Steven Knight
+(__COPYRIGHT__|Copyright \(c\) 2001, 2002, 2003 Steven Knight)
 """
 
 test.run(arguments = '-v')