summaryrefslogtreecommitdiffstats
path: root/pts-core
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-11 12:06:54 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-11 12:06:54 -0500
commitf4d3b24bfac3f4e015fec41a19e4297a34050d07 (patch)
tree18834cb51e800bf031990c5e636813e61daecadc /pts-core
parentf99aac76617d267aed15b365bc6ac9ac2b35525b (diff)
downloadphoronix-test-suite-upstream-f4d3b24bfac3f4e015fec41a19e4297a34050d07.tar.gz
phoronix-test-suite-upstream-f4d3b24bfac3f4e015fec41a19e4297a34050d07.tar.xz
phoronix-test-suite-upstream-f4d3b24bfac3f4e015fec41a19e4297a34050d07.zip
pts-core: Don't sort current test identifiers when being prompted to
enter a new identifier
Diffstat (limited to 'pts-core')
-rw-r--r--pts-core/functions/pts-functions-run.php4
-rw-r--r--pts-core/options/run_test.php1
2 files changed, 1 insertions, 4 deletions
diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index ba51ea0..5489189 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -47,7 +47,6 @@ function pts_prompt_results_identifier($current_identifiers = null)
}
$show_identifiers = array_unique($show_identifiers);
- sort($show_identifiers);
echo "\nCurrent Test Identifiers:\n";
foreach($show_identifiers as $identifier)
@@ -419,10 +418,9 @@ function pts_prompt_save_file_name($check_env = true, $to_run)
}
function pts_validate_save_file_name($proposed_save_name, $to_run)
{
- return true; // TODO: fix this function
$is_validated = true;
- if(is_file(SAVE_RESULTS_DIR . $proposed_save_name . "/composite.xml"))
+ if(is_file(SAVE_RESULTS_DIR . $proposed_save_name . "/composite.xml") && !pts_is_assignment("AUTO_SAVE_NAME"))
{
$xml_parser = new tandem_XmlReader(SAVE_RESULTS_DIR . $proposed_save_name . "/composite.xml");
$test_suite = $xml_parser->getXMLValue(P_RESULTS_SUITE_NAME);
diff --git a/pts-core/options/run_test.php b/pts-core/options/run_test.php
index 757a536..87b584a 100644
--- a/pts-core/options/run_test.php
+++ b/pts-core/options/run_test.php
@@ -135,7 +135,6 @@ class run_test implements pts_option_interface
if(IS_SCTP_MODE)
{
pts_set_assignment_once("AUTO_SAVE_NAME", $to_run);
- pts_set_assignment_once("AUTO_SAVE_NAME", $to_run);
$to_run_type = "SCTP_COMPARISON";
}
else