Changeset 649

Timestamp:

Oct 21, 2007 1:22:17 PM (12 years ago)

Author:

jpfasano

Message:

Many changes thanks to Kipp getting over the vpath hurdle.
Added ability to build trunk and/or latestStable.
Added ability to run config with default or debug.
Working on ability to run config to skip 3rd party code

Location:

branches/testScripts

Files:

• NBcheckResult.py (modified) (2 diffs)
• NBuserConfig.py (modified) (1 diff)
• nightlyBuild.py (modified) (6 diffs)

branches/testScripts/NBcheckResult.py

@@ -17 +17 @@
   # If the return code is not 0, then failure
   if result['returnCode'] != 0 :
-    retVal = "Non-zero return code of "+result['returnCode']
+    retVal = "Non-zero return code of "+str(result['returnCode'])
 
   # Many tests write a "Success" message.
@@ -62 +62 @@
       retVal=None
     else :
-      retVal = "Return code of "+result['returnCode']+" which is > 2."
+      retVal = "Return code of "+str(result['returnCode'])+" which is > 2."
 
   # DyLP's "make test"

branches/testScripts/NBuserConfig.py

@@ -138 +138 @@
 PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc',\
             'FlopC++','Ipopt','OS','CppAD']
-PROJECTS =['CoinUtils']
+
+
+#----------------------------------------------------------------------
+# For every project, indicate which svn versions are to be used.
+# Supported versions are: trunk & latestStable
+#----------------------------------------------------------------------
+PROJECT_VERSIONS = ['trunk','latestStable']
+
+#----------------------------------------------------------------------
+# For every project version, indicate all the ways the code is to 
+# be built.
+# Presently, NoThirdParty is not yet working
+#----------------------------------------------------------------------
+BUILD_TYPES = [\
+              ['Default','ThirdParty'   ],\
+              ['Debug',  'ThirdParthy'  ]\
+              #['Debug',  'NoThirdParthy']\
+              ]
+
+               
 
 #----------------------------------------------------------------------

branches/testScripts/nightlyBuild.py

@@ -15 +15 @@
 # TODO:
 #   -Get some information about the platform and put this in email failure message.
-#   -Implement Kipp's vpath (delete vpath instead of 'make distclean').
+#   -In userConfig allow one to optionally do a clean checkout and/or config
 #   -Don't do build if 'svn update' doesn't change anything and prior test was OK.
 #     (no need to re-run if nothing has changed since prior run)
-#   -Build both trunk and latest stable 
-#   -Build both optimized and debug (or have a set of config-site scripts to test?)
+#   -Figure out how to run configure with no third party code
 
 
@@ -60 +59 @@
   #---------------------------------------------------------------------
   # Loop once for each version of the project to be checked out.
-  # Presently this is only trunk, but it should optionally be
-  # latest stable and trunk
+  # The supported types are trunk & latestStable
   #---------------------------------------------------------------------
-  projectVersions=['trunk']
+  projectVersions=[]
+  if 'latestStable' in NBuserConfig.PROJECT_VERSIONS :
+    lsv = NBsvnCommand.latestStableVersion(p)
+    projectVersions.append(['stable'+lsv,'stable/'+lsv])
+  if 'trunk' in NBuserConfig.PROJECT_VERSIONS :
+    projectVersions.append(['trunk','trunk'])
   for projectVersion in projectVersions :
     #---------------------------------------------------------------------
@@ -69 +72 @@
     #---------------------------------------------------------------------
     projectBaseDir=os.path.join(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR,p)
-    projectCheckOutDir=os.path.join(projectBaseDir,projectVersion)
+    projectCheckOutDir=os.path.join(projectBaseDir,projectVersion[0])
     if not os.path.isdir(projectBaseDir) :
       os.makedirs(projectBaseDir)
     if not os.path.isdir(projectCheckOutDir) :
       svnCmd=os.path.join(NBuserConfig.SVNPATH_PREFIX,'svn') +\
-             ' checkout https://projects.coin-or.org/svn/'+p+'/'+projectVersion+' '+projectVersion
+             ' checkout https://projects.coin-or.org/svn/'+p+'/'+projectVersion[1]+' '+projectVersion[0]
       if NBsvnCommand.run(svnCmd,projectBaseDir,p)!='OK' :
         continue
@@ -102 +105 @@
     # vpath and options to configure must be set for the buildType
     #---------------------------------------------------------------------
-    buildTypes=['Default','Debug']
-    for buildType in buildTypes :    
+    for buildType in NBuserConfig.BUILD_TYPES :    
     
       #---------------------------------------------------------------------
-      # Setup the directory where the build will be done
-      #---------------------------------------------------------------------
-      vpathDir = projectVersion+buildType
+      # Setup the directory where the build will be done and the configure
+      # command options
+      #---------------------------------------------------------------------
+      vpathDir=projectVersion[0]
+      configOptions='-C'
+
+      if "Debug" in buildType :
+        vpathDir += "Debug"
+        configOptions += " --enable-debug"
+      else :
+        vpathDir += "Default"
+
+      if "ThirdParty" in buildType :
+        vpathDir += "ThirdParty"
+      else :
+        vpathDir += "NoThirdParty"
+        thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
+        if os.path.isdir(thirdPartyBaseDir) :
+          thirdPartyDirs = os.listdir(thirdPartyBaseDir)
+          skipOptions=''
+          for d in thirdPartyDirs :
+            skipOptions+=' ThirdParty/'+d
+          configOptions+=' COIN_SKIP_PROJECTS="'+skipOptions+'"'
+     
       fullVpathDir = os.path.join(projectBaseDir,vpathDir)
       #TODO: if (MAKE_CLEAN) : distutils.dir_util.remove_tree(fullVpathDir)
       if not os.path.isdir(fullVpathDir) : os.mkdir(fullVpathDir)
-      print fullVpathDir
 
       #---------------------------------------------------------------------
@@ -119 +141 @@
       #---------------------------------------------------------------------
       os.chdir(fullVpathDir)
-      #configCmd = os.path.join('.','configure -C')
-      configCmd = os.path.join('.',projectCheckOutDir,"configure -C")
-      if buildType=='Debug' : configCmd += " --enable-debug"
-      print configCmd
+      configCmd = os.path.join('.',projectCheckOutDir,"configure "+configOptions)
       if NBcheckResult.didConfigRunOK() :
         NBlogMessages.writeMessage("  '"+configCmd+"' previously ran. Not rerunning")
@@ -172 +191 @@
         unitTestPath = os.path.join(fullVpathDir,NBprojectConfig.UNITTEST_DIR[p])
         os.chdir(unitTestPath)
-        print unitTestPath
 
         unitTestCmdTemplate=NBprojectConfig.UNITTEST_CMD[p]