Changeset 3294

Timestamp:

Aug 25, 2010 3:53:52 AM (14 years ago)

Author:

bennylp

Message:

re ticket:1111 (more on automated test): added symbian target in prepare.xml@

Location:

pjproject/trunk/tests/automated

Files:

• configure.py (modified) (2 diffs)
• prepare.xml.template (modified) (2 diffs)

pjproject/trunk/tests/automated/configure.py

@@ -109 +109 @@
                 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)
 
@@ -210 +210 @@
                         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

pjproject/trunk/tests/automated/prepare.xml.template

@@ -3 +3 @@
  
         <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" />
-                  -->
 
                 <!-- GNU Makefile with Intel IPP scenario.
@@ -31 +30 @@
                 <!-- 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>