Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index ef0f3fe..98ba3c0 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -9,6 +9,7 @@ Phoronix Test Suite (Git)
- pts-core: Support showing information from info command when supplying a virtual suite
- pts-core: Don't contain tests that are of license RETAIL or RESTRICTED in the "all" virtual suite
- pts-core: Fix where recover-run would not recognize the result file if there was not at least one successful one previously
+- pts-core: When using recover-run, put back in batch mode state if the test was originally run in batch mode
- phodevi: Add support for GPU fan speed monitoring (currently only implemented for NVIDIA's binary display driver)
- phodevi: Add property to disk object for reading the scheduler in use
- phodevi: DMI parsing support on Linux through /sys/class/dmi/id/ interface, for now implement motherboard way
diff --git a/pts-core/library/pts-functions_client.php b/pts-core/library/pts-functions_client.php
index 27c0523..9dbfd8b 100644
--- a/pts-core/library/pts-functions_client.php
+++ b/pts-core/library/pts-functions_client.php
@@ -274,7 +274,7 @@ function pts_get_display_mode_object()
$display_mode = new pts_concise_display_mode();
break;
default:
- if(pts_is_assignment("IS_BATCH_MODE") || pts_is_assignment("AUTOMATED_MODE"))
+ if(pts_read_assignment("IS_BATCH_MODE") || pts_is_assignment("AUTOMATED_MODE"))
{
$display_mode = new pts_concise_display_mode();
}
diff --git a/pts-core/library/pts-functions_tests.php b/pts-core/library/pts-functions_tests.php
index dcfb67b..5e269b1 100644
--- a/pts-core/library/pts-functions_tests.php
+++ b/pts-core/library/pts-functions_tests.php
@@ -57,7 +57,7 @@ function pts_save_result($save_to = null, $save_results = null, $render_graphs =
$bool = file_put_contents(SAVE_RESULTS_DIR . $save_to, $save_results);
- if(pts_is_assignment("TEST_RESULTS_IDENTIFIER") && (pts_string_bool(pts_read_user_config(P_OPTION_LOG_VSYSDETAILS, "TRUE")) || pts_read_assignment("IS_PCQS_MODE") || pts_is_assignment("IS_BATCH_MODE")))
+ if(pts_is_assignment("TEST_RESULTS_IDENTIFIER") && (pts_string_bool(pts_read_user_config(P_OPTION_LOG_VSYSDETAILS, "TRUE")) || pts_read_assignment("IS_PCQS_MODE") || pts_read_assignment("IS_BATCH_MODE")))
{
$test_results_identifier = pts_read_assignment("TEST_RESULTS_IDENTIFIER");
diff --git a/pts-core/library/pts-includes-install.php b/pts-core/library/pts-includes-install.php
index 466490c..d12880e 100644
--- a/pts-core/library/pts-includes-install.php
+++ b/pts-core/library/pts-includes-install.php
@@ -218,7 +218,7 @@ function pts_download_test_files($identifier, &$display_mode)
do
{
- if(!pts_is_assignment("IS_BATCH_MODE") && !pts_is_assignment("AUTOMATED_MODE") && pts_string_bool(pts_read_user_config(P_OPTION_PROMPT_DOWNLOADLOC, "FALSE")) && count($urls) > 1)
+ if(!pts_read_assignment("IS_BATCH_MODE") && !pts_is_assignment("AUTOMATED_MODE") && pts_string_bool(pts_read_user_config(P_OPTION_PROMPT_DOWNLOADLOC, "FALSE")) && count($urls) > 1)
{
// Prompt user to select mirror
do
diff --git a/pts-core/options/recover_run.php b/pts-core/options/recover_run.php
index 3d03885..d9b243c 100644
--- a/pts-core/options/recover_run.php
+++ b/pts-core/options/recover_run.php
@@ -82,6 +82,7 @@ class recover_run implements pts_option_interface
}
// Recovered test_run_manager
+ $is_batch_mode = $pt2so_objects->read_object("batch_mode");
$test_run_manager = $pt2so_objects->read_object("test_run_manager");
$recovered_identifier = $test_run_manager->get_results_identifier();
@@ -143,7 +144,7 @@ class recover_run implements pts_option_interface
return false;
}
- pts_run_option_next("run_test", $r, array("RECOVER_RUN" => true, "RECOVER_RUN_REQUESTS" => $tests_to_run, "AUTO_TEST_RESULTS_IDENTIFIER" => $recovered_identifier));
+ pts_run_option_next("run_test", $r, array("RECOVER_RUN" => true, "RECOVER_RUN_REQUESTS" => $tests_to_run, "AUTO_TEST_RESULTS_IDENTIFIER" => $recovered_identifier, "BATCH_MODE" => $is_batch_mode));
}
}
diff --git a/pts-core/options/run_test.php b/pts-core/options/run_test.php
index 7aa252b..6556922 100644
--- a/pts-core/options/run_test.php
+++ b/pts-core/options/run_test.php
@@ -306,6 +306,7 @@ class run_test implements pts_option_interface
$pso = new pts_storage_object(true, false);
$pso->add_object("test_run_manager", $test_run_manager);
+ $pso->add_object("batch_mode", pts_read_assignment("IS_BATCH_MODE"));
$pso->add_object("system_hardware", pts_hw_string(false));
$pso->add_object("system_software", pts_sw_string(false));
<
Copyright © 2010 by Phoronix Media