Reindent and cosmetics

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4926 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/build/buildbot/master.cfg b/build/buildbot/master.cfg
index ffb30b1..4a904c1 100644 (file)
--- a/build/buildbot/master.cfg
+++ b/build/buildbot/master.cfg
@@ -55,36 +55,33 @@ c['sources'] = []
 
 # We use only one scheduling right now, a nightly one, which reruns everything
 
 
 # We use only one scheduling right now, a nightly one, which reruns everything
 

-# TODO: setup a rebuilder in response to CVS commits
+# TODO: setup a rebuilder in response to SVN commits

 # TODO: Define a list of all slaves and use it here and in the definition of c['builders']
 
 from buildbot.scheduler import Scheduler, Nightly, Periodic
 
 nightly_scheduler = Nightly(
 # TODO: Define a list of all slaves and use it here and in the definition of c['builders']
 
 from buildbot.scheduler import Scheduler, Nightly, Periodic
 
 nightly_scheduler = Nightly(

-                                                       "nightly", 
-                                                       ["linux_amd64_pthreads_O3",
-                                                       "linux_amd64_ucontext_O3",
-                                                       "linux_i386_pthreads_O3",
-                                                       "linux_i386_ucontext_O3",
-                                                       "mac_os_x_pthreads",
-                                                       "mac_os_x_ucontext",
-                                                       "windows_builder"], 
-                                                       hour=[12,24], 
-                                                       minute=15)
-
-
-                                     
+       "nightly", 
+       ["linux_amd64_pthreads_O3",
+       "linux_amd64_ucontext_O3",
+       "linux_i386_pthreads_O3",
+       "linux_i386_ucontext_O3",
+       "mac_os_x_pthreads",
+       "mac_os_x_ucontext",
+       "windows_builder"], 
+       hour=[12,24], 
+       minute=15)          

 c['schedulers'] = [nightly_scheduler]
 
 now = Periodic("now", [
 c['schedulers'] = [nightly_scheduler]
 
 now = Periodic("now", [

-                                               "linux_amd64_pthreads_O3",
-                                               "linux_amd64_ucontext_O3",
-                                               "linux_i386_pthreads_O3",
-                                               "linux_i386_ucontext_O3",
-                                               "mac_os_x_pthreads",
-                                               "mac_os_x_ucontext",
-                                               "windows_builder"
-                                               ], 60*20*1)
+      "linux_amd64_pthreads_O3",
+      "linux_amd64_ucontext_O3",
+      "linux_i386_pthreads_O3",
+      "linux_i386_ucontext_O3",
+      "mac_os_x_pthreads",
+      "mac_os_x_ucontext",
+      "windows_builder"
+      ], 60*20*1)

 c['schedulers'] = [nightly_scheduler]
 
 
 c['schedulers'] = [nightly_scheduler]
 
 


@@ -92,27 +89,11 @@ c['schedulers'] = [nightly_scheduler]
 ####################################################################################
 # builders declarations
 
 ####################################################################################
 # builders declarations
 

-from buildbot import locks
-from buildbot.process import step, factory

 from extensions import CustomSVN, CustomConfigure, CustomCheck
 from extensions import CustomSVN, CustomConfigure, CustomCheck

+from buildbot.process import step, factory

 from buildbot.process.step import ShellCommand
 
 from buildbot.process.step import ShellCommand
 

-
-# the following lock manages the builds of the machine bob
-bob_lock = locks.MasterLock("bob_lock")
-
-# the following lock manages the builds of the machine artimon
-artimon_lock = locks.MasterLock("artimon_lock")
-
-# the following lock manages the builds of the machine blase
-blaise_lock = locks.MasterLock("blaise_lock")
-
-# the following lock manages the builds of the machine fastnet
-fastnet_lock = locks.MasterLock("fastnet_lock")
-

 # factories
 # factories

-
-

 pthreads_factory_O3= factory.BuildFactory()
 pthreads_factory_O3.addStep(CustomSVN, name ="{svn update}", baseURL='svn://scm.gforge.inria.fr/svn/simgrid/simgrid/', defaultBranch='trunk', mode="update")
 pthreads_factory_O3.addStep(step.ShellCommand,name = "{svn revert}",description = "running svn revert",descriptionDone = "svn revert",
 pthreads_factory_O3= factory.BuildFactory()
 pthreads_factory_O3.addStep(CustomSVN, name ="{svn update}", baseURL='svn://scm.gforge.inria.fr/svn/simgrid/simgrid/', defaultBranch='trunk', mode="update")
 pthreads_factory_O3.addStep(step.ShellCommand,name = "{svn revert}",description = "running svn revert",descriptionDone = "svn revert",


@@ -144,56 +125,61 @@ windows_factory.addStep(step.ShellCommand,name = "{make}",description = "running
 windows_factory.addStep(step.ShellCommand,name = "{test suite}",description= "running test suite",descriptionDone ="test suite",haltOnFailure = True,command=["C:\\buildslave\\projects\\simgrid\\builddir\\Test", "C:\\buildslave\\projects\\simgrid\\builddir\\test_all.tst"])
 
 
 windows_factory.addStep(step.ShellCommand,name = "{test suite}",description= "running test suite",descriptionDone ="test suite",haltOnFailure = True,command=["C:\\buildslave\\projects\\simgrid\\builddir\\Test", "C:\\buildslave\\projects\\simgrid\\builddir\\test_all.tst"])
 
 

-# builders
+# One lock per machine since some tests open sockets on fixed ports
+from buildbot import locks
+bob_lock = locks.MasterLock("bob_lock")
+artimon_lock = locks.MasterLock("artimon_lock")
+fastnet_lock = locks.MasterLock("fastnet_lock")

 
 

-c['builders'] = [                              
-                                       {'name':'linux_amd64_pthreads_O3',
-                                       'slavename':'bob_pthreads',
-                                       'builddir':'/var/lib/buildbot/simgrid/linux_amd64_pthreads/builddir_O3',
-                                       'factory':pthreads_factory_O3,
-                                       'locks': [bob_lock]},
-                                       
-                                       
-                                                       
-                                       {'name':'linux_amd64_ucontext_O3',
-                                       'slavename':'bob_ucontext',
-                                       'builddir':'/var/lib/buildbot/simgrid/linux_amd64_ucontext/builddir_O3',
-                                       'factory':ucontext_factory_O3,
-                                       'locks': [bob_lock]},
-                                       
-                                       
-                                       {'name':'mac_os_x_pthreads',
-                                       'slavename':'fastnet_pthreads',
-                                       'builddir':'/var/buildbot/simgrid/mac_os_x_pthreads/builddir',
-                                       'factory':pthreads_factory_O3,
-                                       'locks': [fastnet_lock]},
-                                                       
-                                       {'name':'mac_os_x_ucontext',
-                                       'slavename':'fastnet_ucontext',                         
-                                       'factory':ucontext_factory_O3,
-                                       'builddir':'/var/buildbot/simgrid/mac_os_x_ucontext/builddir',
-                                       'locks': [fastnet_lock]},
-                                       
-                                       
-                                       {'name':'windows_builder',
-                                       'slavename':'windows_slave',
-                                       'builddir':"C:\\buildslave\\projects\\simgrid\\builddir",
-                                       'factory':windows_factory},
-                                       
-                                                               
-                                       {'name':'linux_i386_pthreads_O3',
-                                       'slavename':'artimon_pthreads',
-                                       'builddir':'/var/lib/buildbot/simgrid/linux_i386_pthreads/builddir_O3',
-                                       'factory':pthreads_factory_O3,
-                                       'locks': [artimon_lock]},
-                                       
-                                                                       
-                                       {'name':'linux_i386_ucontext_O3',
-                                       'slavename':'artimon_ucontext',
-                                       'builddir':'/var/lib/buildbot/simgrid/linux_i386_ucontext/builddir_O3',
-                                       'factory':ucontext_factory_O3,
-                                       'locks': [artimon_lock]}        
-                                       ]
+# builders
+c['builders'] = [    
+     {'name':'linux_amd64_pthreads_O3',
+     'slavename':'bob_pthreads',
+     'builddir':'/var/lib/buildbot/simgrid/linux_amd64_pthreads/builddir_O3',
+     'factory':pthreads_factory_O3,
+     'locks': [bob_lock]},
+       
+     {'name':'linux_amd64_ucontext_O3',
+     'slavename':'bob_ucontext',
+     'builddir':'/var/lib/buildbot/simgrid/linux_amd64_ucontext/builddir_O3',
+     'factory':ucontext_factory_O3,
+     'locks': [bob_lock]},
+
+
+     
+     {'name':'linux_i386_pthreads_O3',
+     'slavename':'artimon_pthreads',
+     'builddir':'/var/lib/buildbot/simgrid/linux_i386_pthreads/builddir_O3',
+     'factory':pthreads_factory_O3,
+     'locks': [artimon_lock]},
+              
+     {'name':'linux_i386_ucontext_O3',
+     'slavename':'artimon_ucontext',
+     'builddir':'/var/lib/buildbot/simgrid/linux_i386_ucontext/builddir_O3',
+     'factory':ucontext_factory_O3,
+     'locks': [artimon_lock]},
+     
+     
+     
+     {'name':'mac_os_x_pthreads',
+     'slavename':'fastnet_pthreads',
+     'builddir':'/var/buildbot/simgrid/mac_os_x_pthreads/builddir',
+     'factory':pthreads_factory_O3,
+     'locks': [fastnet_lock]},
+       
+     {'name':'mac_os_x_ucontext',
+     'slavename':'fastnet_ucontext',    
+     'factory':ucontext_factory_O3,
+     'builddir':'/var/buildbot/simgrid/mac_os_x_ucontext/builddir',
+     'locks': [fastnet_lock]},
+     
+     
+     
+     {'name':'windows_builder',
+     'slavename':'windows_slave',
+     'builddir':"C:\\buildslave\\projects\\simgrid\\builddir",
+     'factory':windows_factory}
+     ]

 
 
 # status html page
 
 
 # status html page


@@ -209,116 +195,98 @@ c['status'].append(w)
 
 from buildbot.status import mail
 
 
 from buildbot.status import mail
 

-

 c['status'].append(mail.MailNotifier(builders=['mac_os_x_pthreads'],
 c['status'].append(mail.MailNotifier(builders=['mac_os_x_pthreads'],

-fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-subject = "Error occured during pthread build of SimGrid on fastnet",
-extraRecipients=["malek.cherier@loria.fr","martin.quinson@loria.fr"],
-sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during pthread build of SimGrid on fastnet",
+  extraRecipients=["malek.cherier@loria.fr","martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

 
 c['status'].append(mail.MailNotifier(builders=['mac_os_x_ucontext'],
 
 c['status'].append(mail.MailNotifier(builders=['mac_os_x_ucontext'],

-fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-subject = "Error occured during ucontext build of SimGrid on fastnet",
-extraRecipients=["malek.cherier@loria.fr",
-"martin.quinson@loria.fr"],sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during ucontext build of SimGrid on fastnet",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

 
 
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_pthreads'],
 
 
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_pthreads'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "Error occured during pthread build of SimGrid on bob",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during pthread build of SimGrid on bob",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_pthreads_O0'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_pthreads_O0'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "Error occured during pthread build of SimGrid on bob (compiler optimizations O0 enabled)",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during pthread build of SimGrid on bob (compiler optimizations O0 enabled)",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_pthreads_O3'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_pthreads_O3'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "Error occured during pthread build of SimGrid on bob (compiler optimizations O3 enabled)",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during pthread build of SimGrid on bob (compiler optimizations O3 enabled)",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

 
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_ucontext'],
 
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_ucontext'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "Error occured during ucontext build of SimGrid on bob",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))  
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during ucontext build of SimGrid on bob",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))  

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_ucontext_O0'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_ucontext_O0'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing (compiler optimizations O0 enabled)",
-                                       subject = "Error occured during ucontext build of SimGrid on bob",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))  
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing (compiler optimizations O0 enabled)",
+  subject = "Error occured during ucontext build of SimGrid on bob",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))  

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_ucontext_O3'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_amd64_ucontext_O3'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "Error occured during ucontext build of SimGrid on bob  (compiler optimizations O3 enabled)",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))  
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "Error occured during ucontext build of SimGrid on bob  (compiler optimizations O3 enabled)",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))  

                                      
 c['status'].append(mail.MailNotifier(builders=['windows_builder'],
                                      
 c['status'].append(mail.MailNotifier(builders=['windows_builder'],

-                                  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                  subject = "An error occurs during the build of SimGRID on Windows platform",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on Windows platform",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_pthreads'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_pthreads'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "An error occurs during the build of SimGRID on artimon platform",
-                                       extraRecipients=["malek.cherier@loria.fr",
-                                       "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on artimon platform",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_pthreads_O0'],
                                       
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_pthreads_O0'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O0 enabled)" ,
-                                       extraRecipients=["malek.cherier@loria.fr",
-                                       "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O0 enabled)" ,
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_pthreads_O3'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_pthreads_O3'],

-                                       fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                       subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O3 enabled)" ,
-                                       extraRecipients=["malek.cherier@loria.fr",
-                                       "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O3 enabled)" ,
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_ucontext'],
                                       
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_ucontext'],

-                                  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                  subject = "An error occurs during the build of SimGRID on artimon platform",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on artimon platform",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_ucontext_O0'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_ucontext_O0'],

-                                  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                  subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O0 enabled)",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O0 enabled)",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))

                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_ucontext_O3'],
                                       
 c['status'].append(mail.MailNotifier(builders=['linux_i386_ucontext_O3'],

-                                  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
-                                  subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O3 enabled)",
-                                      extraRecipients=["malek.cherier@loria.fr",
-                                      "martin.quinson@loria.fr"],
-                                      sendToInterestedUsers=True))                                                                            
-                                      
-                                     
-
-
+  fromaddr="bob@loria.fr",relayhost="smtp.loria.fr",mode="failing",
+  subject = "An error occurs during the build of SimGRID on artimon platform (compiler optimizations O3 enabled)",
+  extraRecipients=["malek.cherier@loria.fr", "martin.quinson@loria.fr"],
+  sendToInterestedUsers=True))                                                                            

 
 # Project informations
 
 
 # Project informations