summaryrefslogtreecommitdiffstats
path: root/pts-core/functions/pts-functions-run.php
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-10-19 10:31:11 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-10-19 10:31:11 -0400
commitcff5223ccad40112fb043c0f1e53bc8074c16f53 (patch)
treefba6f5e4ab629408b76a3310881f727ff967731c /pts-core/functions/pts-functions-run.php
parentf47476614454a115c7644ac487532d6aa560b057 (diff)
downloadphoronix-test-suite-upstream-cff5223ccad40112fb043c0f1e53bc8074c16f53.tar.gz
phoronix-test-suite-upstream-cff5223ccad40112fb043c0f1e53bc8074c16f53.tar.xz
phoronix-test-suite-upstream-cff5223ccad40112fb043c0f1e53bc8074c16f53.zip
pts-core: More code restructuring and cleaning
Diffstat (limited to 'pts-core/functions/pts-functions-run.php')
-rw-r--r--pts-core/functions/pts-functions-run.php40
1 files changed, 1 insertions, 39 deletions
diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index 81b9736..34dc4ed 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -366,44 +366,6 @@ function pts_save_test_file($PROPOSED_FILE_NAME, &$RESULTS = null, $RAW_TEXT = n
}
return $REAL_FILE_NAME;
}
-function pts_call_test_script($test_identifier, $script_name, $print_string = "", $pass_argument = "", $extra_vars = null)
-{
- $result = null;
- $test_directory = TEST_ENV_DIR . $test_identifier . "/";
-
- foreach(pts_contained_tests($test_identifier, true) as $this_test)
- {
- if(is_file(($run_file = pts_location_test_resources($this_test) . $script_name . ".php")) || is_file(($run_file = pts_location_test_resources($this_test) . $script_name . ".sh")))
- {
- $file_extension = substr($run_file, (strrpos($run_file, ".") + 1));
-
- if(!empty($print_string))
- {
- echo $print_string;
- }
-
- if($file_extension == "php")
- {
- $this_result = pts_exec("cd " . $test_directory . " && " . PHP_BIN . " " . $run_file . " \"" . $pass_argument . "\"", $extra_vars);
- }
- else if($file_extension == "sh")
- {
- $this_result = pts_exec("cd " . $test_directory . " && sh " . $run_file . " \"" . $pass_argument . "\"", $extra_vars);
- }
- else
- {
- $this_result = null;
- }
-
- if(trim($this_result) != "")
- {
- $result = $this_result;
- }
- }
- }
-
- return $result;
-}
function pts_run_test($test_identifier, $extra_arguments = "", $arguments_description = "")
{
// Do the actual test running process
@@ -719,7 +681,7 @@ function pts_global_auto_tags($extra_attr = null)
array_push($tags_array, "NVIDIA");
}
- if(kernel_arch() == "x86_64")
+ if(kernel_arch() == "x86_64" && IS_LINUX)
{
array_push($tags_array, "64-bit Linux");
}