From: rniwa@webkit.org Date: Fri, 11 Jan 2013 18:39:21 +0000 (+0000) Subject: Try CRLF to LF change in r139407 again. X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=ccd4bef28c1ece40e1936bd5a298cf11ee438e88 Try CRLF to LF change in r139407 again. * BuildSlaveSupport/delete-stale-build-files: (main): (webkitBuildDirectory): * BuildSlaveSupport/kill-old-processes: (main): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139460 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Tools/BuildSlaveSupport/delete-stale-build-files b/Tools/BuildSlaveSupport/delete-stale-build-files index 15b225e..3b8bd63 100755 --- a/Tools/BuildSlaveSupport/delete-stale-build-files +++ b/Tools/BuildSlaveSupport/delete-stale-build-files @@ -1,82 +1,82 @@ -#!/usr/bin/python -# Copyright (C) 2013 Apple Inc. All rights reserved. -# Copyright (C) 2012 Google Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import optparse -import os -import subprocess -import sys - - -def main(): - parser = optparse.OptionParser("usage: %prog [options]") - parser.add_option("--platform", dest="platform") - parser.add_option("--debug", action="store_const", const="debug", dest="configuration") - parser.add_option("--release", action="store_const", const="release", dest="configuration") - - options, parameters = parser.parse_args() - if not options.platform: - parser.error("Platform is required") - return -1 - if not options.configuration: - parser.error("Configuration is required") - return -2 - - genericPlatform = options.platform.split('-', 1)[0] - if genericPlatform != 'mac': - print 'Exited without removing any files.' - return 0 - - directory = webkitBuildDirectory(genericPlatform, options.configuration) - exit_code = 0 - - for root, _, files in os.walk(directory): - for name in files: - full_path = os.path.join(root, name) - ext = os.path.splitext(full_path)[1] - - try: - if ext in ('.dep', '.timestamp', '.txt', '.html', '.js', '.generated') or os.path.getsize(full_path): - continue - except OSError as exception: - print exception - continue - - try: - os.remove(full_path) - print 'Removed', full_path - except OSError as exception: - print exception - exit_code += 1 - - return exit_code - - -def webkitBuildDirectory(platform, configuration): - return subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"), - "--" + platform, "--" + configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip() - - -if __name__ == '__main__': - sys.exit(main()) +#!/usr/bin/python +# Copyright (C) 2013 Apple Inc. All rights reserved. +# Copyright (C) 2012 Google Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import optparse +import os +import subprocess +import sys + + +def main(): + parser = optparse.OptionParser("usage: %prog [options]") + parser.add_option("--platform", dest="platform") + parser.add_option("--debug", action="store_const", const="debug", dest="configuration") + parser.add_option("--release", action="store_const", const="release", dest="configuration") + + options, parameters = parser.parse_args() + if not options.platform: + parser.error("Platform is required") + return -1 + if not options.configuration: + parser.error("Configuration is required") + return -2 + + genericPlatform = options.platform.split('-', 1)[0] + if genericPlatform != 'mac': + print 'Exited without removing any files.' + return 0 + + directory = webkitBuildDirectory(genericPlatform, options.configuration) + exit_code = 0 + + for root, _, files in os.walk(directory): + for name in files: + full_path = os.path.join(root, name) + ext = os.path.splitext(full_path)[1] + + try: + if ext in ('.dep', '.timestamp', '.txt', '.html', '.js', '.generated') or os.path.getsize(full_path): + continue + except OSError as exception: + print exception + continue + + try: + os.remove(full_path) + print 'Removed', full_path + except OSError as exception: + print exception + exit_code += 1 + + return exit_code + + +def webkitBuildDirectory(platform, configuration): + return subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"), + "--" + platform, "--" + configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip() + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/Tools/BuildSlaveSupport/kill-old-processes b/Tools/BuildSlaveSupport/kill-old-processes index a322eb0..272d2d9 100755 --- a/Tools/BuildSlaveSupport/kill-old-processes +++ b/Tools/BuildSlaveSupport/kill-old-processes @@ -1,119 +1,119 @@ -#!/usr/bin/python -# Copyright (C) 2010 Apple Inc. All rights reserved. -# Copyright (C) 2011 Google Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import os, sys - - -def main(): - tasksToKillWin = [ - "cl.exe", - "devenv.com", - "devenv.exe", - "DumpRenderTree.exe", - "DumpRenderTree_debug.exe", - "httpd.exe", - "imagediff.exe", - "imagediff_debug.exe", - "jsc.exe", - "jsc_debug.exe", - "LightTPD.exe", - "link.exe", - "midl.exe", - "perl.exe", - "Safari.exe", - "svn.exe", - "testapi.exe", - "testapi_debug.exe", - "VcBuildHelper.exe", - "wdiff.exe", - "WebKit2WebProcess.exe", - "WebKit2WebProcess_debug.exe", - "WebKitTestRunner.exe", - "WebKitTestRunner_debug.exe", - ] - - tasksToKillMac = [ - "apache2", - "cc1plus", - "cc1objplus", - "clang", - r"clang\+\+", - "gcc-4.2", - "httpd", - "i686-apple-darwin10-gcc-4.2.1", - "jsc", - "make", - "pboard", # FIXME: https://bugs.webkit.org/show_bug.cgi?id=81012 - "per5.12", - "perl", - "Problem Reporter", - "ruby", - "Safari Web Content", - "Safari", - "svn", - "DumpRenderTree", - "TestWebKitAPI Web Content", - "TestWebKitAPI", - "WebKitPluginAgen", # FIXME: Why no 't'? - "WebKitTestRunner Web Content", - "WebKitTestRunner", - "WebProcess", - "xcodebuild", - ] - - taskToKillUnix = [ - "apache2", - "cc1plus", - "DumpRenderTree", - "gold", - "httpd", - "ld", - "make", - "ruby", - "svn", - "webkit_unit_tests", - "WebKitTestRunner", - "Xvfb", - ] - - if sys.platform == 'darwin': - for task in tasksToKillMac: - os.system("killall -9 -v -m " + task) - # Kill all instances of python executing run-webkit-tests - os.system("ps aux | grep -P '.+/Python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill") - elif sys.platform == 'cygwin' or sys.platform == 'win32': - for task in tasksToKillWin: - os.system("taskkill /t /f /im " + task) - elif sys.platform.startswith('linux'): - for task in taskToKillUnix: - os.system("killall -9 -v " + task) - os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill") - else: - sys.exit() - # FIXME: Should we return an exit code based on how the kills went? - - -if __name__ == '__main__': - sys.exit(main()) +#!/usr/bin/python +# Copyright (C) 2010 Apple Inc. All rights reserved. +# Copyright (C) 2011 Google Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import os, sys + + +def main(): + tasksToKillWin = [ + "cl.exe", + "devenv.com", + "devenv.exe", + "DumpRenderTree.exe", + "DumpRenderTree_debug.exe", + "httpd.exe", + "imagediff.exe", + "imagediff_debug.exe", + "jsc.exe", + "jsc_debug.exe", + "LightTPD.exe", + "link.exe", + "midl.exe", + "perl.exe", + "Safari.exe", + "svn.exe", + "testapi.exe", + "testapi_debug.exe", + "VcBuildHelper.exe", + "wdiff.exe", + "WebKit2WebProcess.exe", + "WebKit2WebProcess_debug.exe", + "WebKitTestRunner.exe", + "WebKitTestRunner_debug.exe", + ] + + tasksToKillMac = [ + "apache2", + "cc1plus", + "cc1objplus", + "clang", + r"clang\+\+", + "gcc-4.2", + "httpd", + "i686-apple-darwin10-gcc-4.2.1", + "jsc", + "make", + "pboard", # FIXME: https://bugs.webkit.org/show_bug.cgi?id=81012 + "per5.12", + "perl", + "Problem Reporter", + "ruby", + "Safari Web Content", + "Safari", + "svn", + "DumpRenderTree", + "TestWebKitAPI Web Content", + "TestWebKitAPI", + "WebKitPluginAgen", # FIXME: Why no 't'? + "WebKitTestRunner Web Content", + "WebKitTestRunner", + "WebProcess", + "xcodebuild", + ] + + taskToKillUnix = [ + "apache2", + "cc1plus", + "DumpRenderTree", + "gold", + "httpd", + "ld", + "make", + "ruby", + "svn", + "webkit_unit_tests", + "WebKitTestRunner", + "Xvfb", + ] + + if sys.platform == 'darwin': + for task in tasksToKillMac: + os.system("killall -9 -v -m " + task) + # Kill all instances of python executing run-webkit-tests + os.system("ps aux | grep -P '.+/Python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill") + elif sys.platform == 'cygwin' or sys.platform == 'win32': + for task in tasksToKillWin: + os.system("taskkill /t /f /im " + task) + elif sys.platform.startswith('linux'): + for task in taskToKillUnix: + os.system("killall -9 -v " + task) + os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill") + else: + sys.exit() + # FIXME: Should we return an exit code based on how the kills went? + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 717e420..011dffb 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,13 @@ +2013-01-11 Ryosuke Niwa + + Try CRLF to LF change in r139407 again. + + * BuildSlaveSupport/delete-stale-build-files: + (main): + (webkitBuildDirectory): + * BuildSlaveSupport/kill-old-processes: + (main): + 2013-01-11 Carlos Garcia Campos [GTK] Disable the unit tests timeout when running from make check