Changeset 141530 in webkit


Ignore:
Timestamp:
Jan 31, 2013 8:01:57 PM (11 years ago)
Author:
rniwa@webkit.org
Message:

buildbot should not rely on webkitpy
​https://bugs.webkit.org/show_bug.cgi?id=107379

Reviewed by Eric Seidel.

Move all Python files used in buildbot configuration into BuildSlaveSupport directory.
Once this patch is landed, we can stop restarting the master on webkitpy changes.

  • BuildSlaveSupport/build.webkit.org-config/committer_auth.py:
  • BuildSlaveSupport/build.webkit.org-config/htdigestparser.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser.py.
  • BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser_unittest.py.
  • BuildSlaveSupport/build.webkit.org-config/master.cfg:
  • BuildSlaveSupport/build.webkit.org-config/wkbuild.py: Copied from Tools/Scripts/webkitpy/common/config/build.py.
  • BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py: Copied from Tools/Scripts/webkitpy/common/config/build_unittest.py.

(ShouldBuildTest.test_should_build):

  • Scripts/webkitpy/common/config/build.py: Removed.
  • Scripts/webkitpy/common/config/build_unittest.py: Removed.
  • Scripts/webkitpy/common/net/htdigestparser.py: Removed.
  • Scripts/webkitpy/common/net/htdigestparser_unittest.py: Removed.
Location:
trunk/Tools
Files:
3 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/committer_auth.py

    r101695 r141530  
    2828import zope.interface
    2929
    30 from webkitpy.common.net.htdigestparser import HTDigestParser
     30from htdigestparser import HTDigestParser
    3131
    3232

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py

    r140468 r141530  
    2323import StringIO
    2424import os
    25 import unittest
     25import unittest2 as unittest
    2626
    27 from webkitpy.common.net.htdigestparser import HTDigestParser
     27from htdigestparser import HTDigestParser
    2828
    2929
    … …  
    8181user3:realm 3:a05f5a2335e9d87bbe75bbe5e53248f0
    8282""")
     83
     84
     85# FIXME: We should run this file as part of test-rm .
     86# Unfortunately test-rm  currently requires that unittests
     87# be located in a directory with a valid module name.
     88# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
     89# so for now this is a stand-alone test harness.
     90if __name__ == '__main__':
     91    unittest.main()

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

    r139505 r141530  
    2222
    2323from committer_auth import CommitterAuth
    24 from webkitpy.common.config import build as wkbuild
     24import wkbuild
    2525
    2626

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py

    r140468 r141530  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 import unittest
     23import unittest2 as unittest
    2424
    25 from webkitpy.common.config import build
     25import wkbuild
    2626
    2727
    … …  
    6161        for files, platforms in self._should_build_tests:
    6262            # FIXME: We should test more platforms here once
    63             # build._should_file_trigger_build is implemented for them.
     63            # wkbuild._should_file_trigger_build is implemented for them.
    6464            for platform in ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard", "win"]:
    6565                should_build = platform in platforms or "*" in platforms
    66                 self.assertEqual(build.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
     66                self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
     67
     68# FIXME: We should run this file as part of test-rm .
     69# Unfortunately test-rm  currently requires that unittests
     70# be located in a directory with a valid module name.
     71# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
     72# so for now this is a stand-alone test harness.
     73if __name__ == '__main__':
     74    unittest.main()

  • trunk/Tools/ChangeLog

    r141522 r141530  
     12013-01-31  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        buildbot should not rely on webkitpy
     4        https://bugs.webkit.org/show_bug.cgi?id=107379
     5
     6        Reviewed by Eric Seidel.
     7
     8        Move all Python files used in buildbot configuration into BuildSlaveSupport directory.
     9        Once this patch is landed, we can stop restarting the master on webkitpy changes.
     10
     11        * BuildSlaveSupport/build.webkit.org-config/committer_auth.py:
     12        * BuildSlaveSupport/build.webkit.org-config/htdigestparser.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser.py.
     13        * BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser_unittest.py.
     14        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
     15        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py: Copied from Tools/Scripts/webkitpy/common/config/build.py.
     16        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py: Copied from Tools/Scripts/webkitpy/common/config/build_unittest.py.
     17        (ShouldBuildTest.test_should_build):
     18        * Scripts/webkitpy/common/config/build.py: Removed.
     19        * Scripts/webkitpy/common/config/build_unittest.py: Removed.
     20        * Scripts/webkitpy/common/net/htdigestparser.py: Removed.
     21        * Scripts/webkitpy/common/net/htdigestparser_unittest.py: Removed.
     22
    1232013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
    224
Note: See TracChangeset for help on using the changeset viewer.