diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-01-22 11:27:37 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-01-22 11:27:37 -0330 |
| commit | 0dc6335402b90fda98c4547e2d7c6c2a814104a8 (patch) | |
| tree | e6badbc5fca80f662a7181cf23b69d5508cc6f08 /demoscript/Ice | |
| parent | Fixed previous fix which wasn't correct on Windows (diff) | |
| download | ice-0dc6335402b90fda98c4547e2d7c6c2a814104a8.tar.bz2 ice-0dc6335402b90fda98c4547e2d7c6c2a814104a8.tar.xz ice-0dc6335402b90fda98c4547e2d7c6c2a814104a8.zip | |
ICE-6162 interleaved demo takes too long to run, even with --fast
Diffstat (limited to 'demoscript/Ice')
| -rw-r--r-- | demoscript/Ice/interleaved.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/demoscript/Ice/interleaved.py b/demoscript/Ice/interleaved.py index ab66ad544ef..80a16437983 100644 --- a/demoscript/Ice/interleaved.py +++ b/demoscript/Ice/interleaved.py @@ -9,6 +9,7 @@ # ********************************************************************** import sys +from demoscript import Util def runseries(client): print("testing bytes...") @@ -17,19 +18,20 @@ def runseries(client): client.expect('==> ', timeout=2000) print("echo: %s " % (client.before)) - print("testing strings...") - client.sendline('2') - client.expect('==> ', timeout=240) - client.sendline('e') - client.expect('==> ', timeout=2000) - print("echo: %s " % (client.before)) - - print("testing structs with string...") - client.sendline('3') - client.expect('==> ', timeout=240) - client.sendline('e') - client.expect('==> ', timeout=2000) - print("echo: %s " % (client.before)) + if not Util.fast: + print("testing strings...") + client.sendline('2') + client.expect('==> ', timeout=240) + client.sendline('e') + client.expect('==> ', timeout=2000) + print("echo: %s " % (client.before)) + + print("testing structs with string...") + client.sendline('3') + client.expect('==> ', timeout=240) + client.sendline('e') + client.expect('==> ', timeout=2000) + print("echo: %s " % (client.before)) print("testing structs with two ints and double...") client.sendline('4') |