summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-16 21:51:06 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-16 21:51:06 -0500
commitdcf7cd85560661311d94ecd2a6aa9fd56d110186 (patch)
tree35a351ae5ebeadac68e5ee7f0c132e323f423844
parenta6dcb59a659b0f1b88b434419e2290eb63518a9a (diff)
downloadphoronix-test-suite-upstream-dcf7cd85560661311d94ecd2a6aa9fd56d110186.tar.gz
phoronix-test-suite-upstream-dcf7cd85560661311d94ecd2a6aa9fd56d110186.tar.xz
phoronix-test-suite-upstream-dcf7cd85560661311d94ecd2a6aa9fd56d110186.zip
pts-core: Add auto-file-select and auto-directory-selection options to
PTS auto options support
-rw-r--r--CHANGE-LOG1
-rw-r--r--documentation/specifications_xml_suite.html5
-rw-r--r--pts-core/functions/pts-functions-run.php30
3 files changed, 31 insertions, 5 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 449ea4f..39125fc 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -18,6 +18,7 @@ Phoronix Test Suite (Git)
- pts-core: Rework option counting in pts_auto_process_test_option()
- pts-core: Add support for specifying multiple possible points in read_acpi() to provide some fallback support
- pts-core: Allow reading from TZ00 thermal zone over ACPI for CPU temperature
+- pts-core: Add auto-file-select and auto-directory-selection options to PTS auto options support
- pts: Add more tests to netbook suite
Phoronix Test Suite 1.6.0 Alpha 3
diff --git a/documentation/specifications_xml_suite.html b/documentation/specifications_xml_suite.html
index 89b600e..4c61d6f 100644
--- a/documentation/specifications_xml_suite.html
+++ b/documentation/specifications_xml_suite.html
@@ -34,11 +34,6 @@
<strong>Required:</strong> Recommended<br>
<strong>Description:</strong> The hardware area of the system that this suite is designed to stress.<br>
<strong>Supported Values:</strong> System, Processor, Graphics, Disk, Memory, Motherboard</p>
-<p><strong>Tag:</strong> Maintainer<br>
-<strong>Location:</strong> PhoronixTestSuite/SuiteInformation/<br>
-<strong>Internal Reference:</strong> P_SUITE_MAINTAINER<br>
-<strong>Required:</strong> Recommended<br>
-<strong>Description:</strong> The name of the maintainer of this suite.</p>
<p><strong>Tag:</strong> PreRunMessage<br>
<strong>Location:</strong> PhoronixTestSuite/SuiteInformation/<br>
<strong>Internal Reference:</strong> P_SUITE_PRERUNMSG<br>
diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index 319cd3e..2072790 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -1190,6 +1190,36 @@ function pts_auto_process_test_option($identifier, &$option_names, &$option_valu
}
$option_names = $option_values;
break;
+ case "auto-file-select":
+ $names = $option_names;
+ $values = $option_values;
+ $option_names = array();
+ $option_values = array();
+
+ for($i = 0; $i < count($names) && $i < count($values); $i++)
+ {
+ if(is_file($values[$i]))
+ {
+ array_push($option_names, $names[$i]);
+ array_push($option_values, $values[$i]);
+ }
+ }
+ break;
+ case "auto-directory-select":
+ $names = $option_names;
+ $values = $option_values;
+ $option_names = array();
+ $option_values = array();
+
+ for($i = 0; $i < count($names) && $i < count($values); $i++)
+ {
+ if(is_dir($values[$i]))
+ {
+ array_push($option_names, $names[$i]);
+ array_push($option_values, $values[$i]);
+ }
+ }
+ break;
}
}
function pts_test_options($identifier)