pts-core: Fix for not writing null test result file titles

CHANGE-LOG

@@ -2,6 +2,8 @@ PHORONIX TEST SUITE CHANGE-LOG
 
 Phoronix Test Suite (Git)
 
+- pts-core: Fix for not writing null test result file titles
+
 Phoronix Test Suite 5.0.1-Plavsk
 2 April 2014
 

pts-core/objects/pts_merge.php

@@ -88,7 +88,15 @@ public static function merge_test_results_process(&$result_file_writer, &$files_
 
 		if(!isset($pass_attributes['only_render_results_xml']) && ($result_file_count = count($result_files)) > 0)
 		{
-			$result_file_writer->add_result_file_meta_data($result_files[($result_file_count - 1)]);
+			for($i = ($result_file_count - 1); $i >= 0; $i--)
+			{
+				$ret = $result_file_writer->add_result_file_meta_data($result_files[$i]);
+
+				if($ret)
+				{
+					break;
+				}
+			}
 		}
 
 		foreach($result_files as $i => &$result_file)

pts-core/objects/pts_result_file_writer.php

@@ -131,7 +131,15 @@ public function add_test_notes($test_notes, $json = null)
 	}
 	public function add_result_file_meta_data(&$object, $reference_id = null, $title = null, $description = null)
 	{
-		$this->xml_writer->addXmlNode('PhoronixTestSuite/Generated/Title', $title != null ? $title : $object->get_title());
+		$title = !empty($title) ? $title : $object->get_title();
+
+		if($title == null)
+		{
+			trigger_error('No title supplied for result file meta-data.', E_USER_WARNING);
+			return false;
+		}
+
+		$this->xml_writer->addXmlNode('PhoronixTestSuite/Generated/Title', $title);
 		$this->xml_writer->addXmlNode('PhoronixTestSuite/Generated/LastModified', date('Y-m-d H:i:s'));
 		$this->xml_writer->addXmlNode('PhoronixTestSuite/Generated/TestClient', pts_title(true));
 		$this->xml_writer->addXmlNode('PhoronixTestSuite/Generated/Description', $description != null ? $description : $object->get_description());