Changeset 677

Timestamp:

Oct 25, 2007 6:46:10 AM (13 years ago)

Author:

stefan

Message:

store output from get.XXX, make, make test, configure, unittest in NB... files

Location:

branches/testScripts

Files:

• NBbuildConfig.py (modified) (9 diffs)
• newNightlyBuild.py (modified) (1 diff)

branches/testScripts/NBbuildConfig.py

@@ -46 +46 @@
 #   that are the same for every build configuration so they don't need
 #   to be part of the vpath directory name.
-#   Example: 'CXX=g++ -m64 LDFLAGS=-lstdc++'
+#   Example: 'CXX="g++ -m64" LDFLAGS=-lstdc++'
 #
 #  configuration['SkipProjects']= List of COIN projects to skip (exclude)
@@ -56 +56 @@
 #
 #  configuration['unitTest']= undefined or dictionary D where
-#    D['path']= relataive path were unitTest is to be run from.
+#    D['path']= relative path were unitTest is to be run from.
 #    D['command']= command to be issued to run unitTest
-#    d['checkUnitTest']= function to be called to determine if unitTest
+#    D['checkUnitTest']= function to be called to determine if unitTest
 #       ran correctly.
 #------------------------------------------------------------------------
@@ -114 +114 @@
               if os.path.isfile(install3rdPartyCmd) :
                 NBlogMessages.writeMessage('  '+install3rdPartyCmd)
-                NBosCommand.run(install3rdPartyCmd)
-                f=open('NBinstalldone','w')
-                f.close()
+                installReturn = NBosCommand.run(install3rdPartyCmd)
+                if installReturn['returnCode'] :
+                  NBlogMessages.writeMsg('  warning: Install of 3rd party code in '+thirdPartyDir+' returned '+installReturn['returnCode'])
+                else :
+                  f=open('NBinstalldone','w')
+                  f.close()
+                stdoutfile=open(thirdPartyDir+'/NBstdout','w')
+                stdoutfile.write(installReturn['stdout'])
+                stdoutfile.close()
+                stderrfile=open(thirdPartyDir+'/NBstderr','w')
+                stderrfile.write(installReturn['stderr'])
+                stderrfile.close()
             else :
               NBlogMessages.writeMessage('  skipped a new download of '+d)
         else :
           NBlogMessages.writeMessage('  Skipped a new download into '+thirdPartyBaseDir)
-    
+
   #---------------------------------------------------------------------
   # Source is now available, so now it is time to run config
@@ -157 +166 @@
   vpathDir=vpathDir.replace('--enable','')
   if vpathDir==svnVersionFlattened : vpathDir+='-default'
-  
+
   fullVpathDir = os.path.join(projectBaseDir,vpathDir)
   if not os.path.isdir(fullVpathDir) : 
@@ -175 +184 @@
   # If config was previously run, then no need to run again.
   if NBcheckResult.didConfigRunOK() :
-    NBlogMessages.writeMessage("  '"+configCmd+"' previously ran. Not rerunning")
+    NBlogMessages.writeMessage("  configure previously ran. Not rerunning.")
   else :
     NBlogMessages.writeMessage("  "+configCmd)
@@ -181 +190 @@
     # Finally run config
     result=NBosCommand.run(configCmd)
-      
+    stdoutfile=open('NBconfig.stdout','w')
+    stdoutfile.write(result['stdout'])
+    stdoutfile.close()
+    stderrfile=open('NBconfig.stderr','w')
+    stderrfile.write(result['stderr'])
+    stderrfile.close()
+
     # Check if configure worked
     if result['returnCode'] != 0 :
@@ -200 +215 @@
   NBlogMessages.writeMessage( '  make' )
   result=NBosCommand.run('make')
-      
+  stdoutfile=open('NBmake.stdout','w')
+  stdoutfile.write(result['stdout'])
+  stdoutfile.close()
+  stderrfile=open('NBmake.stderr','w')
+  stderrfile.write(result['stderr'])
+  stderrfile.close()
+
   # Check if make worked
   if result['returnCode'] != 0 :
@@ -211 +232 @@
   NBlogMessages.writeMessage( '  make test' )
   result=NBosCommand.run('make test')
-      
+  stdoutfile=open('NBmaketest.stdout','w')
+  stdoutfile.write(result['stdout'])
+  stdoutfile.close()
+  stderrfile=open('NBmaketest.stderr','w')
+  stderrfile.write(result['stderr'])
+  stderrfile.close()
+
   # Check if 'make test' worked
   didMakeTestFail=configuration['checkMakeTest'](result,configuration['project'],"make test")
@@ -239 +266 @@
     NBlogMessages.writeMessage( '  '+unitTestCmd )
     result=NBosCommand.run(unitTestCmd)
-      
+    stdoutfile=open('NBunittest.stdout','w')
+    stdoutfile.write(result['stdout'])
+    stdoutfile.close()
+    stderrfile=open('NBunittest.stderr','w')
+    stderrfile.write(result['stderr'])
+    stderrfile.close()
+
     didUnitTestFail=configuration['unitTest']['checkUnitTest'](result,configuration['project'],unitTestCmdTemplate)
     if didUnitTestFail :

branches/testScripts/newNightlyBuild.py

@@ -20 +20 @@
 #   -Skip make of project that depend on a project which make had been failing. (Similar for configure.)
 #    But also tell project managers of skiped project that their project was skipped.
-#   -Store output of get.XXX calls, make, make test, configures... in some files.
-#   -Allow a fine configuration of which build tests to run per project.
-#   -Move actual [get project, configure, make, tests] part into an extra file.