[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1348a8d3a5c90b74c8bcf52de725740359938ba8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 08:57:31 2009 +0000

    2009-12-15  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            scm_unittest.py is too slow
            https://bugs.webkit.org/show_bug.cgi?id=31818
    
            Now we don't run the SCM unit tests unless we get the --all flag on the
            command line.  Eric and I were commenting out this test because it was
            too painful to run.
    
            * Scripts/run-webkit-unittests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52142 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6e66650..833d9cb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-15  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        scm_unittest.py is too slow
+        https://bugs.webkit.org/show_bug.cgi?id=31818
+
+        Now we don't run the SCM unit tests unless we get the --all flag on the
+        command line.  Eric and I were commenting out this test because it was
+        too painful to run.
+
+        * Scripts/run-webkit-unittests:
+
 2009-12-14  Adam Barth  <abarth at webkit.org>
 
         Unreviewed.  Fix failing unittest.
diff --git a/WebKitTools/Scripts/run-webkit-unittests b/WebKitTools/Scripts/run-webkit-unittests
index 5459168..403f987 100755
--- a/WebKitTools/Scripts/run-webkit-unittests
+++ b/WebKitTools/Scripts/run-webkit-unittests
@@ -27,6 +27,7 @@
 # (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 sys
 import unittest
 
 from modules.bugzilla_unittest import *
@@ -42,9 +43,14 @@ from modules.cpp_style_unittest import *
 from modules.diff_parser_unittest import *
 from modules.logging_unittest import *
 from modules.multicommandtool_unittest import *
-from modules.scm_unittest import *
 from modules.webkitport_unittest import *
 from modules.workqueue_unittest import *
 
 if __name__ == "__main__":
+    # FIXME: This is a hack, but I'm tired of commenting out the test.
+    #        See https://bugs.webkit.org/show_bug.cgi?id=31818
+    if len(sys.argv) > 1 and sys.argv[1] == "--all":
+        sys.argv.remove("--all")
+        from modules.scm_unittest import *
+
     unittest.main()

-- 
WebKit Debian packaging