Changeset 180019 in webkit

Timestamp:

Feb 12, 2015, 3:10:30 PM (11 years ago)

Author:

Brent Fulgham

Message:

Merge r179996 to correct test system failures.

2015-02-12 Brent Fulgham <Brent Fulgham>

[Win] Test bot infrastructure should not try to find/use old Safari DLLs
​https://bugs.webkit.org/show_bug.cgi?id=141517

Reviewed by Anders Carlsson.

We do not need to locate or use the DLL's that came with Safari, so stop
failing when we cannot find them. Also remove some old Qt cruft from this
script.

• BuildSlaveSupport/built-product-archive: (archiveBuiltProduct): (extractBuiltProduct):

Location:

branches/safari-600.5-branch/Tools

Files:

• BuildSlaveSupport/built-product-archive (modified) (5 diffs)
• ChangeLog (modified) (1 diff)

branches/safari-600.5-branch/Tools/BuildSlaveSupport/built-product-archive

@@ -1 +1 @@
 #!/usr/bin/python
 
-# Copyright (C) 2009 Apple Inc.  All rights reserved.
+# Copyright (C) 2009, 2015 Apple Inc.  All rights reserved.
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
@@ -114 +114 @@
 
 def archiveBuiltProduct(configuration, platform, fullPlatform):
-    assert platform in ('mac', 'win', 'qt', 'gtk', 'efl')
+    assert platform in ('mac', 'win', 'gtk', 'efl')
 
     configurationBuildDirectory = os.path.join(_buildDirectory, configuration.title())
@@ -132 +132 @@
         shutil.rmtree(thinDirectory)
 
-    elif platform == 'qt' or platform == 'gtk' or platform == 'efl':
+    elif platform == 'gtk' or platform == 'efl':
         thinDirectory = os.path.join(configurationBuildDirectory, "thin")
 
@@ -182 +182 @@
 
 def extractBuiltProduct(configuration, platform):
-    assert platform in ('mac', 'win', 'qt', 'gtk', 'efl')
+    assert platform in ('mac', 'win', 'gtk', 'efl')
 
     archiveFile = os.path.join(_buildDirectory, configuration + ".zip")
@@ -192 +192 @@
     if platform == 'mac':
         return unzipArchive(_buildDirectory, configuration)
-    elif platform == 'win':
-        binDirectory = os.path.join(configurationBuildDirectory, "bin32")
-        os.makedirs(binDirectory)
-
-        safariPath = subprocess.Popen('cygpath -w "$PROGRAMFILES"/Safari',
-                                      shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
-
-        if subprocess.call('cp -R "%s"/*.dll "%s"/*.resources %s' % (safariPath, safariPath, binDirectory), shell=True):
-            return 1
-
-        return unzipArchive(configurationBuildDirectory, configuration)
-    elif platform == 'qt' or platform == 'gtk' or platform == 'efl':
+    elif platform == 'win' or platform == 'gtk' or platform == 'efl':
         print "Extracting", configurationBuildDirectory
         return unzipArchive(configurationBuildDirectory, configuration)

branches/safari-600.5-branch/Tools/ChangeLog

@@ +1 @@
+2015-02-12  Brent Fulgham  <bfulgham@apple.com>
+
+        Merge r179996 to correct test system failures.
+
+    2015-02-12  Brent Fulgham  <bfulgham@apple.com>
+
+            [Win] Test bot infrastructure should not try to find/use old Safari DLLs
+            https://bugs.webkit.org/show_bug.cgi?id=141517
+
+            Reviewed by Anders Carlsson.
+
+            We do not need to locate or use the DLL's that came with Safari, so stop
+            failing when we cannot find them. Also remove some old Qt cruft from this
+            script.
+
+            * BuildSlaveSupport/built-product-archive:
+            (archiveBuiltProduct): 
+            (extractBuiltProduct):
+
 2015-02-12  Brent Fulgham  <bfulgham@apple.com>