Title: [173239] trunk/Tools
- Revision
- 173239
- Author
- [email protected]
- Date
- 2014-09-03 15:55:02 -0700 (Wed, 03 Sep 2014)
Log Message
[Win] Unreviewed test fix.
* Scripts/webkitperl/auto-version_unittest/versionStampTests.pl: Don't fail
test if user doesn't have the VersionStamp.exe program.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (173238 => 173239)
--- trunk/Tools/ChangeLog 2014-09-03 22:50:17 UTC (rev 173238)
+++ trunk/Tools/ChangeLog 2014-09-03 22:55:02 UTC (rev 173239)
@@ -1,3 +1,10 @@
+2014-09-03 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed test fix.
+
+ * Scripts/webkitperl/auto-version_unittest/versionStampTests.pl: Don't fail
+ test if user doesn't have the VersionStamp.exe program.
+
2014-09-03 Dana Burkart <[email protected]>
Unreviewed. Add myself as a committer.
Modified: trunk/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl (173238 => 173239)
--- trunk/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-09-03 22:50:17 UTC (rev 173238)
+++ trunk/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-09-03 22:55:02 UTC (rev 173239)
@@ -54,13 +54,20 @@
exit 0;
}
-my $testCasesCount = scalar(@testCases) * 2;
-plan(tests => $testCasesCount);
-
my $TOOLS_PATH = $ENV{'WEBKIT_LIBRARIES'};
my $AUTO_VERSION_SCRIPT = File::Spec->catfile($TOOLS_PATH, 'tools', 'scripts', 'auto-version.pl');
my $VERSION_STAMP_SCRIPT = File::Spec->catfile($TOOLS_PATH, 'tools', 'scripts', 'version-stamp.pl');
+# Test can only be run if VersionStamper.exe exists
+unless (-e $VERSION_STAMP_SCRIPT) {
+ plan(tests => 1);
+ is(1, 1, 'do nothing for Windows builds lacking the VersionStamp.exe utility.');
+ exit 0;
+}
+
+my $testCasesCount = scalar(@testCases) * 2;
+plan(tests => $testCasesCount);
+
foreach my $testCase (@testCases) {
my $testOutputDir = tempdir(CLEANUP => 1);
`RC_ProjectSourceVersion="$testCase->{'RC_ProjectSourceVersion'}" perl $AUTO_VERSION_SCRIPT $testOutputDir`;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
