diff options
-rw-r--r-- | CHANGE-LOG | 1 | ||||
-rw-r--r-- | pts-core/functions/pts-functions-install.php | 2 | ||||
-rw-r--r-- | pts-core/functions/pts-functions-install_dependencies.php | 2 | ||||
-rw-r--r-- | pts-core/functions/pts-functions-run.php | 6 | ||||
-rw-r--r-- | pts-core/functions/pts-functions_shell.php | 4 | ||||
-rw-r--r-- | pts-core/functions/pts-functions_tests.php | 12 | ||||
-rw-r--r-- | pts-core/functions/pts-functions_types.php | 4 | ||||
-rw-r--r-- | pts-core/objects/pts_installed_test_details.php | 2 | ||||
-rw-r--r-- | pts-core/objects/pts_test_profile_details.php | 2 | ||||
-rw-r--r-- | pts-core/objects/tandem_Xml/pts_test_tandem_XmlReader.php | 9 | ||||
-rw-r--r-- | pts-core/options/run_test.php | 6 |
11 files changed, 30 insertions, 20 deletions
@@ -6,6 +6,7 @@ Phoronix Test Suite (Git) - pts-core: Verify Attributes tag matches (instead of just the Arguments tag) when merging results - pts-core: Don't sort current test identifiers when being prompted to enter a new identifier - pts-core: Add Mode tag to suite XML specification for allowing individual tests within a suite to be run in the batch or defaults mode +- pts-core: Embed pts_location_test() into constructor of pts_test_tandem_XmlReader() - pts: Add more tests to netbook suite Phoronix Test Suite 1.6.0 Alpha 3 diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php index 0660394..ba36399 100644 --- a/pts-core/functions/pts-functions-install.php +++ b/pts-core/functions/pts-functions-install.php @@ -420,7 +420,7 @@ function pts_install_test($identifier) return false; } - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $pre_install_message = $xml_parser->getXMLValue(P_TEST_PREINSTALLMSG); $post_install_message = $xml_parser->getXMLValue(P_TEST_POSTINSTALLMSG); diff --git a/pts-core/functions/pts-functions-install_dependencies.php b/pts-core/functions/pts-functions-install_dependencies.php index 6665099..562c91d 100644 --- a/pts-core/functions/pts-functions-install_dependencies.php +++ b/pts-core/functions/pts-functions-install_dependencies.php @@ -113,7 +113,7 @@ function pts_install_external_dependencies_list($identifier, &$INSTALL_OBJ) return; } - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $title = $xml_parser->getXMLValue(P_TEST_TITLE); $dependencies = $xml_parser->getXMLValue(P_TEST_EXDEP); diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php index 5489189..89d8f56 100644 --- a/pts-core/functions/pts-functions-run.php +++ b/pts-core/functions/pts-functions-run.php @@ -141,7 +141,7 @@ function pts_prompt_svg_result_options($svg_file) } function pts_prompt_test_options($identifier) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $test_title = $xml_parser->getXMLValue(P_TEST_TITLE); $USER_ARGS = ""; @@ -754,7 +754,7 @@ function pts_run_test($test_identifier, $extra_arguments = "", $arguments_descri pts_process_register($test_identifier); $test_directory = TEST_ENV_DIR . $test_identifier . "/"; - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($test_identifier)); + $xml_parser = new pts_test_tandem_XmlReader($test_identifier); $execute_binary = $xml_parser->getXMLValue(P_TEST_EXECUTABLE); $test_title = $xml_parser->getXMLValue(P_TEST_TITLE); $test_version = $xml_parser->getXMLValue(P_TEST_VERSION); @@ -1195,7 +1195,7 @@ function pts_auto_process_test_option($identifier, &$option_names, &$option_valu } function pts_test_options($identifier) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $settings_name = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_DISPLAYNAME); $settings_argument_prefix = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_ARGPREFIX); $settings_argument_postfix = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_ARGPOSTFIX); diff --git a/pts-core/functions/pts-functions_shell.php b/pts-core/functions/pts-functions_shell.php index 5446bbb..ae54a28 100644 --- a/pts-core/functions/pts-functions_shell.php +++ b/pts-core/functions/pts-functions_shell.php @@ -90,13 +90,13 @@ function pts_remove($object, $ignore_files = null) } else { - return unlink($object); + return @unlink($object); } } if(is_dir($object)) { - $directory = dir($object); + $directory = @dir($object); while(($entry = $directory->read()) !== false) { if($entry != "." && $entry != "..") diff --git a/pts-core/functions/pts-functions_tests.php b/pts-core/functions/pts-functions_tests.php index a04fab2..d7e5b82 100644 --- a/pts-core/functions/pts-functions_tests.php +++ b/pts-core/functions/pts-functions_tests.php @@ -315,7 +315,7 @@ function pts_test_profile_version($identifier) if(pts_is_test($identifier)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $version = $xml_parser->getXMLValue(P_TEST_PTSVERSION); } @@ -425,7 +425,7 @@ function pts_test_identifier_to_name($identifier) if(!empty($identifier) && pts_is_test($identifier)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $name = $xml_parser->getXMLValue(P_TEST_TITLE); } @@ -453,7 +453,7 @@ function pts_test_estimated_environment_size($identifier) foreach(pts_contained_tests($identifier, true) as $test) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $this_size = $xml_parser->getXMLValue(P_TEST_ENVIRONMENTSIZE); if(!empty($this_size) && is_numeric($this_size)) @@ -471,7 +471,7 @@ function pts_test_architecture_supported($identifier) if(pts_is_test($identifier)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $archs = $xml_parser->getXMLValue(P_TEST_SUPPORTEDARCHS); if(!empty($archs)) @@ -496,7 +496,7 @@ function pts_test_platform_supported($identifier) if(pts_is_test($identifier)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $platforms = $xml_parser->getXMLValue(P_TEST_SUPPORTEDPLATFORMS); $un_platforms = $xml_parser->getXMLValue(P_TEST_UNSUPPORTEDPLATFORMS); @@ -542,7 +542,7 @@ function pts_test_version_supported($identifier) if(pts_is_test($identifier)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $requires_core_version = $xml_parser->getXMLValue(P_TEST_SUPPORTS_COREVERSION); $supported = pts_test_version_compatible($requires_core_version); diff --git a/pts-core/functions/pts-functions_types.php b/pts-core/functions/pts-functions_types.php index 0bf183a..2822c89 100644 --- a/pts-core/functions/pts-functions_types.php +++ b/pts-core/functions/pts-functions_types.php @@ -263,7 +263,7 @@ function pts_test_extends_below($object) { if(pts_is_test($test_extends)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($test_extends)); + $xml_parser = new pts_test_tandem_XmlReader($test_extends); $test_extends = $xml_parser->getXMLValue(P_TEST_CTPEXTENDS); if(!empty($test_extends)) @@ -378,7 +378,7 @@ function pts_virtual_suite_tests($object) case TYPE_VIRT_SUITE_SUBSYSTEM: foreach(pts_available_tests_array() as $test) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($test)); + $xml_parser = new pts_test_tandem_XmlReader($test); $type = $xml_parser->getXMLValue(P_TEST_HARDWARE_TYPE); if(strtolower($type) == $object && pts_test_supported($test)) diff --git a/pts-core/objects/pts_installed_test_details.php b/pts-core/objects/pts_installed_test_details.php index 5cf1278..4b20b59 100644 --- a/pts-core/objects/pts_installed_test_details.php +++ b/pts-core/objects/pts_installed_test_details.php @@ -27,7 +27,7 @@ class pts_installed_test_details public function __construct($identifier) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $this->identifier = $identifier; $this->name = $xml_parser->getXMLValue(P_TEST_TITLE); } diff --git a/pts-core/objects/pts_test_profile_details.php b/pts-core/objects/pts_test_profile_details.php index 4aeefa2..77bd725 100644 --- a/pts-core/objects/pts_test_profile_details.php +++ b/pts-core/objects/pts_test_profile_details.php @@ -42,7 +42,7 @@ class pts_test_profile_details public function __construct($identifier) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); + $xml_parser = new pts_test_tandem_XmlReader($identifier); $this->identifier = $identifier; $this->name = $xml_parser->getXMLValue(P_TEST_TITLE); $this->license = $xml_parser->getXMLValue(P_TEST_LICENSE); diff --git a/pts-core/objects/tandem_Xml/pts_test_tandem_XmlReader.php b/pts-core/objects/tandem_Xml/pts_test_tandem_XmlReader.php index 096b356..deba18b 100644 --- a/pts-core/objects/tandem_Xml/pts_test_tandem_XmlReader.php +++ b/pts-core/objects/tandem_Xml/pts_test_tandem_XmlReader.php @@ -26,6 +26,15 @@ class pts_test_tandem_XmlReader extends tandem_XmlReader { + public function __construct($read_xml, $cache_support = true) + { + if(!is_file($read_xml) || substr($read_xml, -3) != "xml") + { + $read_xml = pts_location_test($read_xml); + } + + parent::__construct($read_xml, $cache_support); + } function handleXmlZeroTagFallback($xml_tag) { // Cascading Test Profiles for finding a tag within an XML file being extended by another XML file diff --git a/pts-core/options/run_test.php b/pts-core/options/run_test.php index 6c3561d..21e8fdc 100644 --- a/pts-core/options/run_test.php +++ b/pts-core/options/run_test.php @@ -61,7 +61,7 @@ class run_test implements pts_option_interface if(pts_is_test($lower_identifier)) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($lower_identifier)); + $xml_parser = new pts_test_tandem_XmlReader($lower_identifier); $test_title = $xml_parser->getXMLValue(P_TEST_TITLE); if(empty($test_title)) @@ -141,7 +141,7 @@ class run_test implements pts_option_interface { if(pts_is_test($to_run) && !pts_is_assignment("RUN_CONTAINS_A_NO_RESULT_TYPE")) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($to_run)); + $xml_parser = new pts_test_tandem_XmlReader($to_run); $result_format = $xml_parser->getXMLValue(P_TEST_RESULTFORMAT); if($result_format == "NO_RESULT") @@ -191,7 +191,7 @@ class run_test implements pts_option_interface if($unique_test_names == 1) { - $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($to_run)); + $xml_parser = new pts_test_tandem_XmlReader($to_run); $test_description = $xml_parser->getXMLValue(P_TEST_DESCRIPTION); $test_version = $xml_parser->getXMLValue(P_TEST_PTSVERSION); $test_type = $xml_parser->getXMLValue(P_TEST_HARDWARE_TYPE); |