Title: [165284] trunk/Tools
Revision
165284
Author
[email protected]
Date
2014-03-07 13:32:51 -0800 (Fri, 07 Mar 2014)

Log Message

REGRESSION(165267): Broke a webkitpy unit tests
https://bugs.webkit.org/show_bug.cgi?id=129904

Reviewed by Jon Honeycutt.

* Scripts/webkitpy/port/gtk.py: Flip the default test to assume CMake by default.
(GtkPort._is_cmake_build):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (165283 => 165284)


--- trunk/Tools/ChangeLog	2014-03-07 21:30:52 UTC (rev 165283)
+++ trunk/Tools/ChangeLog	2014-03-07 21:32:51 UTC (rev 165284)
@@ -1,3 +1,13 @@
+2014-03-07  Martin Robinson  <[email protected]>
+
+        REGRESSION(165267): Broke a webkitpy unit tests
+        https://bugs.webkit.org/show_bug.cgi?id=129904
+
+        Reviewed by Jon Honeycutt.
+
+        * Scripts/webkitpy/port/gtk.py: Flip the default test to assume CMake by default.
+        (GtkPort._is_cmake_build):
+
 2014-03-07  Andres Gomez  <[email protected]>
 
         [GTK] webkit-patch setup-git-clone fails even after running Tools/gtk/install-dependencies

Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (165283 => 165284)


--- trunk/Tools/Scripts/webkitpy/port/gtk.py	2014-03-07 21:30:52 UTC (rev 165283)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py	2014-03-07 21:32:51 UTC (rev 165284)
@@ -54,7 +54,9 @@
                 raise ValueError('use --wrapper=\"valgrind\" for memory leak detection on GTK')
 
     def _is_cmake_build(self):
-        return os.path.exists(self._build_path('CMakeCache.txt'))
+        # Look for the autotools config.log file, which means that we
+        # assume a CMake build (--gtk) when lacking evidence of either.
+        return not os.path.exists(self._build_path('config.log'))
 
     def _built_executables_path(self, *path):
         if self._is_cmake_build():
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to