Title: [151066] trunk/Tools
- Revision
- 151066
- Author
- [email protected]
- Date
- 2013-05-31 21:21:09 -0700 (Fri, 31 May 2013)
Log Message
Unreviewed. Make windows test bots search in the correct directory for build output.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.start):
* Scripts/webkitdirs.pm:
(determineConfigurationProductDir):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (151065 => 151066)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-06-01 03:54:25 UTC (rev 151065)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-06-01 04:21:09 UTC (rev 151066)
@@ -316,7 +316,7 @@
if shouldAbortEarly:
self.setCommand(self.command + ["--exit-after-n-crashes-or-timeouts", "50", "--exit-after-n-failures", "500"])
if platform == "win":
- rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
+ rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin32")]
self.setCommand(self.command + ['--no-build', '--use-remote-links-to-tests'])
else:
rootArgument = ['--root=WebKitBuild/bin']
Modified: trunk/Tools/ChangeLog (151065 => 151066)
--- trunk/Tools/ChangeLog 2013-06-01 03:54:25 UTC (rev 151065)
+++ trunk/Tools/ChangeLog 2013-06-01 04:21:09 UTC (rev 151066)
@@ -1,5 +1,14 @@
2013-05-31 Roger Fong <[email protected]>
+ Unreviewed. Make windows test bots search in the correct directory for build output.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKitTests.start):
+ * Scripts/webkitdirs.pm:
+ (determineConfigurationProductDir):
+
+2013-05-31 Roger Fong <[email protected]>
+
Unreviewed. Windows build fix...
* BuildSlaveSupport/built-product-archive:
Modified: trunk/Tools/Scripts/webkitdirs.pm (151065 => 151066)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-06-01 03:54:25 UTC (rev 151065)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-06-01 04:21:09 UTC (rev 151066)
@@ -472,7 +472,7 @@
determineBaseProductDir();
determineConfiguration();
if (isAppleWinWebKit()) {
- my $binDir = (visualStudioVersion() eq "8") ? "bin" : "bin32";
+ my $binDir = "bin32";
$configurationProductDir = File::Spec->catdir($baseProductDir, configurationForVisualStudio(), $binDir);
} else {
if (usesPerConfigurationBuildDirectory()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
