diff options
| -rw-r--r-- | TYDAL-CHANGE-LOG | 1 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions-install.php | 11 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions-run.php | 6 | ||||
| -rw-r--r-- | pts-core/functions/pts-interfaces.php | 1 |
4 files changed, 4 insertions, 15 deletions
diff --git a/TYDAL-CHANGE-LOG b/TYDAL-CHANGE-LOG index 37be94b..32f0b89 100644 --- a/TYDAL-CHANGE-LOG +++ b/TYDAL-CHANGE-LOG @@ -29,3 +29,4 @@ Phoronix Test Suite (Git) - pts-core: Add "null" to hal-values-remove.txt - pts-core: Only install external dependencies for tests that are supported on the system (such as with platform and architecture limitations) - pts-core: Fix for URL empty bug (reported by Stef Telford and Bene18) +- pts-core: Drop ArgumentName profile tag code that's been deprecated since PTS 1.4+ in favor of ArgumentPrefix diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php index 5de45d2..a5be82a 100644 --- a/pts-core/functions/pts-functions-install.php +++ b/pts-core/functions/pts-functions-install.php @@ -316,16 +316,11 @@ function pts_install_test($identifier) else { // TODO: clean up validate-install and put in pts_validate_test_install - $custom_validated_output = pts_call_test_script($identifier, "validate-install", "\nValidating Installation...\n", TEST_ENV_DIR . $identifier . "/", pts_run_additional_vars($identifier), false); + $custom_validated_output = trim(pts_call_test_script($identifier, "validate-install", "\nValidating Installation...\n", TEST_ENV_DIR . $identifier . "/", pts_run_additional_vars($identifier), false)); - if(!empty($custom_validated_output)) + if(!empty($custom_validated_output) && !pts_string_bool($custom_validated_output)) { - $custom_validated_output = trim($custom_validated_output); - - if(!pts_string_bool($custom_validated_output)) - { - $installed = false; - } + $installed = false; } else { diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php index 65b12d8..dcf360b 100644 --- a/pts-core/functions/pts-functions-run.php +++ b/pts-core/functions/pts-functions-run.php @@ -775,7 +775,6 @@ function pts_test_options($identifier) { $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); $settings_name = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_DISPLAYNAME); - $settings_argument = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_ARGUMENTNAME); // TODO: Use of ArgumentName has been deprecated in PTS 1.4+ $settings_argument_prefix = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_ARGPREFIX); $settings_argument_postfix = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_ARGPOSTFIX); $settings_identifier = $xml_parser->getXMLArrayValues(P_TEST_OPTIONS_IDENTIFIER); @@ -793,11 +792,6 @@ function pts_test_options($identifier) $user_option = new pts_test_option($settings_identifier[$option_count], $settings_name[$option_count]); $prefix = $settings_argument_prefix[$option_count]; - if(empty($prefix)) // Backwards compatibility - { - $prefix = $settings_argument[$option_count]; // Drop this when ArgumentName has been removed from PTS entirely - } - $user_option->set_option_prefix($prefix); $user_option->set_option_postfix($settings_argument_postfix[$option_count]); diff --git a/pts-core/functions/pts-interfaces.php b/pts-core/functions/pts-interfaces.php index 4f67198..147971a 100644 --- a/pts-core/functions/pts-interfaces.php +++ b/pts-core/functions/pts-interfaces.php @@ -62,7 +62,6 @@ define("P_TEST_SUPPORTS_COREVERSION", "PhoronixTestSuite/TestProfile/RequiresCor define("P_TEST_DEFAULTARGUMENTS", "PhoronixTestSuite/TestSettings/Default/Arguments"); // Default arguments define("P_TEST_POSSIBLEPATHS", "PhoronixTestSuite/TestSettings/Default/PossiblePaths"); // Possible paths define("P_TEST_OPTIONS_DISPLAYNAME", "PhoronixTestSuite/TestSettings/Option/DisplayName"); // The option names to show to the end-user -define("P_TEST_OPTIONS_ARGUMENTNAME", "PhoronixTestSuite/TestSettings/Option/ArgumentName"); // TODO: This option has been deprecated in Phoronix Test Suite 1.4. Switch to ArgumentPrefix instead. define("P_TEST_OPTIONS_ARGPREFIX", "PhoronixTestSuite/TestSettings/Option/ArgumentPrefix"); // The option argument prefix define("P_TEST_OPTIONS_ARGPOSTFIX", "PhoronixTestSuite/TestSettings/Option/ArgumentPostfix"); // The option argument postfix define("P_TEST_OPTIONS_IDENTIFIER", "PhoronixTestSuite/TestSettings/Option/Identifier"); // Identifiers for each option |