pts-core: Add RemoveDownloadFiles to user-config.xml for removing the

originally downloaded files from a test once it has been installed

If RemoveDownloadFiles is set to TRUE within the user-config.xml file, once a test has been installed the originally downloaded files for that
test will be automatically removed. This conserves disk space but will cause these files to be re-downloaded the next time
the test needs to be re-installed. This will also not back up the downloaded files to the Phoronix Test Suite download
cache. Enabling this option is just recommended for users with very limited disk space.

4 files changed, 15 insertions, 5 deletions

diff --git a/CHANGE-LOG b/CHANGE-LOG
index eb3f2bb..f808234 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -25,6 +25,7 @@ Phoronix Test Suite
 - pts-core: When running in debug mode, set error reporting to all and strict
 - pts-core: More improvements to motherboard detection
 - pts-core: Default LogVerboseSystemDetails to FALSE
+- pts-core: Add RemoveDownloadFiles to user-config.xml for removing the originally downloaded files from a test once it has been installed
 - pts: Add j2dbench test profile for a Java OpenGL 2D Microbenchmark (Thanks to Sun Microsystems)
 - pts: Switch over rest of graphics suites to using $VIDEO_WIDTH and $VIDEO_HEIGHT
 - pts: Add java-opengl test suite for Java OpenGL tests
diff --git a/documentation/tips_and_tricks.html b/documentation/tips_and_tricks.html
index 699b96b..91c8496 100644
--- a/documentation/tips_and_tricks.html
+++ b/documentation/tips_and_tricks.html
@@ -26,6 +26,11 @@ be added in the future.</p>
 checks will be performed when merging results and it will allow you to form custom 
 suites very easily, etc. Though the preferred method to create a suite is by writing 
 a formal suite.</p>
+<p>- If <em>RemoveDownloadFiles</em> is set to <em>TRUE</em> within the <em>user-config.xml</em> file, 
+once a test has been installed the originally downloaded files for that test will be automatically removed. This conserves 
+disk space but will cause these files to be re-downloaded the next time the test needs to be re-installed. This will also 
+not back up the downloaded files to the Phoronix Test Suite download cache. Enabling this option is just recommended for users 
+with very limited disk space.</p>
 <p>- How do I find tests that are in a suite? Run <em>phoronix-test-suite info NAME-OF-SUITE</em> and (along with other information) a tree will be displayed that recursively shows the tests (along with any sub-suites) inside. To find suites that utilize a particular test, run <em>phoronix-test-suite info NAME-OF-TEST</em> and it will show that information too.</p>
 <p>- If the amount of video memory for your graphics card is incorrectly reported by the Phoronix Test Suite (you can check by running <em>phoronix-test-suite diagnostics</em>), you can use the <em>VIDEO_MEMORY=</em> environmental variable for overriding the video memory capacity (in Megabytes) used by the Phoronix Test Suite.</p>
 <p>- If the <em>DISPLAY</em> environmental variable is not set or <em>NO_GRAPHICS_TESTS</em> environmental variable is set, tests of type <em>Graphics</em> will not be run. Likewise, if <em>NO_SYSTEM_TESTS</em> environmental variable is set, tests of type <em>System</em> will not run. This applies to all test types where <em>NO_&lt;TEST TYPE&gt;_TESTS</em> is set.</p>
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php
index c195986..20c66a5 100644
--- a/pts-core/functions/pts-functions_config.php
+++ b/pts-core/functions/pts-functions_config.php
@@ -91,12 +91,14 @@ function pts_user_config_init($UserName = NULL, $UploadKey = NULL, $BatchOptions
 	$config->addXmlObject(P_OPTION_GLOBAL_USERNAME, 0, $UserName);
 	$config->addXmlObject(P_OPTION_GLOBAL_UPLOADKEY, 0, $UploadKey);
 
-	$config->addXmlObject(P_OPTION_TEST_SLEEPTIME, 2, pts_read_user_config(P_OPTION_TEST_SLEEPTIME, "8", $read_config));
+	$config->addXmlObject(P_OPTION_PROMPT_DOWNLOADLOC, 1, pts_read_user_config(P_OPTION_PROMPT_DOWNLOADLOC, "FALSE", $read_config));
+	$config->addXmlObject(P_OPTION_RESULTS_DIRECTORY, 1, pts_read_user_config(P_OPTION_RESULTS_DIRECTORY, "~/.phoronix-test-suite/test-results/", $read_config));
+	$config->addXmlObject(P_OPTION_TEST_ENVIRONMENT, 1, pts_read_user_config(P_OPTION_TEST_ENVIRONMENT, "~/.phoronix-test-suite/installed-tests/", $read_config));
+	$config->addXmlObject(P_OPTION_CACHE_DIRECTORY, 1, pts_read_user_config(P_OPTION_CACHE_DIRECTORY, "~/.phoronix-test-suite/download-cache/", $read_config));
 
-	$config->addXmlObject(P_OPTION_PROMPT_DOWNLOADLOC, 3, pts_read_user_config(P_OPTION_PROMPT_DOWNLOADLOC, "FALSE", $read_config));
-	$config->addXmlObject(P_OPTION_RESULTS_DIRECTORY, 3, pts_read_user_config(P_OPTION_RESULTS_DIRECTORY, "~/.phoronix-test-suite/test-results/", $read_config));
-	$config->addXmlObject(P_OPTION_TEST_ENVIRONMENT, 3, pts_read_user_config(P_OPTION_TEST_ENVIRONMENT, "~/.phoronix-test-suite/installed-tests/", $read_config));
-	$config->addXmlObject(P_OPTION_CACHE_DIRECTORY, 3, pts_read_user_config(P_OPTION_CACHE_DIRECTORY, "~/.phoronix-test-suite/download-cache/", $read_config));
+	$config->addXmlObject(P_OPTION_TEST_REMOVEDOWNLOADS, 2, pts_read_user_config(P_OPTION_TEST_REMOVEDOWNLOADS, "FALSE", $read_config));
+
+	$config->addXmlObject(P_OPTION_TEST_SLEEPTIME, 3, pts_read_user_config(P_OPTION_TEST_SLEEPTIME, "8", $read_config));
 
 	$config->addXmlObject(P_OPTION_BATCH_SAVERESULTS, 4, $BatchOptions[0]);
 	$config->addXmlObject(P_OPTION_BATCH_LAUNCHBROWSER, 4, $BatchOptions[1]);
diff --git a/pts-core/functions/pts-interfaces.php b/pts-core/functions/pts-interfaces.php
index 9b125f2..ffb39d2 100644
--- a/pts-core/functions/pts-interfaces.php
+++ b/pts-core/functions/pts-interfaces.php
@@ -148,6 +148,8 @@ define("P_OPTION_GLOBAL_UPLOADKEY", "PhoronixTestSuite/GlobalDatabase/UploadKey"
 
 define("P_OPTION_TEST_SLEEPTIME", "PhoronixTestSuite/Options/Testing/SleepTimeBetweenTests"); // Time in seconds to sleep between tests
 
+define("P_OPTION_TEST_REMOVEDOWNLOADS", "PhoronixTestSuite/Options/Installation/RemoveDownloadFiles"); // Remove downloaded files after test is installed
+
 define("P_OPTION_TEST_ENVIRONMENT", "PhoronixTestSuite/Options/FileManagement/EnvironmentDirectory"); // Results save directory
 define("P_OPTION_CACHE_DIRECTORY", "PhoronixTestSuite/Options/FileManagement/CacheDirectory"); // Directory for reading/writing to download cache
 define("P_OPTION_RESULTS_DIRECTORY", "PhoronixTestSuite/Options/FileManagement/ResultsDirectory"); // Results save directory