Changeset 3297


Ignore:
Timestamp:
Aug 26, 2010 8:17:01 AM (9 years ago)
Author:
bennylp
Message:

More on automated tests (re ticket:1111): added support for multiple Nokia/Symbian? SDK installed in one system

Location:
pjproject/trunk/tests/automated
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/tests/automated/configure.py

    r3294 r3297  
    8585class S60SDK: 
    8686        def __init__(self): 
     87                self.epocroot = "" 
     88                self.sdk = "" 
     89                self.device = "" 
     90 
    8791                # Check that EPOCROOT is set 
    8892                if not "EPOCROOT" in os.environ: 
     
    9498                    epocroot = epocroot + "\\" 
    9599                    os.environ["EPOCROOT"] = epocroot 
    96                 sdk1 = epocroot.split("\\")[-2] 
     100                self.epocroot = epocroot 
     101                self.sdk = sdk1 = epocroot.split("\\")[-2] 
     102                self.device = "@" + self.sdk + ":com.nokia.s60" 
    97103 
    98104                # Check that correct device is set 
     
    124130 
    125131        # osinfo 
     132        s60sdk_var = None 
    126133        if build_type == "s60": 
    127                 os_info = S60SDK().name 
     134                s60sdk_var = S60SDK() 
     135                os_info = s60sdk_var.name 
    128136        elif platform.system().lower() == "windows" or platform.system().lower() == "microsoft": 
    129137                if platform.system().lower() == "microsoft": 
     
    154162                suffix = "i386-Win32-vc8-" + vs_target 
    155163        elif build_type == "s60": 
    156                 suffix = S60SDK().name + "-" + s60_target.replace(" ", "-") 
     164                suffix = s60sdk_var.name + "-" + s60_target.replace(" ", "-") 
    157165        elif build_type == "gnu": 
    158166                proc = subprocess.Popen("sh config.guess", cwd="../..", 
     
    183191                elif text.find("$(S60TARGETNAME)") >= 0: 
    184192                        text = text.replace("$(S60TARGETNAME)", s60_target.replace(" ", "-")) 
     193                elif text.find("$(S60DEVICE)") >= 0: 
     194                        text = text.replace("$(S60DEVICE)", s60sdk_var.device) 
     195                elif text.find("$(EPOCROOT)") >= 0: 
     196                        text = text.replace("$(EPOCROOT)", s60sdk_var.epocroot) 
    185197                elif text.find("$(DISABLED)") >= 0: 
    186198                        text = text.replace("$(DISABLED)", "0") 
  • pjproject/trunk/tests/automated/symbian.xml.template

    r3131 r3297  
    1414]]>                      
    1515                </FileWrite> 
    16                 <Configure cmd="cmd /c echo success" /> 
    17                 <Build wdir="build.symbian" cmd='cmd /C &quot;bldmake bldfiles &amp;&amp; abld reallyclean $(S60TARGET) &amp;&amp; abld build $(S60TARGET)&quot;' /> 
     16                <Configure cmd="cmd /c devices -setdefault $(S60DEVICE)" /> 
     17                <Build wdir="build.symbian" cmd='cmd /C &quot;SET EPOCROOT=$(EPOCROOT)&amp;&amp; bldmake bldfiles &amp;&amp; abld reallyclean $(S60TARGET) &amp;&amp; abld build $(S60TARGET)&quot;' /> 
    1818        </Submit> 
    1919</Scenario> 
Note: See TracChangeset for help on using the changeset viewer.