diff options
author | Benny Prijono <bennylp@teluu.com> | 2009-08-17 08:29:47 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2009-08-17 08:29:47 +0000 |
commit | 467a0f87dc49c1ae99a1f8c47fe4cd2d850cdac8 (patch) | |
tree | aeb032772ebdb34625114eea0468ec836623024e /tests/pjsua | |
parent | 0c7d22afb672fb08310fc66b080a8c9acb3d9b7d (diff) |
Misc (#915): several fixes on the python unit tests on Linux:
- added Makefile for cmp_wav and modified the test script
- test 999: MESSAGE without body is now allowed
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2884 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'tests/pjsua')
-rw-r--r-- | tests/pjsua/mod_media_playrec.py | 11 | ||||
-rw-r--r-- | tests/pjsua/scripts-sendto/999_message_no_body.py | 4 | ||||
-rw-r--r-- | tests/pjsua/tools/Makefile | 21 |
3 files changed, 32 insertions, 4 deletions
diff --git a/tests/pjsua/mod_media_playrec.py b/tests/pjsua/mod_media_playrec.py index ef6ed792..39efd051 100644 --- a/tests/pjsua/mod_media_playrec.py +++ b/tests/pjsua/mod_media_playrec.py @@ -20,7 +20,14 @@ from inc_cfg import * cfg_file = imp.load_source("cfg_file", ARGS[1]) # WAV similarity calculator -COMPARE_WAV_EXE = "tools/cmp_wav.exe" +COMPARE_WAV_EXE = "" +if sys.platform.find("win32")!=-1: + COMPARE_WAV_EXE = "tools/cmp_wav.exe" + G_INUNIX = False +else: + COMPARE_WAV_EXE = "tools/cmp_wav" + G_INUNIX = True + # Threshold to declare degradation is too high when result is lower than this value COMPARE_THRESHOLD = 2 @@ -78,7 +85,7 @@ def post_func(t): # Check WAV similarity fullcmd = COMPARE_WAV_EXE + " " + input_filename + " " + output_filename + " " + "3000" endpt.trace("Popen " + fullcmd) - cmp_proc = subprocess.Popen(fullcmd, stdout=subprocess.PIPE, universal_newlines=True) + cmp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=subprocess.PIPE, universal_newlines=True) # Parse similarity ouput line = cmp_proc.stdout.readline() diff --git a/tests/pjsua/scripts-sendto/999_message_no_body.py b/tests/pjsua/scripts-sendto/999_message_no_body.py index 2e369edb..c0096014 100644 --- a/tests/pjsua/scripts-sendto/999_message_no_body.py +++ b/tests/pjsua/scripts-sendto/999_message_no_body.py @@ -2,7 +2,7 @@ import inc_sip as sip import inc_sdp as sdp -# There's some report that incoming MESSAGE without body will crash pjsua +# Incoming MESSAGE without body is now accepted # complete_msg = \ """MESSAGE sip:localhost SIP/2.0 @@ -20,5 +20,5 @@ Content-Length: 50 sendto_cfg = sip.SendtoCfg( "empty MESSAGE", "--null-audio --auto-answer 200", - "", 488, complete_msg=complete_msg) + "", 200, complete_msg=complete_msg) diff --git a/tests/pjsua/tools/Makefile b/tests/pjsua/tools/Makefile new file mode 100644 index 00000000..189eb00c --- /dev/null +++ b/tests/pjsua/tools/Makefile @@ -0,0 +1,21 @@ +#Modify this to point to the PJSIP location. +PJBASE=~/Desktop/project/pjproject + +include $(PJBASE)/build.mak + +CC = $(APP_CC) +LDFLAGS = $(APP_LDFLAGS) +LDLIBS = $(APP_LDLIBS) +CFLAGS = $(APP_CFLAGS) +CPPFLAGS= ${CFLAGS} + +# If your application is in a file named myapp.cpp or myapp.c +# # this is the line you will need to build the binary. +# all: myapp +# +cmp_wav: cmp_wav.c + $(CC) -o $@ $< $(CPPFLAGS) $(LDFLAGS) $(LDLIBS) + +clean: + rm -f cmp_wav.o cmp_wav + |