Title: [171331] tags/Safari-600.1.1.1/Tools
- Revision
- 171331
- Author
- [email protected]
- Date
- 2014-07-21 18:14:08 -0700 (Mon, 21 Jul 2014)
Log Message
Merged r171324. <rdar://problem/17750334>
Modified Paths
Diff
Modified: tags/Safari-600.1.1.1/Tools/ChangeLog (171330 => 171331)
--- tags/Safari-600.1.1.1/Tools/ChangeLog 2014-07-22 01:05:33 UTC (rev 171330)
+++ tags/Safari-600.1.1.1/Tools/ChangeLog 2014-07-22 01:14:08 UTC (rev 171331)
@@ -4,6 +4,18 @@
2014-07-21 Brent Fulgham <[email protected]>
+ Unreviewed build fix after r171319.
+
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl: This test should
+ only execute on Windows. It will fail on other platforms, so give it a way to
+ successfully exit.
+
+2014-07-21 Babak Shafiei <[email protected]>
+
+ Merge r171319.
+
+ 2014-07-21 Brent Fulgham <[email protected]>
+
[Win] Extend auto-version.pl to support 5-tuple versions
https://bugs.webkit.org/show_bug.cgi?id=135124
<rdar://problem/17750334>
Modified: tags/Safari-600.1.1.1/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl (171330 => 171331)
--- tags/Safari-600.1.1.1/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-07-22 01:05:33 UTC (rev 171330)
+++ tags/Safari-600.1.1.1/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-07-22 01:14:08 UTC (rev 171331)
@@ -372,6 +372,13 @@
},
);
+# This test should only be run on Windows
+if ($^O ne 'MSWin32') {
+ plan(tests => 1);
+ is(1, 1, 'do nothing for non-Windows builds.');
+ exit 0;
+}
+
my $testCasesCount = scalar(@testCases) * 10; # 10 expected results
plan(tests => $testCasesCount);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
