From 593667ef1cbb49bd7c0344fbc5a060d63b32fa07 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 30 Jun 2020 15:32:57 -0700 Subject: update version strings on test --- test/Interactive/version.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/test/Interactive/version.py b/test/Interactive/version.py index 6609ad7..76718c7 100644 --- a/test/Interactive/version.py +++ b/test/Interactive/version.py @@ -55,23 +55,14 @@ scons>>> test.run(arguments='-Q --interactive', stdin="version\nexit\n") -# Windows may or may not print a line for the script version -# 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: \[.*\] +\tSCons: v\S+, [^,]*, by \S+ on \S+ +\tSCons path: \[.*\] %(copyright_line)sscons>>> """ % locals() stdout = test.stdout() + '\n' -if not test.match_re(stdout, expect1) and not test.match_re(stdout, expect2): +if not test.match_re(stdout, expect2): print(repr(stdout)) test.fail_test() -- cgit v0.12