Title: [134824] trunk/Tools
- Revision
- 134824
- Author
- [email protected]
- Date
- 2012-11-15 13:25:54 -0800 (Thu, 15 Nov 2012)
Log Message
Make old-run-webkit-tests handle setting the results directory properly.
https://bugs.webkit.org/show_bug.cgi?id=102273
<rdar://problem/11571607>
Reviewed by Timothy Horton.
A call to chdirWebkit in old-run-webkit-tests set the current working directory to the OpenSource folder.
Thus setting --results-directory to OpenSource/layout-test-results would create OpenSource/layout-test-results inside the main OpenSource folder.
This caused many other problems including failure to upload test results and failed future test runs.
The solution is to save the current working directory before calling chdirWebKit and then reconstructing the full path to the results directory
using the saved directory when setting $testResultsDirectory.
* Scripts/old-run-webkit-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (134823 => 134824)
--- trunk/Tools/ChangeLog 2012-11-15 20:58:05 UTC (rev 134823)
+++ trunk/Tools/ChangeLog 2012-11-15 21:25:54 UTC (rev 134824)
@@ -1,3 +1,19 @@
+2012-11-15 Roger Fong <[email protected]>
+
+ Make old-run-webkit-tests handle setting the results directory properly.
+ https://bugs.webkit.org/show_bug.cgi?id=102273
+ <rdar://problem/11571607>
+
+ Reviewed by Timothy Horton.
+
+ A call to chdirWebkit in old-run-webkit-tests set the current working directory to the OpenSource folder.
+ Thus setting --results-directory to OpenSource/layout-test-results would create OpenSource/layout-test-results inside the main OpenSource folder.
+ This caused many other problems including failure to upload test results and failed future test runs.
+ The solution is to save the current working directory before calling chdirWebKit and then reconstructing the full path to the results directory
+ using the saved directory when setting $testResultsDirectory.
+
+ * Scripts/old-run-webkit-tests:
+
2012-11-15 Sheriff Bot <[email protected]>
Unreviewed, rolling out r134800 and r134805.
Modified: trunk/Tools/Scripts/old-run-webkit-tests (134823 => 134824)
--- trunk/Tools/Scripts/old-run-webkit-tests 2012-11-15 20:58:05 UTC (rev 134823)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2012-11-15 21:25:54 UTC (rev 134824)
@@ -423,6 +423,8 @@
$productDir .= "/bin" if isQt();
$productDir .= "/Programs" if isGtk();
+# Save the current directory before chaging it via chdirWebKit
+my $currentDir = cwd();
chdirWebKit();
if (!defined($root) && !$noBuildDumpTool) {
@@ -467,7 +469,7 @@
$expectedDirectory = $ENV{"WebKitExpectedTestResultsDirectory"} if $ENV{"WebKitExpectedTestResultsDirectory"};
-$testResultsDirectory = File::Spec->rel2abs($testResultsDirectory);
+$testResultsDirectory = File::Spec->catfile($currentDir, $testResultsDirectory);
# $testResultsDirectory must be empty before testing.
rmtree $testResultsDirectory;
my $testResults = File::Spec->catfile($testResultsDirectory, "results.html");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
