Removed for now fullclean on windows - bug? Cleaned up test iterators

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>

dev/buildbot/master/master.cfg

@@ -57,7 +57,7 @@ def sphinx_slave(platform, git_mode = 'incremental'):
     # property set? If so, clobber the checkout folders.
     if platform.startswith('win'):
         # del /q destination\* && for /d %x in (destination\*) do @rd /s /q %x
-        cmd = ['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')]
+        cmd = []#['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')]
     else:
         cmd = ['bash', '-c',
                WithProperties('if [ %(fullclean:-no)s == yes ]; then echo `pwd`; rm -rfv build; echo fully cleaned; fi'),
@@ -82,7 +82,7 @@ def javascript_slave(platform, cmake_args = [], cmake_env = {}, build_args = [],
     # property set? If so, clobber the checkout folders.
     if platform.startswith('win'):
         # del /q destination\* && for /d %x in (destination\*) do @rd /s /q %x
-        cmd = ['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')]
+        cmd = []#['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')]
     else:
         cmd = ['bash', '-c',
                WithProperties('if [ %(fullclean:-no)s == yes ]; then echo `pwd`; rm -rfv build; echo fully cleaned; fi'),
@@ -111,7 +111,7 @@ def python_slave(key, platform, cmake_args = [], cmake_env = {}, build_args = []
     # property set? If so, clobber the checkout folders.
     if platform.startswith('win'):
         # del /q destination\* && for /d %x in (destination\*) do @rd /s /q %x
-        cmd = ['cmd', '/c', WithProperties('if %(fullclean:-no)s == no (del /q *) ')]
+        cmd =[]# ['cmd', '/c', WithProperties('if %(fullclean:-no)s == no (del /q *) ')]
     else:
         cmd = ['bash', '-c',
            WithProperties('if [ %(fullclean:-no)s == yes ]; then echo pwd; rm -rfv *; echo fully cleaned; fi'),
@@ -148,7 +148,7 @@ def cmake_slave(mod_name, platform, git_mode = 'incremental', install = True, cm
     build_args: list of strings
         List of strings of arguments to be passed to cmake install or build command depending on value of install
     ctest_args: list of strings
-    	List of strings of arguments to be passed to ctest
+        List of strings of arguments to be passed to ctest
     """
     factory = BuildFactory()
     working_folder = "build/build"
@@ -158,7 +158,7 @@ def cmake_slave(mod_name, platform, git_mode = 'incremental', install = True, cm
     # property set? If so, clobber the checkout folders.
     if platform.startswith('win'):
         # del /q destination\* && for /d %x in (destination\*) do @rd /s /q %x
-        cmd = ['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')]
+        cmd = []#['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')]
     else:
         cmd = ['bash', '-c',
                WithProperties('if [ %(fullclean:-no)s == yes ]; then echo pwd; rm -rf *; echo fully cleaned; fi'),
@@ -178,7 +178,7 @@ def cmake_slave(mod_name, platform, git_mode = 'incremental', install = True, cm
     else:
         factory.addStep(ShellCommand(command=["cmake", "--build", "."]+build_args, workdir = working_folder, haltOnFailure = True))
     if test:
-		factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True))
+        factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True))
     if install:
         factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest="public_html/binaries",url="binaries",compress="bz2"))
     return factory
@@ -186,13 +186,6 @@ def cmake_slave(mod_name, platform, git_mode = 'incremental', install = True, cm
 from buildbot.config import BuilderConfig
 
 c['builders'] = []
-
-c['builders'].append(
-    BuilderConfig(name="Catch-OSX",
-                  slavenames=["OSX-slave"],
-                  factory = cmake_slave('Catch', platform = 'OSX', install=False)
-                  )
-      )
       
 c['builders'].append(
     BuilderConfig(name="Sphinx docs",
@@ -200,20 +193,18 @@ c['builders'].append(
                   factory = sphinx_slave(platform = 'linux')
                   )
       )
-      
+c['builders'].append(
+BuilderConfig(name="Javascript-linux",
+              slavenames=["linux-slave"],
+              factory = javascript_slave(platform = 'linux')
+              )
+  )      
 c['builders'].append(
     BuilderConfig(name="Python-sdist",
                   slavenames=["OSX-slave"],
                   factory = python_slave("PYPI", platform = 'OSX')
                   )
       )
-
-c['builders'].append(
-BuilderConfig(name="Javascript-linux",
-			  slavenames=["linux-slave"],
-			  factory = javascript_slave(platform = 'linux')
-			  )
-  )
             
 for platform in ['OSX','windows']:
     c['builders'].append(
@@ -223,102 +214,64 @@ for platform in ['OSX','windows']:
                   )
       )
 
-#Common (boring) modules for linux and OSX
+#Common boring 64-bit modules for windows, linux and OSX
 ### OSX 
-for wrapper in ['Java','MATLAB','Csharp','Octave']:
-    for platform in ['OSX', 'linux']:
-		c['builders'].append(
-			BuilderConfig(name=wrapper+"-"+platform,
-						  slavenames=[platform + "-slave"],
-						  factory = cmake_slave(wrapper, platform = platform)
-						  )
-			  )
-
+for platform in ['OSX', 'linux', 'windows']:
+    for wrapper in ['Java','MATLAB','Csharp','Octave','64BIT_SHARED_LIBRARY']:
+        ctest_args, cmake_args = [], []
+        if platform.startswith('windows'):
+            ctest_args = ['-C', 'Release']
+            cmake_args = ['-G', 'Visual Studio 10 2010 Win64']
+        c['builders'].append(
+            BuilderConfig(name=wrapper + "-" + platform,
+                          slavenames=[platform + "-slave"],
+                          factory = cmake_slave(wrapper, 
+                                                platform = platform)
+                          )
+              )
+    c['builders'].append(
+    BuilderConfig(name="Catch-"+platform,
+                  slavenames=[platform + "-slave"],
+                  factory = cmake_slave('Catch', platform = platform, install=False)
+                  )
+      )
+        
 c['builders'].append(
-	BuilderConfig(name="64bitDLL-linux",
-	  slavenames=["linux-slave"],
-	  factory = cmake_slave('64BIT_SHARED_LIBRARY', 
-                            platform = 'linux',
-							test = False
-	  )
-	  )
-	  )	
-c['builders'].append(
-	BuilderConfig(name="64bitDLL-OSX",
-	  slavenames=["OSX-slave"],
-	  factory = cmake_slave('64BIT_SHARED_LIBRARY', 
-                            platform = 'OSX',
-							test = False
-	  )
-	  )
-	  )		  
-	  
-c['builders'].append(
-	BuilderConfig(name="64bitDLL-windows",
-	  slavenames=["windows-slave"],
-	  factory = cmake_slave('64BIT_SHARED_LIBRARY', 
-							test = False,
+    BuilderConfig(name="32bitCdeclDLL-windows",
+      slavenames=["windows-slave"],
+      factory = cmake_slave('32BIT_CDECL_SHARED_LIBRARY', 
+                            test = False,
                             platform = 'windows',
-							cmake_args=['-G','Visual Studio 10 2010 Win64']
-	  )
-	  )
-	  )	
+                            cmake_args=['-G','Visual Studio 10 2010']
+      )
+      )
+      )	
 c['builders'].append(
-	BuilderConfig(name="32bitCdeclDLL-windows",
-	  slavenames=["windows-slave"],
-	  factory = cmake_slave('32BIT_CDECL_SHARED_LIBRARY', 
-							test = False,
+    BuilderConfig(name="32bitStdcallDLL-windows",
+      slavenames=["windows-slave"],
+      factory = cmake_slave('32BIT_STDCALL_SHARED_LIBRARY', 
+                            test = False,
                             platform = 'windows',
-							cmake_args=['-G','Visual Studio 10 2010']
-	  )
-	  )
-	  )	
-c['builders'].append(
-	BuilderConfig(name="32bitStdcallDLL-windows",
-	  slavenames=["windows-slave"],
-	  factory = cmake_slave('32BIT_STDCALL_SHARED_LIBRARY', 
-							test = False,
-                            platform = 'windows',
-							cmake_args=['-G','Visual Studio 10 2010']
-	  )
-	  )
-	  )		  
+                            cmake_args=['-G','Visual Studio 10 2010']
+      )
+      )
+      )		  
 c['builders'].append(
     BuilderConfig(name="EES-windows",
       slavenames=["windows-slave"],
-      factory = cmake_slave('EES', platform = 'windows', test = False)
-      )
-      )
-c['builders'].append(
-    BuilderConfig(name="Java-windows",
-      slavenames=["windows-slave"],
-      factory = cmake_slave('Java', platform = 'windows', ctest_args = ['-C','Release'])
-      )
-      )
-c['builders'].append(
-    BuilderConfig(name="Csharp-windows",
-      slavenames=["windows-slave"],
-      factory = cmake_slave('Csharp', platform = 'windows', ctest_args = ['-C','Release'])
-      )
-      )
-c['builders'].append(
-    BuilderConfig(name="Octave-windows",
-      slavenames=["windows-slave"],
-      factory = cmake_slave('Octave', platform = 'windows', ctest_args = ['-C','Release'])
-      )
-      )
-c['builders'].append(
-    BuilderConfig(name="MATLAB64-windows",
-      slavenames=["windows-slave"],
-      factory = cmake_slave('MATLAB', platform = 'windows', cmake_args=['-G','Visual Studio 10 2010 Win64'])
+      factory = cmake_slave('EES', 
+                            platform = 'windows', 
+                            test = False,
+                            cmake_args=['-G','Visual Studio 10 2010'])
       )
       )
 c['builders'].append(
     BuilderConfig(name="MATLAB32-windows",
       slavenames=["windows-slave"],
-      factory = cmake_slave('MATLAB', platform = 'windows', 
-                                      cmake_env={'MATLAB_ROOT':'c:\Program Files (x86)\MATLAB\R2014a'},
-                                      cmake_args=['-G','Visual Studio 10 2010'])
+      factory = cmake_slave('MATLAB', 
+                            platform = 'windows', 
+                            cmake_env={'MATLAB_ROOT':'c:\Program Files (x86)\MATLAB\R2014a'},
+                            cmake_args=['-G','Visual Studio 10 2010'])
       )
       )