diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-08-26 08:17:01 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-08-26 08:17:01 +0000 |
| commit | b531de656e99f69105ac95f5a7b4acf5e5101a8e (patch) | |
| tree | 59925661d259141953ec15932294185238f32535 /tests | |
| parent | 4e8720d9bc33ec168103b26332095e4e566ba76a (diff) | |
More on automated tests (re ticket:1111): added support for multiple Nokia/Symbian SDK installed in one system
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3297 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/automated/configure.py | 18 | ||||
| -rw-r--r-- | tests/automated/symbian.xml.template | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/tests/automated/configure.py b/tests/automated/configure.py index d46873ea..fe5cabc0 100755 --- a/tests/automated/configure.py +++ b/tests/automated/configure.py @@ -84,6 +84,10 @@ class VSVersion: # class S60SDK: def __init__(self): + self.epocroot = "" + self.sdk = "" + self.device = "" + # Check that EPOCROOT is set if not "EPOCROOT" in os.environ: sys.stderr.write("Error: EPOCROOT environment variable is not set\n") @@ -93,7 +97,9 @@ class S60SDK: if epocroot[-1] != "\\": epocroot = epocroot + "\\" os.environ["EPOCROOT"] = epocroot - sdk1 = epocroot.split("\\")[-2] + self.epocroot = epocroot + self.sdk = sdk1 = epocroot.split("\\")[-2] + self.device = "@" + self.sdk + ":com.nokia.s60" # Check that correct device is set proc = subprocess.Popen("devices", stdout=subprocess.PIPE, @@ -123,8 +129,10 @@ def replace_vars(text): os_info = platform.system() + platform.release() + "-" + platform.machine() # osinfo + s60sdk_var = None if build_type == "s60": - os_info = S60SDK().name + s60sdk_var = S60SDK() + os_info = s60sdk_var.name elif platform.system().lower() == "windows" or platform.system().lower() == "microsoft": if platform.system().lower() == "microsoft": os_info = platform.release() + "-" + platform.version() + "-" + platform.win32_ver()[2] @@ -153,7 +161,7 @@ def replace_vars(text): if build_type == "vs": suffix = "i386-Win32-vc8-" + vs_target elif build_type == "s60": - suffix = S60SDK().name + "-" + s60_target.replace(" ", "-") + suffix = s60sdk_var.name + "-" + s60_target.replace(" ", "-") elif build_type == "gnu": proc = subprocess.Popen("sh config.guess", cwd="../..", shell=True, stdout=subprocess.PIPE) @@ -182,6 +190,10 @@ def replace_vars(text): text = text.replace("$(S60TARGET)", s60_target) elif text.find("$(S60TARGETNAME)") >= 0: text = text.replace("$(S60TARGETNAME)", s60_target.replace(" ", "-")) + elif text.find("$(S60DEVICE)") >= 0: + text = text.replace("$(S60DEVICE)", s60sdk_var.device) + elif text.find("$(EPOCROOT)") >= 0: + text = text.replace("$(EPOCROOT)", s60sdk_var.epocroot) elif text.find("$(DISABLED)") >= 0: text = text.replace("$(DISABLED)", "0") elif text.find("$(IPPROOT)") >= 0: diff --git a/tests/automated/symbian.xml.template b/tests/automated/symbian.xml.template index 4e87f18b..4f36dd96 100644 --- a/tests/automated/symbian.xml.template +++ b/tests/automated/symbian.xml.template @@ -13,8 +13,8 @@ #define PJMEDIA_HAS_G7221_CODEC 1 ]]> </FileWrite> - <Configure cmd="cmd /c echo success" /> - <Build wdir="build.symbian" cmd='cmd /C "bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> + <Configure cmd="cmd /c devices -setdefault $(S60DEVICE)" /> + <Build wdir="build.symbian" cmd='cmd /C "SET EPOCROOT=$(EPOCROOT)&& bldmake bldfiles && abld reallyclean $(S60TARGET) && abld build $(S60TARGET)"' /> </Submit> </Scenario> |