Changeset 695 for branches


Ignore:
Timestamp:
Oct 26, 2007 12:05:58 AM (12 years ago)
Author:
jpfasano
Message:

more clean up of variables.
when "svn update" is needed, now there is a message indicating the first project found that is out of date.

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r687 r695  
    117117
    118118  if os.path.isfile('NBallTestsPassed') :
    119     if not NBsvnCommand.newer(svnCheckOutUrl,projectCheckOutDir):
     119    msg=NBsvnCommand.newer(svnCheckOutUrl,projectCheckOutDir)
     120    if not msg:
    120121      # Previous run ran fine, and nothing has changed.
    121122      NBlogMessages.writeMessage('  No changes since previous successfull run')
    122123      return
     124    NBlogMessages.writeMessage('  '+msg)
    123125    os.remove('NBallTestsPassed')
     126  else :
     127    NBlogMessages.writeMessage('  No record of all tests having passed')
    124128
    125129  #---------------------------------------------------------------------
  • branches/testScripts/NBsvnCommand.py

    r684 r695  
    8383    # Target probably does not exist. It does not have an svn revision
    8484    # nubmer, so return that it is out of date.
    85     return True
     85    return "Does not exist: "+target
    8686
    8787  srcRev=svnRevision(source)
     
    8989    # Source should exist. Something is wrong that will be caught
    9090    # when an 'svn checkout' is done.
    91     return True
     91    return "Does not exist: "+source
    9292
    9393  if srcRev>tarRev :
    94     return True
     94    return "New revision of: "+source
    9595
    9696  # if there is an externals file then process it
     
    108108          if len(found)!=1:
    109109            # something is wrong. Do a rebuild
    110             return True
     110            return "Assumed out of date when reading: "+extFileName
    111111          found=found[0]
    112112          if len(found)!=3 :
    113113            # something is wrong. Do a rebuild
    114             return True
     114            return "Assumed out of date when reading: "+extFileName
    115115          extTarget=os.path.join(target,found[0])
    116116          extSource=found[2]
     
    118118          if newer(extSource,extTarget) :
    119119            extFilePtr.close()
    120             return True
     120            return "New revision of: "+extSource
    121121      line = extFilePtr.readline()
    122122
  • branches/testScripts/NBuserConfig.py

    r692 r695  
    66
    77execfile('NBuserParametersDefault.py')
    8 
    9 print NIGHTLY_BUILD_ROOT_DIR
    108
    119#the following two should go away when newNightlyBuild.py becomes the default
     
    3129execfile('NBuserParameters.py')
    3230
    33 print NIGHTLY_BUILD_ROOT_DIR
Note: See TracChangeset for help on using the changeset viewer.