Changeset 820 for branches


Ignore:
Timestamp:
Dec 13, 2007 9:18:03 AM (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r818 r820  
    3535def cleanUpName(messedUpName) :
    3636  cleanedUpName=messedUpName
    37   cleanedUpName=cleanedUpName.replace('-','')
     37 
     38  # Do not remove "-". This will cause problems when removing NBallTestsPassed.
     39  #cleanedUpName=cleanedUpName.replace('-','')
     40
    3841  cleanedUpName=cleanedUpName.replace('/','-')
    3942  cleanedUpName=cleanedUpName.replace('\\','-')
     
    4447  cleanedUpName=cleanedUpName.replace(":",'')
    4548  cleanedUpName=cleanedUpName.replace('--enable','')
     49  cleanedUpName=cleanedUpName.replace('--','-')
    4650  return cleanedUpName
    4751
     
    342346    configOptions+=configuration['configOptions']['invariant']
    343347    configOptions+=skipOptions
    344    
     348    configOptions=configOptions.replace("  "," ")
     349    configOptions=configOptions.replace("  "," ")
     350    configOptions=configOptions.replace('=" ','="')
    345351
    346352    #start kipp change
     
    368374      # Finally run config
    369375      result=NBosCommand.run(configCmd)
     376      result['stdout']=configOptions+"\n"+result['stdout']
    370377      writeResults(result,'config')
    371378
  • branches/testScripts/NBcbcRunTimes.py

    r819 r820  
    3737  return retVal
    3838#===========================================================================
     39def 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#===========================================================================
    3951def updateMachineTables(db) :
    4052  cursor = db.cursor()
     
    7385  execModTimeEpoch=os.path.getmtime(execFilename)
    7486  execModTime=str(datetime.datetime.fromtimestamp(execModTimeEpoch))
     87  configOptions=getConfigOptions(buildDir)
     88  print configOptions
    7589
    7690  # 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) )
    7993  row = cursor.fetchone()
    8094  if row!=None :
     
    8397    return retVal
    8498 
    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) ) 
    87101  retVal = db.insert_id()
    88102
     
    100114
    101115
     116#==================================================================================
    102117 
    103118
Note: See TracChangeset for help on using the changeset viewer.