Misc (re #2147): Updated automated test configs.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@6023 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
5bcd75aec9
commit
f55a1e198e
|
@ -30,7 +30,7 @@ def gcc_version(gcc):
|
||||||
ver = s.split(None, 3)[2]
|
ver = s.split(None, 3)[2]
|
||||||
break
|
break
|
||||||
proc.wait()
|
proc.wait()
|
||||||
return "gcc-" + ver
|
return "gcc" + ver
|
||||||
|
|
||||||
#
|
#
|
||||||
# Get Visual Studio info
|
# Get Visual Studio info
|
||||||
|
|
|
@ -18,7 +18,7 @@ export CFLAGS += -Wno-unused-label -g
|
||||||
#define PJ_HAS_IPV6 0
|
#define PJ_HAS_IPV6 0
|
||||||
]]>
|
]]>
|
||||||
</FileWrite>
|
</FileWrite>
|
||||||
<Configure cmd='make distclean && ./aconfigure --enable-ipp --with-ipp="$(IPPROOT)" --with-ipp-samples="$(IPPSAMPLES)" --with-ipp-arch=$(IPPARCH)' />
|
<Configure cmd='make distclean && ./aconfigure --enable-ipp --with-ipp="$(IPPROOT)" --with-ipp-samples="$(IPPSAMPLES)" --with-ipp-arch=$(IPPARCH) --with-ssl=/Users/pjsip/Desktop/opt' />
|
||||||
<Build cmd="make dep && make clean && make" />
|
<Build cmd="make dep && make clean && make" />
|
||||||
<Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" disabled=$(NOTEST) />
|
<Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
<Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" disabled=$(NOTEST) />
|
<Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
<?xml version="1.0" ?>
|
||||||
|
<Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)">
|
||||||
|
|
||||||
|
<Submit group="Experimental" build="$(SUFFIX)-$(GCC)-VideoFFmpeg-IPv6-G7221-DTLS" exclude="(.*amr.*)">
|
||||||
|
<Update />
|
||||||
|
<FileWrite file="user.mak">
|
||||||
|
<![CDATA[
|
||||||
|
# Written by ccdash
|
||||||
|
export CFLAGS += -Wno-unused-label -g
|
||||||
|
]]>
|
||||||
|
</FileWrite>
|
||||||
|
<FileWrite file="pjlib/include/pj/config_site.h">
|
||||||
|
<![CDATA[
|
||||||
|
/* Written by ccdash */
|
||||||
|
#define PJ_HAS_IPV6 1
|
||||||
|
#define PJMEDIA_HAS_VIDEO 1
|
||||||
|
#define PJMEDIA_HAS_G7221_CODEC 1
|
||||||
|
#define PJMEDIA_SRTP_HAS_DTLS 1
|
||||||
|
]]>
|
||||||
|
</FileWrite>
|
||||||
|
<Configure cmd="make distclean && ./configure-ffmpeg" />
|
||||||
|
<Build cmd="make dep && make clean && make" />
|
||||||
|
<Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
|
<Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
|
<Test name="pjnath-test" wdir="pjnath/bin" cmd="./pjnath-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
|
<Test name="pjmedia-test" wdir="pjmedia/bin" cmd="./pjmedia-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
|
<Test name="pjsip-test" wdir="pjsip/bin" cmd="./pjsip-test-$(SUFFIX)" disabled=$(NOTEST) />
|
||||||
|
$(PJSUA-TESTS)
|
||||||
|
</Submit>
|
||||||
|
|
||||||
|
</Scenario>
|
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)">
|
<Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)">
|
||||||
|
|
||||||
<Submit group="Experimental" build="$(SUFFIX)-$(GCC)-VideoFFmpeg-IPv6" exclude="(.*amr.*)">
|
<Submit group="Experimental" build="$(SUFFIX)-$(GCC)-VideoOpenh264-IPv6-G7221-DTLS" exclude="(.*amr.*)">
|
||||||
<Update />
|
<Update />
|
||||||
<FileWrite file="user.mak">
|
<FileWrite file="user.mak">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
# Written by ccdash
|
# Written by ccdash
|
||||||
export CFLAGS += -Wno-unused-label -g -Wno-deprecated-declarations
|
export CFLAGS += -Wno-unused-label -g
|
||||||
]]>
|
]]>
|
||||||
</FileWrite>
|
</FileWrite>
|
||||||
<FileWrite file="pjlib/include/pj/config_site.h">
|
<FileWrite file="pjlib/include/pj/config_site.h">
|
||||||
|
|
|
@ -12,9 +12,10 @@ export CFLAGS += -Wno-unused-label -g
|
||||||
<FileWrite file="pjlib/include/pj/config_site.h">
|
<FileWrite file="pjlib/include/pj/config_site.h">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
/* Written by ccdash */
|
/* Written by ccdash */
|
||||||
#define PJ_HAS_IPV6 1
|
#define PJ_HAS_IPV6 0
|
||||||
#define PJMEDIA_HAS_G7221_CODEC 1
|
#define PJMEDIA_HAS_VIDEO 0
|
||||||
#define PJMEDIA_SRTP_HAS_DTLS 1
|
#undef PJ_HAS_SSL_SOCK
|
||||||
|
#define PJ_HAS_SSL_SOCK 0
|
||||||
]]>
|
]]>
|
||||||
</FileWrite>
|
</FileWrite>
|
||||||
<Configure cmd="make distclean && ./aconfigure" />
|
<Configure cmd="make distclean && ./aconfigure" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<Configure cmd="$(NOP)" />
|
<Configure cmd="$(NOP)" />
|
||||||
<Build cmd="$(NOP)" />
|
<Build cmd="$(NOP)" />
|
||||||
|
|
||||||
<!-- GNU Makefile based scenario
|
<!-- GNU Makefile based (basic features) scenario
|
||||||
Requirement:
|
Requirement:
|
||||||
- none
|
- none
|
||||||
-->
|
-->
|
||||||
|
@ -20,6 +20,15 @@
|
||||||
-->
|
-->
|
||||||
<Test name="Configuring GNU IPP scenario" cmd="python configure.py -t gnu -o gnu-ipp.xml gnu-ipp.xml.template" />
|
<Test name="Configuring GNU IPP scenario" cmd="python configure.py -t gnu -o gnu-ipp.xml gnu-ipp.xml.template" />
|
||||||
|
|
||||||
|
<!-- GNU Makefile with video scenario.
|
||||||
|
Requirement:
|
||||||
|
- OpenH264, or
|
||||||
|
- ffmpeg
|
||||||
|
- SDL
|
||||||
|
-->
|
||||||
|
<Test name="Configuring 2.x VIDEO with OpenH264" cmd="python configure.py -t gnu -o gnu-video.xml gnu-video.xml.template" />
|
||||||
|
<Test name="Configuring 2.x VIDEO with ffmpeg" cmd="python configure.py -t gnu -o gnu-video-ffmpeg.xml gnu-video-ffmpeg.xml.template" />
|
||||||
|
|
||||||
<!-- iPhone target.
|
<!-- iPhone target.
|
||||||
Requriement(s):
|
Requriement(s):
|
||||||
- valid SDK is installed
|
- valid SDK is installed
|
||||||
|
@ -27,19 +36,41 @@
|
||||||
-->
|
-->
|
||||||
<Test name="Configuring iPhone scenario" cmd="python configure.py -t gnu -o iphone.xml iphone.xml.template" />
|
<Test name="Configuring iPhone scenario" cmd="python configure.py -t gnu -o iphone.xml iphone.xml.template" />
|
||||||
|
|
||||||
|
<!-- iPhone 64 bit target.
|
||||||
|
Requriement(s):
|
||||||
|
- valid SDK is installed
|
||||||
|
-->
|
||||||
|
<Test name="Configuring iPhone 64bit scenario" cmd="python configure.py -t gnu -o iphone64.xml iphone64.xml.template" />
|
||||||
|
<Test name="Configuring iPhone 64bit with IPv6 scenario" cmd="python configure.py -t gnu -o iphone64-ipv6.xml iphone64-ipv6.xml.template" />
|
||||||
|
|
||||||
|
<!-- Android target.
|
||||||
|
Requriement(s):
|
||||||
|
- valid NDK & SDK is installed
|
||||||
|
- SWIG
|
||||||
|
-->
|
||||||
|
<Test name="Configuring Android scenario" cmd="python configure.py -t gnu -o android.xml android.xml.template" />
|
||||||
|
|
||||||
|
<!-- Android 64 bit target.
|
||||||
|
Requriement(s):
|
||||||
|
- valid NDK & SDK is installed
|
||||||
|
- SWIG
|
||||||
|
-->
|
||||||
|
<Test name="Configuring Android 64bit scenario" cmd="python configure.py -t gnu -o android64.xml android64.xml.template" />
|
||||||
|
<Test name="Configuring Android 64bit with IPv6 scenario" cmd="python configure.py -t gnu -o android64-ipv6.xml android64-ipv6.xml.template" />
|
||||||
|
|
||||||
<!-- MSVC target.
|
<!-- MSVC target.
|
||||||
Requirements:
|
Requirements:
|
||||||
- Build from VS successfully
|
- Build from VS successfully
|
||||||
- VS paths are set
|
- VS paths are set
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<Test name="Configuring Visual Studio for Win32" cmd="python configure.py -t vs -vstarget Release -o msvc-win32.xml -nopjsuatest msvc.xml.template" />
|
<!--Test name="Configuring Visual Studio for Win32" cmd="python configure.py -t vs -vstarget Release -o msvc-win32.xml -nopjsuatest msvc.xml.template" /-->
|
||||||
|
|
||||||
<!-- Symbian target.
|
<!-- Symbian target.
|
||||||
Requirement:
|
Requirement:
|
||||||
- EPOCROOT (modify below)
|
- EPOCROOT (modify below)
|
||||||
-->
|
-->
|
||||||
<Test name="Configuring Symbian scenario" cmd='CMD /C SET EPOCROOT=\S60\devices\S60_5th_Edition_SDK_v1.0&& devices -setdefault @S60_5th_Edition_SDK_v1.0:com.nokia.s60&& python configure.py -t s60 -s60target "gcce urel" -o symbian.xml symbian.xml.template' />
|
<!--Test name="Configuring Symbian scenario" cmd='CMD /C SET EPOCROOT=\S60\devices\S60_5th_Edition_SDK_v1.0&& devices -setdefault @S60_5th_Edition_SDK_v1.0:com.nokia.s60&& python configure.py -t s60 -s60target "gcce urel" -o symbian.xml symbian.xml.template' /-->
|
||||||
|
|
||||||
</Submit>
|
</Submit>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue