Title: [185523] trunk/Websites/perf.webkit.org
- Revision
- 185523
- Author
- [email protected]
- Date
- 2015-06-12 15:49:21 -0700 (Fri, 12 Jun 2015)
Log Message
Unreviewed build fix for merging platforms.
* public/admin/platforms.php:
Modified Paths
Diff
Modified: trunk/Websites/perf.webkit.org/ChangeLog (185522 => 185523)
--- trunk/Websites/perf.webkit.org/ChangeLog 2015-06-12 22:08:46 UTC (rev 185522)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-06-12 22:49:21 UTC (rev 185523)
@@ -1,3 +1,9 @@
+2015-06-12 Ryosuke Niwa <[email protected]>
+
+ Unreviewed build fix for merging platforms.
+
+ * public/admin/platforms.php:
+
2015-06-09 Ryosuke Niwa <[email protected]>
Unreviewed build fix. Some builder names are really long.
Modified: trunk/Websites/perf.webkit.org/public/admin/platforms.php (185522 => 185523)
--- trunk/Websites/perf.webkit.org/public/admin/platforms.php 2015-06-12 22:08:46 UTC (rev 185522)
+++ trunk/Websites/perf.webkit.org/public/admin/platforms.php 2015-06-12 22:49:21 UTC (rev 185523)
@@ -9,12 +9,12 @@
// First, move all test runs to the test configurations in the destination for all test configurations that
// 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
+ 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
AND destination.config_type = merged.config_type
- AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform))) {
+ AND destination.config_metric = merged.config_metric', array($platform_to_merge, $destination_platform)) === FALSE) {
$db->rollback_transaction();
return notice("Failed to migrate test runs for $platform_to_merge that have test configurations in $destination_platform.");
}
@@ -35,6 +35,21 @@
return notice('Failed to migrate all test runs.');
}
+ if ($db->query_and_get_affected_rows('UPDATE analysis_tasks SET task_platform = $1 WHERE task_platform = $2',
+ array($destination_platform, $platform_to_merge)) === FALSE) {
+ $db->rollback_transaction();
+ return notice('Failed to migrate analysis tasks.');
+ }
+
+ $db->query_and_get_affected_rows('DELETE FROM triggerable_configurations WHERE trigconfig_platform = $1',
+ array($platform_to_merge));
+
+ if ($db->query_and_get_affected_rows('UPDATE build_requests SET request_platform = $1 WHERE request_platform = $2',
+ array($destination_platform, $platform_to_merge)) === FALSE) {
+ $db->rollback_transaction();
+ return notice('Failed to migrate build requests.');
+ }
+
$db->query_and_get_affected_rows('DELETE FROM platforms WHERE platform_id = $1', array($platform_to_merge));
$db->commit_transaction();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
