Title: [171818] trunk/Websites/perf.webkit.org
- Revision
- 171818
- Author
- [email protected]
- Date
- 2014-07-30 14:34:51 -0700 (Wed, 30 Jul 2014)
Log Message
Merging platforms mixes baselines and targets into reported data
https://bugs.webkit.org/show_bug.cgi?id=135260
Reviewed by Geoffrey Garen.
Make sure two test configurations we're merging are of the same type (e.g. baseline, target, current).
Otherwise, we'll erroneously mix up runs for baseline, target, and current (reported values).
* public/admin/platforms.php:
Modified Paths
Diff
Modified: trunk/Websites/perf.webkit.org/ChangeLog (171817 => 171818)
--- trunk/Websites/perf.webkit.org/ChangeLog 2014-07-30 21:28:03 UTC (rev 171817)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2014-07-30 21:34:51 UTC (rev 171818)
@@ -1,3 +1,15 @@
+2014-07-30 Ryosuke Niwa <[email protected]>
+
+ Merging platforms mixes baselines and targets into reported data
+ https://bugs.webkit.org/show_bug.cgi?id=135260
+
+ Reviewed by Geoffrey Garen.
+
+ Make sure two test configurations we're merging are of the same type (e.g. baseline, target, current).
+ Otherwise, we'll erroneously mix up runs for baseline, target, and current (reported values).
+
+ * public/admin/platforms.php:
+
2014-07-23 Ryosuke Niwa <[email protected]>
Build fix after r171361.
Modified: trunk/Websites/perf.webkit.org/public/admin/platforms.php (171817 => 171818)
--- trunk/Websites/perf.webkit.org/public/admin/platforms.php 2014-07-30 21:28:03 UTC (rev 171817)
+++ trunk/Websites/perf.webkit.org/public/admin/platforms.php 2014-07-30 21:34:51 UTC (rev 171818)
@@ -11,7 +11,9 @@
// exist in both the original platform and the platform into which we're merging.
if (!$db->query_and_get_affected_rows('UPDATE test_runs SET run_config = destination.config_id
FROM test_configurations as merged, test_configurations as destination
- WHERE merged.config_platform = $1 AND destination.config_platform = $2 AND run_config = merged.config_id
+ WHERE merged.config_platform = $1 AND destination.config_platform = $2
+ AND run_config = merged.config_id
+ AND destination.config_type = merged.config_type
AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform))) {
$db->rollback_transaction();
return notice("Failed to migrate test runs for $platform_to_merge that have test configurations in $destination_platform.");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
