Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Sun 9/5/10 11:56
Recent Commits
>
--git a/pts-core/library/pts-includes-merge.php b/pts-core/library/pts-includes-merge.php
index 04cf39a..b681145 100644
--- a/pts-core/library/pts-includes-merge.php
+++ b/pts-core/library/pts-includes-merge.php
@@ -32,10 +32,16 @@ function pts_merge_test_results()
$files_to_combine = $files_to_combine[0];
}
- $results = new tandem_XmlWriter();
+ $results_xml = new tandem_XmlWriter();
+ pts_merge_test_results_process($results_xml, $files_to_combine);
+
+ return $results_xml->getXML();
+}
+function pts_merge_test_results_process(&$results_xml, &$files_to_combine)
+{
$test_result_manager = new pts_result_file_merge_manager();
- $results->setXslBinding("pts-results-viewer.xsl");
+ $results_xml->setXslBinding("pts-results-viewer.xsl");
$has_written_suite_info = false;
$added_systems_hash = array();
@@ -72,20 +78,18 @@ function pts_merge_test_results()
{
if($has_written_suite_info == false)
{
- pts_result_file_suite_info_to_xml($this_result_file, $results);
+ pts_result_file_suite_info_to_xml($this_result_file, $results_xml);
$has_written_suite_info = true;
}
- pts_result_file_system_info_to_xml($this_result_file, $results, $added_systems_hash, $result_merge_select);
+ pts_result_file_system_info_to_xml($this_result_file, $results_xml, $added_systems_hash, $result_merge_select);
}
$test_result_manager->add_test_result_set($this_result_file->get_result_objects(), $result_merge_select);
}
// Write the actual test results
- pts_result_file_results_to_xml($test_result_manager, $results);
-
- return $results->getXML();
+ pts_result_file_results_to_xml($test_result_manager, $results_xml);
}
function pts_generate_analytical_batch_xml($analyze_file)
{
diff --git a/pts-core/options/gui_gtk.php b/pts-core/options/gui_gtk.php
index 11119df..1da6be7 100644
--- a/pts-core/options/gui_gtk.php
+++ b/pts-core/options/gui_gtk.php
@@ -76,7 +76,7 @@ class gui_gtk implements pts_option_interface
}
public static function startup_tasks()
{
- if(!define("GUI_GTK_STARTUP_TASKS", true))
+ if(defined("GUI_GTK_STARTUP_TASKS") || !define("GUI_GTK_STARTUP_TASKS", true))
{
return;
}
<
Copyright © 2010 by Phoronix Media