From e2dc8bb1dff5105317531616a4735f7a938f704a Mon Sep 17 00:00:00 2001 From: coolprop Date: Fri, 8 Aug 2014 01:29:08 -0700 Subject: [PATCH 1/3] Add emptry strings to calls --- dev/buildbot/master/master.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index fcd865a2..4054f3f1 100644 --- a/dev/buildbot/master/master.cfg +++ b/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'), @@ -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'), From 070eb35e6020f6dc6d9b13687e4671b42456ba59 Mon Sep 17 00:00:00 2001 From: coolprop Date: Fri, 8 Aug 2014 01:43:21 -0700 Subject: [PATCH 2/3] Add empty echo --- dev/buildbot/master/master.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 4054f3f1..d1b145fa 100644 --- a/dev/buildbot/master/master.cfg +++ b/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 = ['echo nothing']#['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 = [echo nothing'']#['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 =['echo nothing']# ['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'), @@ -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 = ['echo nothing']#['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'), From d5403c1369553bb0b838259eee28c6719b33cb37 Mon Sep 17 00:00:00 2001 From: coolprop Date: Fri, 8 Aug 2014 01:44:24 -0700 Subject: [PATCH 3/3] Add empty echo --- dev/buildbot/master/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index d1b145fa..d90aee9d 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -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 = [echo nothing'']#['cmd', '/c', WithProperties('"IF %(fullclean:-no)s == yes (echo %CD%)"')] + cmd = ['echo nothing']#['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'),