diff options
| -rw-r--r-- | PTS-12-CHANGE-LOG | 3 | ||||
| -rwxr-xr-x | phoronix-test-suite | 4 | ||||
| -rw-r--r-- | pts-core/pts-run-cmd.php | 11 |
3 files changed, 4 insertions, 14 deletions
diff --git a/PTS-12-CHANGE-LOG b/PTS-12-CHANGE-LOG index e1a43e3..200420c 100644 --- a/PTS-12-CHANGE-LOG +++ b/PTS-12-CHANGE-LOG @@ -1,6 +1,7 @@ - pts-core: Variety of code cleaning and other general improvements - pts-core: Implement PTS modules support - pts-core: Move sensor monitoring support to a new module called system_monitor +- pts-core: Drop sensors and sensor-options arguments - pts-core: Add list-modules option for listing all available/installed modules - pts-core: Add module-info option for viewing information on a module - pts-core: Drop pts-functions_monitor.php now that it's all modulized. @@ -55,7 +56,7 @@ - email_results: Add a module to email test results automatically to a user upon completion. Specify the email addres in the EMAIL_RESULTS_TO environmental variable. -- system_monitor: Poll sensors every 30 seconds during testing +- system_monitor: Poll sensors every 15 seconds during testing - system_monitor: Add cpu.usage to MONITOR, fix some bugs as well - system_monitor: Add gpu.freq to MONITOR diff --git a/phoronix-test-suite b/phoronix-test-suite index 80950ea..30b7a5b 100755 --- a/phoronix-test-suite +++ b/phoronix-test-suite @@ -170,8 +170,8 @@ case "$1" in "sensor-options") $PHP_BIN pts-core/pts-run-cmd.php SENSOR_OPTIONS ;; -"sensors") - $PHP_BIN pts-core/pts-run-cmd.php SENSORS +"sensors" | "sensor-options") + echo "\nThis option was dropped from the Phoronix Test Suite. For more information and the replacement option, view the latest documentation.\n" ;; *) cat <<'EOT' diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php index 171eefb..160b179 100644 --- a/pts-core/pts-run-cmd.php +++ b/pts-core/pts-run-cmd.php @@ -659,20 +659,9 @@ switch($COMMAND) echo $ARG_1 . " is an unrecognized PTS Global ID.\n\n"; } break; - case "SENSOR_OPTIONS": - //echo "\nThe Phoronix Test Suite supports monitoring various system hardware sensors through the LM_Sensors and ACPI interfaces. The Phoronix Test Suite will automatically monitor the selected sensors while each test is running and at the end will then provide the low and high thresholds for each sensor as well as the average. In addition, the sensor results are then plotted on line graphs and can be viewed through the PTS Results Viewer.\n"; - echo "\nMonitoring these sensors are as easy as running your normal Phoronix Test Suite commands but at the beginning of the command add: MONITOR=<selected sensors> (example: MONITOR=cpu.temp,cpu.voltage phoronix-test-suite benchmark universe). Below are all of the sensors supported by this version of the Phoronix Test Suite.\n\n"; - //echo "Supported Options:\n"; - //foreach(pts_monitor_arguments() as $arg) - // echo " - " . $arg . "\n"; - //echo "\n"; - break; case "VERSION": echo "\nPhoronix Test Suite v" . PTS_VERSION . " (" . PTS_CODENAME . ")\n\n"; break; - case "SENSORS": - echo "\nThis option was dropped from the Phoronix Test Suite. For more information and the replacement option, view the latest documentation.\n\n"; - break; default: echo "Phoronix Test Suite: Internal Error.\nCommand Not Recognized (" . $COMMAND . ").\n"; } |