diff options
author | William Deegan <bill@baddogconsulting.com> | 2020-06-30 15:32:57 -0700 |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2020-06-30 15:32:57 -0700 |
commit | 593667ef1cbb49bd7c0344fbc5a060d63b32fa07 (patch) | |
tree | 841b630ead83dc1e0252e54d828e658cdbd13e4d | |
parent | 05763ba4d5565953701646018a40fcf01f9abcde (diff) | |
download | scons-git-593667ef1cbb49bd7c0344fbc5a060d63b32fa07.tar.gz |
update version strings on test
-rw-r--r-- | test/Interactive/version.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/test/Interactive/version.py b/test/Interactive/version.py index 6609ad784..76718c7c9 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() |