From 72107dc14a1eae4176bca11b2fed1c34a5674e15 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 29 Jul 2010 13:48:15 +0000 Subject: Fix tests that examine version output to expect new "engine path:" line. --- test/Interactive/version.py | 2 ++ test/option-v.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/Interactive/version.py b/test/Interactive/version.py index f948db7..bbca9ef 100644 --- a/test/Interactive/version.py +++ b/test/Interactive/version.py @@ -63,12 +63,14 @@ test.run(arguments = '-Q --interactive', # depending on whether it's invoked through scons.py or scons.bat. expect1 = r"""scons>>> SCons by Steven Knight et al\.: \tengine: v\S+, [^,]*, by \S+ on \S+ +\tengine path: \[.*\] %(copyright_line)sscons>>> """ % locals() expect2 = r"""scons>>> SCons by Steven Knight et al\.: \tscript: v\S+, [^,]*, by \S+ on \S+ \tengine: v\S+, [^,]*, by \S+ on \S+ +\tengine path: \[.*\] %(copyright_line)sscons>>> """ % locals() diff --git a/test/option-v.py b/test/option-v.py index 5065eda..680f541 100644 --- a/test/option-v.py +++ b/test/option-v.py @@ -43,11 +43,13 @@ copyright_line = fmt % (copyright_marker, TestSCons.copyright_years) # 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+ +\tengine path: \[.*\] """ + copyright_line expect2 = r"""SCons by Steven Knight et al.: \tscript: v\S+, [^,]*, by \S+ on \S+ \tengine: v\S+, [^,]*, by \S+ on \S+ +\tengine path: \[.*\] """ + copyright_line test.run(arguments = '-v') -- cgit v0.12