diff options
author | Michael Larabel <michael@phx-laptop.(none)> | 2008-07-10 11:56:36 -0400 |
---|---|---|
committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-03 11:49:19 -0400 |
commit | 1335f9d24a0bd37620ecc29beb41f4edd5d1394e (patch) | |
tree | 576064023ed2302b24d613e724b27c4e1702517a /pts-core/functions/pts-functions_config.php | |
parent | 289e8386ed5272a50469be07083b5d682ad848c3 (diff) | |
download | phoronix-test-suite-upstream-1335f9d24a0bd37620ecc29beb41f4edd5d1394e.tar.gz phoronix-test-suite-upstream-1335f9d24a0bd37620ecc29beb41f4edd5d1394e.tar.xz phoronix-test-suite-upstream-1335f9d24a0bd37620ecc29beb41f4edd5d1394e.zip |
pts-core: Update schema for some XML tags within user-config.xml
Diffstat (limited to 'pts-core/functions/pts-functions_config.php')
-rw-r--r-- | pts-core/functions/pts-functions_config.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php index ae455d7..c120a08 100644 --- a/pts-core/functions/pts-functions_config.php +++ b/pts-core/functions/pts-functions_config.php @@ -98,23 +98,24 @@ 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_RESULTS_DIRECTORY, 2, pts_read_user_config(P_OPTION_RESULTS_DIRECTORY, "~/.phoronix-test-suite/test-results/", $read_config)); - $config->addXmlObject(P_OPTION_TEST_ENVIRONMENT, 2, pts_read_user_config(P_OPTION_TEST_ENVIRONMENT, "~/.phoronix-test-suite/installed-tests/", $read_config)); - $config->addXmlObject(P_OPTION_CACHE_DIRECTORY, 2, pts_read_user_config(P_OPTION_CACHE_DIRECTORY, "~/.phoronix-test-suite/download-cache/", $read_config)); $config->addXmlObject(P_OPTION_TEST_SLEEPTIME, 2, pts_read_user_config(P_OPTION_TEST_SLEEPTIME, "8", $read_config)); $config->addXmlObject(P_OPTION_TEST_SCREENSAVER, 2, $ToggleScreensaver); - $config->addXmlObject(P_OPTION_BATCH_SAVERESULTS, 3, $BatchOptions[0]); - $config->addXmlObject(P_OPTION_BATCH_LAUNCHBROWSER, 3, $BatchOptions[1]); - $config->addXmlObject(P_OPTION_BATCH_UPLOADRESULTS, 3, $BatchOptions[2]); - $config->addXmlObject(P_OPTION_BATCH_PROMPTIDENTIFIER, 3, $BatchOptions[3]); - $config->addXmlObject(P_OPTION_BATCH_PROMPTSAVENAME, 3, $BatchOptions[4]); - $config->addXmlObject(P_OPTION_BATCH_CONFIGURED, 3, $BatchOptions[5]); + $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_LOG_VSYSDETAILS, 4, pts_read_user_config(P_OPTION_LOG_VSYSDETAILS, "TRUE", $read_config)); + $config->addXmlObject(P_OPTION_BATCH_SAVERESULTS, 4, $BatchOptions[0]); + $config->addXmlObject(P_OPTION_BATCH_LAUNCHBROWSER, 4, $BatchOptions[1]); + $config->addXmlObject(P_OPTION_BATCH_UPLOADRESULTS, 4, $BatchOptions[2]); + $config->addXmlObject(P_OPTION_BATCH_PROMPTIDENTIFIER, 4, $BatchOptions[3]); + $config->addXmlObject(P_OPTION_BATCH_PROMPTSAVENAME, 4, $BatchOptions[4]); + $config->addXmlObject(P_OPTION_BATCH_CONFIGURED, 4, $BatchOptions[5]); - $config->addXmlObject(P_OPTION_USER_AGREEMENT, 5, $UserAgreement_MD5); - $config->addXmlObject(P_OPTION_LOAD_MODULES, 5, pts_read_user_config(P_OPTION_LOAD_MODULES, "", $read_config)); + $config->addXmlObject(P_OPTION_LOG_VSYSDETAILS, 5, pts_read_user_config(P_OPTION_LOG_VSYSDETAILS, "TRUE", $read_config)); + + $config->addXmlObject(P_OPTION_USER_AGREEMENT, 6, $UserAgreement_MD5); + $config->addXmlObject(P_OPTION_LOAD_MODULES, 6, pts_read_user_config(P_OPTION_LOAD_MODULES, "", $read_config)); file_put_contents(PTS_USER_DIR . "user-config.xml", $config->getXML()); } |