Changeset 2028 for pjproject/trunk/pjsip-apps/src/test-pjsua/run.py

Timestamp:

Jun 16, 2008 1:04:44 PM (16 years ago)

Author:

bennylp

Message:

More ticket #543: updated automated tests to run on Unix

File:

• pjproject/trunk/pjsip-apps/src/test-pjsua/run.py (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/test-pjsua/run.py

@@ -1 @@
-# $Id:$
+# $Id$
 import sys
 import imp
 import re
+import os
 import subprocess
+import random
 import time
 
 import inc_const as const
 
-# Defaults
-G_EXE="..\\..\\bin\\pjsua_vc6d.exe"
+# Get the pjsua executable name
+if sys.platform.find("win32")!=-1:
+    e = "../../bin/pjsua_vc6d.exe"
+    st1 = os.stat(e)
+    if st1 != None:
+        G_EXE = e
+    e = "../../bin/pjsua_vc6d.exe"
+    st2 = os.stat(e)
+    if st2 != None and st2.st_mtime > st1.st_mtime:
+        G_EXE = e
+        st1 = st2
+    if G_EXE=="":
+        print "Unable to find valid pjsua. Please build pjsip first"
+        sys.exit(1)
+    G_INUNIX = False
+else:
+    f = open("../../../build.mak", "r")
+    while True:
+        line = f.readline()
+        if not line:
+            break
+        if line.find("TARGET_NAME")!=-1:
+            print line
+            G_EXE="../../bin/pjsua-" + line.split(":= ")[1]
+            break
+    if G_EXE=="":
+        print "Unable to find ../../../build.mak. Please build pjsip first"
+        sys.exit(1)
+    G_INUNIX = True
+
+
+G_EXE = G_EXE.rstrip("\n\r \t")
 
 ###################################
@@ -36 +68 @@
                 fullcmd = G_EXE + " " + inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
                 self.trace("Popen " + fullcmd)
-                self.proc = subprocess.Popen(fullcmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
+                self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
         def send(self, cmd):
                 self.trace("send " + cmd)
@@ -109 +141 @@
 script = imp.load_source("script", sys.argv[1])  
 
+# Init random seed
+random.seed()
+
 # Validate
 if script.test == None:
@@ -120 +155 @@
 # Instantiate pjsuas
 print "====== Running " + script.test.title + " ======"
+print "Using " + G_EXE + " as pjsua executable"
+
 for inst_param in script.test.inst_params:
         try: