Changeset 2410

Timestamp:

Jan 2, 2009 6:15:07 PM (16 years ago)

Author:

bennylp

Message:

Test refinements for mingw etc.

Location:

pjproject/trunk/tests

Files:

• cdash/README.TXT (modified) (2 diffs)
• cdash/builder.py (modified) (4 diffs)
• cdash/cfg_gnu.py (modified) (1 diff)
• cdash/cfg_msvc.py (modified) (1 diff)
• cdash/cfg_site_sample.py (modified) (1 diff)
• cdash/cfg_symbian.py (modified) (1 diff)
• cdash/starttest_sample.bat (added)
• pjsua/run.py (modified) (2 diffs)

pjproject/trunk/tests/cdash/README.TXT

@@ -44 +44 @@
      $ python main.py cfg_msvc
 
+   To execute tests for Symbian target:
+
+     $ python main.py cfg_symbian
+
 
    If you have a different site configuration file, you may specify it in the
@@ -49 +53 @@
 
      $ python main.py cfg_gnu my_site_config
+
+   For more information you can also pass "-h" or "--help", e.g.:
+
+     $ python main.py cfg_gnu --help
+

pjproject/trunk/tests/cdash/builder.py

@@ -80 +80 @@
     Operation(Operation.TEST, "./pjsip-test$SUFFIX", name="pjsip test",
               wdir="pjsip/bin")
-]
-
-#
-# These are operations to build the software on GNU/Posix systems
-#
-gnu_build_ops = [
-    Operation(Operation.CONFIGURE, "sh ./configure"),
-    Operation(Operation.BUILD, "sh -c 'make distclean && make dep && make && cd pjsip-apps/src/python && python setup.py clean build'"),
-    #Operation(Operation.BUILD, "python setup.py clean build",
-    #          wdir="pjsip-apps/src/python")
 ]
 
@@ -237 +227 @@
             self.build_tests()
         self.pre_action()
+        mandatory_op = ["update", "configure", "build"]
         counter = 0
         for a in self.ccdash_args:
@@ -262 +253 @@
             a = b
             #print a
-            ccdash.main(a)
+            rc = ccdash.main(a)
+            if rc!=0 and a[1] in mandatory_op:
+                print "Stopping because of error.."
+                break
             counter = counter + 1
         self.post_action()
@@ -316 +310 @@
         cmds = []
         cmds.extend(update_ops)
-        cmds.extend(gnu_build_ops)
+        cmds.append(Operation(Operation.CONFIGURE, "sh ./configure"))
+        if sys.platform == "win32":
+            # Don't build python module on Mingw
+            cmds.append(Operation(Operation.BUILD, 
+                            "sh -c 'make distclean && make dep && make'"))
+        else:
+            cmds.append(Operation(Operation.BUILD, 
+                            "sh -c 'make distclean && make dep && make" + \
+                            " && cd pjsip-apps/src/python && " + \
+                            "python setup.py clean build'"))
+
         cmds.extend(std_test_ops)
         cmds.extend(build_pjsua_test_ops())

pjproject/trunk/tests/cdash/cfg_gnu.py

@@ -60 +60 @@
                                   cfg_site.OPTIONS)
 
+    config_site = "#define PJ_TODO(x)\n" + cfg_site.CONFIG_SITE
+    user_mak = "export CFLAGS+=-Wall\n" + cfg_site.USER_MAK
+
     builders = [
         builder.GNUTestBuilder(test_cfg, build_config_name="default",
-                               user_mak="export CFLAGS+=-Wall\n",
-                               config_site="#define PJ_TODO(x)\n",
+                               user_mak=user_mak,
+                               config_site=config_site,
                                exclude=cfg_site.EXCLUDE,
                                not_exclude=cfg_site.NOT_EXCLUDE)

pjproject/trunk/tests/cdash/cfg_msvc.py

@@ -67 +67 @@
                                   cfg_site.OPTIONS)
 
+    config_site = "#define PJ_TODO(x)\n" + cfg_site.CONFIG_SITE
+    user_mak = cfg_site.USER_MAK
+
     builders = [
         builder.MSVCTestBuilder(test_cfg, 
                                 target=target,
                                 build_config_name="default",
-                                config_site="#define PJ_TODO(x)\n",
+                                config_site=config_site,
                                 exclude=cfg_site.EXCLUDE,
                                 not_exclude=cfg_site.NOT_EXCLUDE)

pjproject/trunk/tests/cdash/cfg_site_sample.py

@@ -36 +36 @@
 OPTIONS = []
 
+# What's the content of config_site.h
+CONFIG_SITE = ""
+
+# What's the content of user.mak
+USER_MAK = ""
+
 # List of regular expression of test patterns to be excluded
 EXCLUDE = []

pjproject/trunk/tests/cdash/cfg_symbian.py

@@ -72 +72 @@
 """
 
+    config_Site = config_site1 + cfg_site.CONFIG_SITE
+
     builders = [
         builder.SymbianTestBuilder(test_cfg, 

pjproject/trunk/tests/pjsua/run.py

@@ -162 +162 @@
         def wait(self):
                 self.trace("wait")
-                self.proc.wait()
+                self.proc.communicate("q")
+
         def trace(self, s):
                 if self.trace_enabled:
@@ -178 +179 @@
                         p.send("q")
                         p.send("q")
-                        p.expect(const.DESTROYED, False)
-                        p.wait()
+                        is_err = False
+                        try:
+                                ret = p.expect(const.DESTROYED, False)
+                                if not ret:
+                                        is_err = True
+                        except:
+                                is_err = True
+                        if is_err:
+                                if sys.hexversion >= 0x02060000:
+                                        p.proc.terminate()
+                                else:
+                                        p.wait()
+                        else:
+                                p.wait()
         print "Test completed with error: " + errmsg
         sys.exit(1)