- Timestamp:
- Dec 13, 2007 9:18:03 AM (13 years ago)
- Location:
- branches/testScripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/testScripts/NBbuildConfig.py
r818 r820 35 35 def cleanUpName(messedUpName) : 36 36 cleanedUpName=messedUpName 37 cleanedUpName=cleanedUpName.replace('-','') 37 38 # Do not remove "-". This will cause problems when removing NBallTestsPassed. 39 #cleanedUpName=cleanedUpName.replace('-','') 40 38 41 cleanedUpName=cleanedUpName.replace('/','-') 39 42 cleanedUpName=cleanedUpName.replace('\\','-') … … 44 47 cleanedUpName=cleanedUpName.replace(":",'') 45 48 cleanedUpName=cleanedUpName.replace('--enable','') 49 cleanedUpName=cleanedUpName.replace('--','-') 46 50 return cleanedUpName 47 51 … … 342 346 configOptions+=configuration['configOptions']['invariant'] 343 347 configOptions+=skipOptions 344 348 configOptions=configOptions.replace(" "," ") 349 configOptions=configOptions.replace(" "," ") 350 configOptions=configOptions.replace('=" ','="') 345 351 346 352 #start kipp change … … 368 374 # Finally run config 369 375 result=NBosCommand.run(configCmd) 376 result['stdout']=configOptions+"\n"+result['stdout'] 370 377 writeResults(result,'config') 371 378 -
branches/testScripts/NBcbcRunTimes.py
r819 r820 37 37 return retVal 38 38 #=========================================================================== 39 def getConfigOptions(buildDir): 40 retVal='' 41 configFile = os.path.join(buildDir,'NBstdout-config') 42 if os.path.isfile(configFile) : 43 configFilePtr = open(configFile,'r') 44 retVal=configFilePtr.readline() 45 configFilePtr.close() 46 else : 47 NBlogMessages.writeMessage( "Failure reading " + configFile ) 48 sys.exit(1) 49 return retVal 50 #=========================================================================== 39 51 def updateMachineTables(db) : 40 52 cursor = db.cursor() … … 73 85 execModTimeEpoch=os.path.getmtime(execFilename) 74 86 execModTime=str(datetime.datetime.fromtimestamp(execModTimeEpoch)) 87 configOptions=getConfigOptions(buildDir) 88 print configOptions 75 89 76 90 # Does this build already exist in database? 77 x=cursor.execute("""SELECT buildId from build WHERE svnRevision='%s' and svnUrl='%s' and executableTimeStamp='%s' """%78 (str(svnRevNum),svnUrl,execModTime ) )91 x=cursor.execute("""SELECT buildId from build WHERE svnRevision='%s' and svnUrl='%s' and executableTimeStamp='%s' and configOptions='%s'"""% 92 (str(svnRevNum),svnUrl,execModTime,configOptions) ) 79 93 row = cursor.fetchone() 80 94 if row!=None : … … 83 97 return retVal 84 98 85 x=cursor.execute("Insert INTO build (svnRevision,svnUrl,executableTimeStamp ) VALUES (%s,%s,%s)",86 (str(svnRevNum),svnUrl,execModTime ) )99 x=cursor.execute("Insert INTO build (svnRevision,svnUrl,executableTimeStamp,configOptions) VALUES (%s,%s,%s,%s)", 100 (str(svnRevNum),svnUrl,execModTime,configOptions) ) 87 101 retVal = db.insert_id() 88 102 … … 100 114 101 115 116 #================================================================================== 102 117 103 118
Note: See TracChangeset
for help on using the changeset viewer.