From 293357aaddc0dbabddeea9afebc7f214f5ad8e3e Mon Sep 17 00:00:00 2001
From: Benny Prijono <bennylp@teluu.com>
Date: Wed, 25 Aug 2010 03:53:52 +0000
Subject: re ticket:1111 (more on automated test): added symbian target in
 prepare.xml@

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3294 74dad513-b988-da41-8d7b-12977e46ad98
---
 tests/automated/configure.py         | 10 ++++++++--
 tests/automated/prepare.xml.template | 14 ++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/automated/configure.py b/tests/automated/configure.py
index 377fed7e..d46873ea 100755
--- a/tests/automated/configure.py
+++ b/tests/automated/configure.py
@@ -108,8 +108,8 @@ class S60SDK:
 
 		if sdk1 != sdk2:
 		    sys.stderr.write("Error: default SDK in device doesn't match EPOCROOT\n")
-		    sys.stderr.write("Default device SDK = " + sdk2 + "\n")
-		    sys.stderr.write("EPOCROOT SDK = " + sdk1 + "\n")
+		    sys.stderr.write("Default device SDK = '" + sdk2 + "'\n")
+		    sys.stderr.write("EPOCROOT SDK = '" + sdk1 + "'\n")
 		    sys.exit(1)
 
 		self.name = sdk2.replace("_", "-")
@@ -209,6 +209,12 @@ def replace_vars(text):
                         wdir = os.path.join(os.getcwd(), "../..")
                         wdir = os.path.normpath(wdir)
                         text = text.replace("$(PJDIR)", wdir)
+                elif text.find("$(NOP)") >= 0:
+			if platform.system().lower() == "windows" or platform.system().lower() == "microsoft":
+				cmd = "CMD /C echo Success"
+			else:
+				cmd = "echo Success"
+                        text = text.replace("$(NOP)", cmd)
                 else:
                         break
         return text
diff --git a/tests/automated/prepare.xml.template b/tests/automated/prepare.xml.template
index b5a6d869..c1f650b9 100644
--- a/tests/automated/prepare.xml.template
+++ b/tests/automated/prepare.xml.template
@@ -2,15 +2,14 @@
 <Scenario site="$(HOSTNAME)" url="http://my.cdash.org/submit.php?project=PJSIP" wdir="$(PJDIR)/tests/automated">
  
 	<Submit group="Experimental" build="Test-Preparation">
-		<Configure cmd="echo Success" />
-		<Build cmd="echo Success" />
+		<Configure cmd="$(NOP)" />
+		<Build cmd="$(NOP)" />
 
 		<!-- GNU Makefile based scenario 
 		     Requirement:
 		      - none
-
-		<Test name="Configuring GNU scenario" cmd="python configure.py -t gnu -o gnu.xml gnu.xml.template" />
 		  -->
+		<Test name="Configuring GNU scenario" cmd="python configure.py -t gnu -o gnu.xml gnu.xml.template" />
 
 		<!-- GNU Makefile with Intel IPP scenario.
 		     Requirements:
@@ -30,10 +29,9 @@
 
 		<!-- Symbian target.
 		     Requirement:
-		       - EPOCROOT
-
-		<Test name="Configuring Symbian scenario" cmd="python configure.py -t s60 -o symbian.xml symbian.xml.template" />
-		  -->
+		       - EPOCROOT (modify below)
+		-->
+		<Test name="Configuring Symbian scenario" cmd='CMD /C SET EPOCROOT=\S60\devices\S60_5th_Edition_SDK_v1.0&amp;&amp; devices -setdefault @S60_5th_Edition_SDK_v1.0:com.nokia.s60&amp;&amp; python configure.py -t s60 -s60target &quot;gcce urel&quot; -o symbian.xml symbian.xml.template' />
 
 	</Submit>
 	
-- 
cgit v1.2.3