pts-core: Add pts-functions_vars.php

4 files changed, 143 insertions, 116 deletions

diff --git a/CHANGE-LOG b/CHANGE-LOG
index 0c57cbc..f922702 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -12,6 +12,7 @@ Phoronix Test Suite (Git)
 - pts-core: Ensure no spaces in pts_vendor_identifier()
 - pts-core: Add support for abstracting the package vendor identifier (should fix OpenSuSE External Dependencies support on 11.1)
 - pts-core: When using pts_display_web_browser, point to the index.html redirect instead of directly to composite.xml
+- pts-core: Add pts-functions_vars.php
 - pts: Add more tests to netbook suite
 
 Phoronix Test Suite 1.6.0 Alpha 3
diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php
index 6078da1..ca32251 100644
--- a/pts-core/functions/pts-functions.php
+++ b/pts-core/functions/pts-functions.php
@@ -33,6 +33,7 @@ require_once("pts-core/functions/pts-functions_system.php");
 require_once("pts-core/functions/pts-functions_global.php");
 require_once("pts-core/functions/pts-functions_tests.php");
 require_once("pts-core/functions/pts-functions_types.php");
+require_once("pts-core/functions/pts-functions_vars.php");
 require_once("pts-core/functions/pts-functions_modules.php");
 
 // Phoronix Test Suite - Functions
@@ -83,122 +84,6 @@ function pts_run_option_next($command = false, $pass_args = null, $command_descr
 
 	return $return;
 }
-function pts_env_variables()
-{
-	// The PTS environmental variables passed during the testing process, etc
-	static $env_variables = null;
-
-	if(empty($env_variables))
-	{
-		$env_variables = array(
-		"PTS_TYPE" => PTS_TYPE,
-		"PTS_VERSION" => PTS_VERSION,
-		"PTS_CODENAME" => PTS_CODENAME,
-		"PTS_DIR" => PTS_DIR,
-		"FONT_DIR" => FONT_DIR,
-		"PHP_BIN" => PHP_BIN,
-		"NUM_CPU_CORES" => hw_cpu_core_count(),
-		"NUM_CPU_JOBS" => hw_cpu_job_count(),
-		"SYS_MEMORY" => hw_sys_memory_capacity(),
-		"VIDEO_MEMORY" => hw_gpu_memory_size(),
-		"VIDEO_WIDTH" => hw_gpu_screen_width(),
-		"VIDEO_HEIGHT" => hw_gpu_screen_height(),
-		"VIDEO_MONITOR_COUNT" => hw_gpu_monitor_count(),
-		"VIDEO_MONITOR_LAYOUT" => hw_gpu_monitor_layout(),
-		"VIDEO_MONITOR_SIZES" => hw_gpu_monitor_modes(),
-		"OPERATING_SYSTEM" => pts_vendor_identifier(),
-		"OS_VERSION" => sw_os_version(),
-		"OS_ARCH" => sw_os_architecture(),
-		"OS_TYPE" => OPERATING_SYSTEM,
-		"THIS_RUN_TIME" => PTS_INIT_TIME
-		);
-	}
-
-	return $env_variables;
-}
-function pts_user_runtime_variables()
-{
-	static $runtime_variables = null;
-
-	if(empty($runtime_variables))
-	{
-		$runtime_variables = array(
-		"VIDEO_RESOLUTION" => hw_gpu_current_mode(),
-		"VIDEO_CARD" => hw_gpu_string(),
-		"VIDEO_DRIVER" => sw_os_opengl(),
-		"OPERATING_SYSTEM" => sw_os_release(),
-		"PROCESSOR" => hw_cpu_string(),
-		"MOTHERBOARD" => hw_sys_motherboard_string(),
-		"CHIPSET" => hw_sys_chipset_string(),
-		"KERNEL_VERSION" => sw_os_kernel(),
-		"COMPILER" => sw_os_compiler(),
-		"HOSTNAME" => sw_os_hostname()
-		);
-	}
-
-	return $runtime_variables;
-}
-function pts_input_correct_results_path($path)
-{
-	// Correct an input path for an XML file
-	if(strpos($path, "/") === false)
-	{
-		$path = SAVE_RESULTS_DIR . $path;
-	}
-	if(strpos($path, ".xml") === false)
-	{
-		$path = $path . ".xml";
-	}
-	return $path;
-}
-function pts_variables_export_string($vars = null)
-{
-	// Convert pts_env_variables() into shell export variable syntax
-	$return_string = "";
-
-	if($vars == null)
-	{
-		$vars = pts_env_variables();
-	}
-	else
-	{
-		$vars = array_merge(pts_env_variables(), $vars);
-	}
-
-	foreach($vars as $name => $var)
-	{
-		$return_string .= "export " . $name . "=" . $var . ";";
-	}
-	return $return_string . " ";
-}
-function pts_run_additional_vars($identifier)
-{
-	$extra_vars = array();
-
-	$extra_vars["HOME"] = TEST_ENV_DIR . $identifier . "/";
-
-	$ctp_extension_string = "";
-	$extends = pts_test_extends_below($identifier);
-	foreach($extends as $extended_test)
-	{
-		if(is_dir(TEST_ENV_DIR . $extended_test . "/"))
-		{
-			$ctp_extension_string .= TEST_ENV_DIR . $extended_test . ":";
-		}
-	}
-
-	if(!empty($ctp_extension_string))
-	{
-		$extra_vars["PATH"] = $ctp_extension_string . "\$PATH";
-	}
-
-	if(count($extends) > 0)
-	{
-		$extra_vars["TEST_EXTENDS"] = TEST_ENV_DIR . $extends[0];
-	}
-
-	return $extra_vars;
-}
 function pts_exec($exec, $extra_vars = null)
 {
 	// Same as shell_exec() but with the PTS env variables added in
diff --git a/pts-core/functions/pts-functions_tests.php b/pts-core/functions/pts-functions_tests.php
index 42bb551..8b9305f 100644
--- a/pts-core/functions/pts-functions_tests.php
+++ b/pts-core/functions/pts-functions_tests.php
@@ -261,6 +261,19 @@ function pts_test_installed_checksum_installer($identifier)
 
 	return $version;
 }
+function pts_input_correct_results_path($path)
+{
+	// Correct an input path for an XML file
+	if(strpos($path, "/") === false)
+	{
+		$path = SAVE_RESULTS_DIR . $path;
+	}
+	if(strpos($path, ".xml") === false)
+	{
+		$path = $path . ".xml";
+	}
+	return $path;
+}
 function pts_test_installed_system_identifier($identifier)
 {
 	// Read installer checksum of installed tests
diff --git a/pts-core/functions/pts-functions_vars.php b/pts-core/functions/pts-functions_vars.php
new file mode 100644
index 0000000..a7ab7c8
--- /dev/null
+++ b/pts-core/functions/pts-functions_vars.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2008, Phoronix Media
+	Copyright (C) 2008, Michael Larabel
+	pts-functions_vars.php: Functions related to variables exposed to tests and/or end-users
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function pts_env_variables()
+{
+	// The PTS environmental variables passed during the testing process, etc
+	static $env_variables = null;
+
+	if(empty($env_variables))
+	{
+		$env_variables = array(
+		"PTS_TYPE" => PTS_TYPE,
+		"PTS_VERSION" => PTS_VERSION,
+		"PTS_CODENAME" => PTS_CODENAME,
+		"PTS_DIR" => PTS_DIR,
+		"FONT_DIR" => FONT_DIR,
+		"PHP_BIN" => PHP_BIN,
+		"NUM_CPU_CORES" => hw_cpu_core_count(),
+		"NUM_CPU_JOBS" => hw_cpu_job_count(),
+		"SYS_MEMORY" => hw_sys_memory_capacity(),
+		"VIDEO_MEMORY" => hw_gpu_memory_size(),
+		"VIDEO_WIDTH" => hw_gpu_screen_width(),
+		"VIDEO_HEIGHT" => hw_gpu_screen_height(),
+		"VIDEO_MONITOR_COUNT" => hw_gpu_monitor_count(),
+		"VIDEO_MONITOR_LAYOUT" => hw_gpu_monitor_layout(),
+		"VIDEO_MONITOR_SIZES" => hw_gpu_monitor_modes(),
+		"OPERATING_SYSTEM" => pts_vendor_identifier(),
+		"OS_VERSION" => sw_os_version(),
+		"OS_ARCH" => sw_os_architecture(),
+		"OS_TYPE" => OPERATING_SYSTEM,
+		"THIS_RUN_TIME" => PTS_INIT_TIME
+		);
+	}
+
+	return $env_variables;
+}
+function pts_user_runtime_variables()
+{
+	static $runtime_variables = null;
+
+	if(empty($runtime_variables))
+	{
+		$runtime_variables = array(
+		"VIDEO_RESOLUTION" => hw_gpu_current_mode(),
+		"VIDEO_CARD" => hw_gpu_string(),
+		"VIDEO_DRIVER" => sw_os_opengl(),
+		"OPERATING_SYSTEM" => sw_os_release(),
+		"PROCESSOR" => hw_cpu_string(),
+		"MOTHERBOARD" => hw_sys_motherboard_string(),
+		"CHIPSET" => hw_sys_chipset_string(),
+		"KERNEL_VERSION" => sw_os_kernel(),
+		"COMPILER" => sw_os_compiler(),
+		"HOSTNAME" => sw_os_hostname()
+		);
+	}
+
+	return $runtime_variables;
+}
+function pts_variables_export_string($vars = null)
+{
+	// Convert pts_env_variables() into shell export variable syntax
+	$return_string = "";
+
+	if($vars == null)
+	{
+		$vars = pts_env_variables();
+	}
+	else
+	{
+		$vars = array_merge(pts_env_variables(), $vars);
+	}
+
+	foreach($vars as $name => $var)
+	{
+		$return_string .= "export " . $name . "=" . $var . ";";
+	}
+	return $return_string . " ";
+}
+function pts_run_additional_vars($identifier)
+{
+	$extra_vars = array();
+
+	$extra_vars["HOME"] = TEST_ENV_DIR . $identifier . "/";
+
+	$ctp_extension_string = "";
+	$extends = pts_test_extends_below($identifier);
+	foreach($extends as $extended_test)
+	{
+		if(is_dir(TEST_ENV_DIR . $extended_test . "/"))
+		{
+			$ctp_extension_string .= TEST_ENV_DIR . $extended_test . ":";
+		}
+	}
+
+	if(!empty($ctp_extension_string))
+	{
+		$extra_vars["PATH"] = $ctp_extension_string . "\$PATH";
+	}
+
+	if(count($extends) > 0)
+	{
+		$extra_vars["TEST_EXTENDS"] = TEST_ENV_DIR . $extends[0];
+	}
+
+	return $extra_vars;
+}
+
+?>