summaryrefslogtreecommitdiff
path: root/demoscript/Util.py
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-03-06 11:26:42 -0330
committerDwayne Boone <dwayne@zeroc.com>2009-03-06 11:26:42 -0330
commitc029d3b7363807873008c868b2207fce20f52a2e (patch)
tree4276c9d555db00b3b153f0d99bdc199414c15309 /demoscript/Util.py
parentBug 3786 - java slicing/objects test failure (diff)
downloadice-c029d3b7363807873008c868b2207fce20f52a2e.tar.bz2
ice-c029d3b7363807873008c868b2207fce20f52a2e.tar.xz
ice-c029d3b7363807873008c868b2207fce20f52a2e.zip
Added expect scripts for protobuf demos
Diffstat (limited to 'demoscript/Util.py')
-rw-r--r--demoscript/Util.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py
index c6151083974..0becb3d58dd 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -310,13 +310,14 @@ def runDemos(start, args, demos, num = 0, script = False, root = False):
demoErrors.append(message)
-def run(demos, root = False):
+def run(demos, protobufDemos = [], root = False):
def usage():
print """usage: %s
--start=index Start running the demos at the given demo."
--loop Run the demos in a loop."
--filter=<regex> Run all the demos that match the given regex."
--rfilter=<regex> Run all the demos that do not match the given regex."
+ --protobuf Run the protobuf demos."
--debug Display debugging information on each demos."
--trace=<output> Run the demos with tracing enabled."
--host=host Set --Ice.Default.Host=<host>."
@@ -336,7 +337,7 @@ def run(demos, root = False):
try:
opts, args = getopt.getopt(sys.argv[1:], "lr:R:", [
"filter=", "rfilter=", "start=", "loop", "fast", "trace=", "debug", "host=", "mode=",
- "continue", "ice-home=", "x64", "java2", "preferIPv4", "env", "noenv", "script"])
+ "continue", "ice-home=", "x64", "java2", "preferIPv4", "env", "noenv", "script", "protobuf"])
except getopt.GetoptError:
usage()
@@ -380,6 +381,8 @@ def run(demos, root = False):
start = int(a)
elif o in '--script':
script = True
+ elif o in '--protobuf':
+ demos = demos + protobufDemos
for demoFilter, removeFilter in filters:
if removeFilter: