Changeset 4183 for pjproject/trunk/tests/pjsua/runall.py

Timestamp:

Jun 28, 2012 9:16:03 AM (12 years ago)

Author:

nanang

Message:

Re #1523:

• runall.py: fix option parser
• run.py: avoid double newlines in logging
• mod_sipp.py: redirect sipp output to /dev/null & add sipp error string
• misc fixes on sipp scenarios, e.g: regex to get via branch, file rename.

File:

• pjproject/trunk/tests/pjsua/runall.py (modified) (2 diffs)

pjproject/trunk/tests/pjsua/runall.py

@@ -94 +94 @@
                         resume_script=sys.argv[1]
                         sys.argv.pop(0)
-                        sys.argv.pop(1)
+                        sys.argv.pop(0)
                 else:
                         sys.argv.pop(0)
@@ -120 +120 @@
                         shell_cmd = sys.argv[1]
                         sys.argv.pop(0)
-                        sys.argv.pop(1)
+                        sys.argv.pop(0)
                 else:
                         sys.argv.pop(0)
                         sys.stderr.write("Error: argument value required")
                         sys.exit(1)
+        else:
+                # should be run.py options
+                break
 
 
 # Generate arguments for run.py
-argv_st = " ".join(sys.argv)
+argv_st = " ".join(sys.argv) + " "
 
 # Init vars