diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-07-01 16:04:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 16:04:29 (GMT) |
| commit | 9eba5ef435b0acd2406ea3b1b3151d2589c89f5e (patch) | |
| tree | 029f87baa415dcc3b9e38507bd8d5dd55dd014f8 /test/Interactive | |
| parent | fff379e68cbdf7eb35ea2827ed5e8f8beaa2b514 (diff) | |
| parent | ecb9741551fa0276fccd7d8d6f1df03a4e338082 (diff) | |
| download | SCons-9eba5ef435b0acd2406ea3b1b3151d2589c89f5e.zip SCons-9eba5ef435b0acd2406ea3b1b3151d2589c89f5e.tar.gz SCons-9eba5ef435b0acd2406ea3b1b3151d2589c89f5e.tar.bz2 | |
Merge pull request #3712 from bdbaddog/restore_scons_local
Re-implement scons-local build + travis ci updates for build
Diffstat (limited to 'test/Interactive')
| -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 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() |