Changeset 820 for branches

Timestamp:

Dec 13, 2007 9:18:03 AM (14 years ago)

Author:

jpfasano

Message:

modified the way the build directory name is generated.
The way it had been done was causing the code which removes the NBallTestsPassed file to work incorrectly.
Added the writing of the config parms to the config log

Location:

branches/testScripts

Files:

• NBbuildConfig.py (modified) (4 diffs)
• NBcbcRunTimes.py (modified) (4 diffs)

branches/testScripts/NBbuildConfig.py

@@ -35 +35 @@
 def cleanUpName(messedUpName) :
   cleanedUpName=messedUpName
-  cleanedUpName=cleanedUpName.replace('-','')
+  
+  # Do not remove "-". This will cause problems when removing NBallTestsPassed.
+  #cleanedUpName=cleanedUpName.replace('-','')
+
   cleanedUpName=cleanedUpName.replace('/','-')
   cleanedUpName=cleanedUpName.replace('\\','-')
@@ -44 +47 @@
   cleanedUpName=cleanedUpName.replace(":",'')
   cleanedUpName=cleanedUpName.replace('--enable','')
+  cleanedUpName=cleanedUpName.replace('--','-')
   return cleanedUpName
 
@@ -342 +346 @@
     configOptions+=configuration['configOptions']['invariant']
     configOptions+=skipOptions
-    
+    configOptions=configOptions.replace("  "," ")
+    configOptions=configOptions.replace("  "," ")
+    configOptions=configOptions.replace('=" ','="')
 
     #start kipp change
@@ -368 +374 @@
       # Finally run config
       result=NBosCommand.run(configCmd)
+      result['stdout']=configOptions+"\n"+result['stdout']
       writeResults(result,'config') 
 

branches/testScripts/NBcbcRunTimes.py

@@ -37 +37 @@
   return retVal
 #===========================================================================
+def getConfigOptions(buildDir):
+  retVal=''
+  configFile = os.path.join(buildDir,'NBstdout-config')
+  if os.path.isfile(configFile) :
+    configFilePtr = open(configFile,'r')
+    retVal=configFilePtr.readline()
+    configFilePtr.close()
+  else :
+    NBlogMessages.writeMessage( "Failure reading " + configFile )
+    sys.exit(1)
+  return retVal
+#===========================================================================
 def updateMachineTables(db) : 
   cursor = db.cursor()
@@ -73 +85 @@
   execModTimeEpoch=os.path.getmtime(execFilename)
   execModTime=str(datetime.datetime.fromtimestamp(execModTimeEpoch))
+  configOptions=getConfigOptions(buildDir)
+  print configOptions
 
   # Does this build already exist in database?
-  x=cursor.execute("""SELECT buildId from build WHERE svnRevision='%s' and svnUrl='%s' and executableTimeStamp='%s'"""%
-                 (str(svnRevNum),svnUrl,execModTime) )
+  x=cursor.execute("""SELECT buildId from build WHERE svnRevision='%s' and svnUrl='%s' and executableTimeStamp='%s' and configOptions='%s'"""%
+                 (str(svnRevNum),svnUrl,execModTime,configOptions) )
   row = cursor.fetchone()
   if row!=None :
@@ -83 +97 @@
     return retVal
   
-  x=cursor.execute("Insert INTO build (svnRevision,svnUrl,executableTimeStamp) VALUES (%s,%s,%s)",
-                 (str(svnRevNum),svnUrl,execModTime) )  
+  x=cursor.execute("Insert INTO build (svnRevision,svnUrl,executableTimeStamp,configOptions) VALUES (%s,%s,%s,%s)",
+                 (str(svnRevNum),svnUrl,execModTime,configOptions) )  
   retVal = db.insert_id()
 
@@ -100 +114 @@
 
 
+#==================================================================================