diff options
| author | Steven Knight <knight@baldmt.com> | 2003-04-19 23:30:23 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-04-19 23:30:23 (GMT) |
| commit | 1691e6792ea238c0cfe3d8f4cc1aa56262d343b4 (patch) | |
| tree | 637b24aa35a0cf3a02a1b437cec7d90dc178db5a | |
| parent | e6b7921406394594c23f907469e923ccf028adcc (diff) | |
| download | SCons-1691e6792ea238c0cfe3d8f4cc1aa56262d343b4.zip SCons-1691e6792ea238c0cfe3d8f4cc1aa56262d343b4.tar.gz SCons-1691e6792ea238c0cfe3d8f4cc1aa56262d343b4.tar.bz2 | |
Fixes for __COPYRIGHT__ in tests; eliminate unnecessary output.
| -rw-r--r-- | test/GSFLAGS.py | 1 | ||||
| -rw-r--r-- | test/option--profile.py | 6 | ||||
| -rw-r--r-- | test/option-v.py | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/test/GSFLAGS.py b/test/GSFLAGS.py index a28d374..2ea02a9 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 ca0ec05..5a6e473 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 e3cd91b..ab9fef0 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') |