Changeset 150285 in webkit

Timestamp:

May 17, 2013 12:33:12 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

Add tests for shouldIgnoreLine() in filter-build-webkit
Part 2 of 3: <​http://webkit.org/b/116247>

Reviewed by Benjamin Poulain.

• Scripts/filter-build-webkit:

(shouldIgnoreLine): Add. Extract code from global scope into
subroutine to make it testable.

• Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl: Add.

Tests shouldIgnoreLine() using output from a real build
transcript.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/filter-build-webkit (modified) (3 diffs)
• Scripts/webkitperl/filter-build-webkit_unittest (added)
• Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-17  David Kilzer  <ddkilzer@apple.com>
+
+        Add tests for shouldIgnoreLine() in filter-build-webkit
+        Part 2 of 3: <http://webkit.org/b/116247>
+
+        Reviewed by Benjamin Poulain.
+
+        * Scripts/filter-build-webkit:
+        (shouldIgnoreLine): Add.  Extract code from global scope into
+        subroutine to make it testable.
+        * Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl: Add.
+        Tests shouldIgnoreLine() using output from a real build
+        transcript.
+
 2013-05-17  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/filter-build-webkit

@@ -67 +67 @@
 sub setLogfileOption($$);
 sub setOutputFormatOption($$);
+sub shouldIgnoreLine($);
 sub usageAndExit();
 
@@ -128 +129 @@
     chomp($line);
 
-    next if $line =~ /^\s*$/;
-    next if $line =~ /^Build settings from command line:/;
-    next if $line =~ /make: Nothing to be done for `all'\./;
-    next if $line =~ /^JavaScriptCore\/create_hash_table/;
-    next if $line =~ /JavaScriptCore.framework\/PrivateHeaders\/create_hash_table/;
-    next if $line =~ /^JavaScriptCore\/pcre\/dftables/;
-    next if $line =~ /^Creating hashtable for /;
-    next if $line =~ /^Wrote output to /;
-    next if $line =~ /^(touch|perl|cat|rm -f|bison|flex|python|\/usr\/bin\/g\+\+|gperf|echo|sed|if \[ \-f|WebCore\/generate-export-file) /;
-    next if $line =~ /^UNDOCUMENTED: /;
-    next if $line =~ /libtool.*has no symbols/;
-    next if $line =~ /^# Lower case all the values, as CSS values are case-insensitive$/;
-    next if $line =~ /^if sort /;
-    next if $line =~ /^    /;
-    next if $line =~ /^printf /;
-    next if $line =~ /^offlineasm: Nothing changed/;
-    next if $line =~ /^Showing first/;
+    next if shouldIgnoreLine($line);
 
     if ($line =~ /^={10}/) {
@@ -226 +211 @@
     $outputFormat = $value;
 }
+
+sub shouldIgnoreLine($)
+{
+    my ($line) = @_;
+
+    return 1 if $line =~ /^\s*$/;
+    return 1 if $line =~ /^Build settings from command line:/;
+    return 1 if $line =~ /make: Nothing to be done for `all'\./;
+    return 1 if $line =~ /^JavaScriptCore\/create_hash_table/;
+    return 1 if $line =~ /JavaScriptCore.framework\/PrivateHeaders\/create_hash_table/;
+    return 1 if $line =~ /^JavaScriptCore\/pcre\/dftables/;
+    return 1 if $line =~ /^Creating hashtable for /;
+    return 1 if $line =~ /^Wrote output to /;
+    return 1 if $line =~ /^(touch|perl|cat|rm -f|bison|flex|python|\/usr\/bin\/g\+\+|gperf|echo|sed|if \[ \-f|WebCore\/generate-export-file) /;
+    return 1 if $line =~ /^UNDOCUMENTED: /;
+    return 1 if $line =~ /libtool.*has no symbols/;
+    return 1 if $line =~ /^# Lower case all the values, as CSS values are case-insensitive$/;
+    return 1 if $line =~ /^if sort /;
+    return 1 if $line =~ /^    /;
+    return 1 if $line =~ /^printf /;
+    return 1 if $line =~ /^offlineasm: Nothing changed/;
+    return 1 if $line =~ /^Showing first/;
+
+    return 0;
+}