Changeset 695

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:

• NBbuildConfig.py (modified) (1 diff)
• NBsvnCommand.py (modified) (4 diffs)
• NBuserConfig.py (modified) (2 diffs)

branches/testScripts/NBbuildConfig.py

@@ -117 +117 @@
 
   if os.path.isfile('NBallTestsPassed') : 
-    if not NBsvnCommand.newer(svnCheckOutUrl,projectCheckOutDir):
+    msg=NBsvnCommand.newer(svnCheckOutUrl,projectCheckOutDir)
+    if not msg:
       # Previous run ran fine, and nothing has changed.
       NBlogMessages.writeMessage('  No changes since previous successfull run')
       return
+    NBlogMessages.writeMessage('  '+msg)
     os.remove('NBallTestsPassed')
+  else :
+    NBlogMessages.writeMessage('  No record of all tests having passed')
 
   #---------------------------------------------------------------------

branches/testScripts/NBsvnCommand.py

@@ -83 +83 @@
     # Target probably does not exist. It does not have an svn revision
     # nubmer, so return that it is out of date.
-    return True
+    return "Does not exist: "+target
 
   srcRev=svnRevision(source)
@@ -89 +89 @@
     # Source should exist. Something is wrong that will be caught
     # when an 'svn checkout' is done.
-    return True
+    return "Does not exist: "+source
 
   if srcRev>tarRev :
-    return True
+    return "New revision of: "+source
 
   # if there is an externals file then process it
@@ -108 +108 @@
           if len(found)!=1:
             # something is wrong. Do a rebuild
-            return True
+            return "Assumed out of date when reading: "+extFileName
           found=found[0]
           if len(found)!=3 :
             # something is wrong. Do a rebuild
-            return True
+            return "Assumed out of date when reading: "+extFileName
           extTarget=os.path.join(target,found[0])
           extSource=found[2]
@@ -118 +118 @@
           if newer(extSource,extTarget) :
             extFilePtr.close()
-            return True
+            return "New revision of: "+extSource
       line = extFilePtr.readline()
 

branches/testScripts/NBuserConfig.py

@@ -6 +6 @@
 
 execfile('NBuserParametersDefault.py')
-
-print NIGHTLY_BUILD_ROOT_DIR
 
 #the following two should go away when newNightlyBuild.py becomes the default
@@ -31 +29 @@
 execfile('NBuserParameters.py')
 
-print NIGHTLY_BUILD_ROOT_DIR