Changeset 3131


Ignore:
Timestamp:
Mar 30, 2010 1:02:40 PM (15 years ago)
Author:
bennylp
Message:

More ticket #1041 (Unit test):

  • Symbian testing (plain, APS/Direct, VAS/Direct)
  • some MMPs need to be modified to support automated configuration
  • renamed Write to FileWrite? command in scenario files
  • support for Visual Studio 2010 detection in configure script
Location:
pjproject/trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/build.symbian/symbian_ua.mmp

    r3106 r3131  
     1// These part may be overwritten by automated test 
     2// =BEGIN 
    13#define SND_HAS_APS     0 
    24#define SND_HAS_VAS     0 
    35#define SND_HAS_MDA     1 
     6// =END 
    47 
    58TARGET                  symbian_ua.exe 

  • pjproject/trunk/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp

    r3106 r3131  
     1// The part below will be overwritten by automated test 
     2// =BEGIN 
    13#define SND_HAS_APS     0 
    24#define SND_HAS_VAS     0 
    35#define SND_HAS_MDA     1 
     6// =END 
    47 
    58TARGET                  symbian_ua_gui.exe 

  • pjproject/trunk/tests/automated/configure.py

    r3125 r3131  
    6767                        self.release = "2008" 
    6868                        break 
    69                     else: 
     69                    elif major=="16": 
    7070                        self.version = "10" 
    7171                        self.release = "2010" 
     72                        break 
     73                    else: 
     74                        self.version = "11" 
     75                        self.release = "2012" 
    7276                        break 
    7377            proc.wait() 

  • pjproject/trunk/tests/automated/gnu.xml.template

    r3120 r3131  
    44        <Submit group="Experimental" build="$(SUFFIX)-$(GCC)-default" disabled="$(DISABLED)" > 
    55                <Update /> 
    6                 <Write file="user.mak"> 
     6                <FileWrite file="user.mak"> 
    77                  <![CDATA[ 
    88# Written by ccdash 
    99]]>                      
    10                 </Write> 
    11                 <Write file="pjlib/include/pj/config_site.h"> 
     10                </FileWrite> 
     11                <FileWrite file="pjlib/include/pj/config_site.h"> 
    1212                  <![CDATA[ 
    1313/* Written by ccdash */ 
    … …  
    1515#define PJMEDIA_HAS_G7221_CODEC 1 
    1616]]>                      
    17                 </Write> 
     17                </FileWrite> 
    1818                <Configure cmd="./aconfigure" /> 
    1919                <Build cmd="make dep &amp;&amp; make distclean &amp;&amp; make" /> 

  • pjproject/trunk/tests/automated/msvc.xml.template

    r3125 r3131  
    44        <Submit group="Experimental" build="$(OS)-$(VS)-$(VSTARGET)-default" > 
    55                <Update /> 
    6                 <Write file="pjlib/include/pj/config_site.h"> 
     6                <FileWrite file="pjlib/include/pj/config_site.h"> 
    77                  <![CDATA[ 
    88/* Written by ccdash */ 
    … …  
    1010#define PJMEDIA_HAS_G7221_CODEC 1 
    1111]]>                      
    12                 </Write> 
     12                </FileWrite> 
    1313                <Configure cmd="cmd /c echo success" /> 
    1414                <Build cmd='vcbuild.exe /nologo /nohtmllog /nocolor /rebuild pjproject-vs8.sln "$(VSTARGET)|Win32"' /> 
    15                 <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="pjlib-test-i386-Win32-vs8-$(VSTARGET)" /> 
    16                 <Test name="pjlib-util-test" info="" wdir="pjlib-util/bin" cmd="pjlib-util-test-i386-Win32-vs8-$(VSTARGET)" /> 
    17                 <Test name="pjnath-test" info="" wdir="pjnath/bin" cmd="pjnath-test-i386-Win32-vs8-$(VSTARGET)" /> 
    18                 <Test name="pjmedia-test" info="" wdir="pjmedia/bin" cmd="pjmedia-test-i386-Win32-vs8-$(VSTARGET)" /> 
    19                 <Test name="pjsip-test" info="" wdir="pjsip/bin" cmd="pjsip-test-i386-Win32-vs8-$(VSTARGET)" /> 
     15                <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="pjlib-test-i386-Win32-vc8-$(VSTARGET)" /> 
     16                <Test name="pjlib-util-test" info="" wdir="pjlib-util/bin" cmd="pjlib-util-test-i386-Win32-vc8-$(VSTARGET)" /> 
     17                <Test name="pjnath-test" info="" wdir="pjnath/bin" cmd="pjnath-test-i386-Win32-vc8-$(VSTARGET)" /> 
     18                <Test name="pjmedia-test" info="" wdir="pjmedia/bin" cmd="pjmedia-test-i386-Win32-vc8-$(VSTARGET)" /> 
     19                <Test name="pjsip-test" info="" wdir="pjsip/bin" cmd="pjsip-test-i386-Win32-vc8-$(VSTARGET)" /> 
    2020                $(PJSUA-TESTS) 
    2121        </Submit> 

  • pjproject/trunk/tests/automated/symbian.xml.template

    r3125 r3131  
    11<?xml version="1.0" ?> 
    22<Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)"> 
    3   
     3        <!-- Symbian S60 default --> 
    44        <Submit group="Experimental" build="$(OS)-$(S60TARGETNAME)-default" > 
    55                <Update disabled="1" /> 
    6                 <Write file="pjlib/include/pj/config_site.h"> 
     6                <FileWrite file="pjlib/include/pj/config_site.h"> 
    77                  <![CDATA[ 
    88/* Written by ccdash */ 
    … …  
    1313#define PJMEDIA_HAS_G7221_CODEC 1 
    1414]]>                      
    15                 </Write> 
     15                </FileWrite> 
    1616                <Configure cmd="cmd /c echo success" /> 
    1717                <Build wdir="build.symbian" cmd='cmd /C &quot;bldmake bldfiles &amp;&amp; abld reallyclean $(S60TARGET) &amp;&amp; abld build $(S60TARGET)&quot;' /> 
    1818        </Submit> 
    19          
    2019</Scenario> 
    2120 
Note: See TracChangeset for help on using the changeset viewer.