Changeset 2410 for pjproject/trunk/tests/cdash/builder.py

Timestamp:

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

Author:

bennylp

Message:

Test refinements for mingw etc.

File:

• pjproject/trunk/tests/cdash/builder.py (modified) (4 diffs)

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())