diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-23 10:57:04 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-23 10:57:04 -0500 |
| commit | 7e8a8298617f1ce9f312027dfdef63d6a816f080 (patch) | |
| tree | 87b1d7be72ea5dade512b0f4471baa34a04dfe74 | |
| parent | a571d107854f5bb2c674dd00d1f233d048e2725b (diff) | |
| download | phoronix-test-suite-upstream-7e8a8298617f1ce9f312027dfdef63d6a816f080.tar.gz phoronix-test-suite-upstream-7e8a8298617f1ce9f312027dfdef63d6a816f080.tar.xz phoronix-test-suite-upstream-7e8a8298617f1ce9f312027dfdef63d6a816f080.zip | |
pts-core: Fix for Self-Contained Test Profiles (SCTP) support
| -rw-r--r-- | TYDAL-CHANGE-LOG | 4 | ||||
| -rw-r--r-- | pts-core/functions/pts-init.php | 5 | ||||
| -rw-r--r-- | pts-core/functions/pts-interfaces.php | 13 |
3 files changed, 14 insertions, 8 deletions
diff --git a/TYDAL-CHANGE-LOG b/TYDAL-CHANGE-LOG index b627ef8..4e008cb 100644 --- a/TYDAL-CHANGE-LOG +++ b/TYDAL-CHANGE-LOG @@ -1,4 +1,8 @@ +Phoronix Test Suite (Git) + +- pts-core: Fix for Self-Contained Test Profiles (SCTP) support + Phoronix Test Suite 1.6.0 Alpha 1 November 22, 2008 diff --git a/pts-core/functions/pts-init.php b/pts-core/functions/pts-init.php index 7bec71b..d0ebcf1 100644 --- a/pts-core/functions/pts-init.php +++ b/pts-core/functions/pts-init.php @@ -25,6 +25,11 @@ function pts_init() { pts_basic_init(); // Initalize common / needed PTS start-up work + if(IS_SCTP_MODE) + { + include_once("pts-core/functions/pts-functions-sctp.php"); + } + pts_config_init(); define("TEST_ENV_DIR", pts_find_home(pts_read_user_config(P_OPTION_TEST_ENVIRONMENT, "~/.phoronix-test-suite/installed-tests/"))); define("SAVE_RESULTS_DIR", pts_find_home(pts_read_user_config(P_OPTION_RESULTS_DIRECTORY, "~/.phoronix-test-suite/test-results/"))); diff --git a/pts-core/functions/pts-interfaces.php b/pts-core/functions/pts-interfaces.php index e4c974c..697f41a 100644 --- a/pts-core/functions/pts-interfaces.php +++ b/pts-core/functions/pts-interfaces.php @@ -75,14 +75,11 @@ define("P_TEST_OPTIONS_MENU_GROUP_VALUE", P_TEST_OPTIONS_MENU_GROUP . "/" . S_TE // SELF-CONTAINED TEST PROFILE SPECIFICATION // -if(IS_SCTP_MODE) -{ - define("P_TEST_SCTP_INSTALLSCRIPT", "PhoronixTestSuite/SelfContained/Installation"); // Installation routine - define("P_TEST_SCTP_DOWNLOADS", "PhoronixTestSuite/SelfContained/Downloads"); // Downloads XML file - define("P_TEST_SCTP_RESULTSPARSER", "PhoronixTestSuite/SelfContained/ResultsParser"); // Results Parser - define("P_TEST_SCTP_PRERUN", "PhoronixTestSuite/SelfContained/PreRun"); // Pre-run script - define("P_TEST_SCTP_POSTRUN", "PhoronixTestSuite/SelfContained/PostRun"); // Pre-run script -} +define("P_TEST_SCTP_INSTALLSCRIPT", "PhoronixTestSuite/SelfContained/Installation"); // Installation routine +define("P_TEST_SCTP_DOWNLOADS", "PhoronixTestSuite/SelfContained/Downloads"); // Downloads XML file +define("P_TEST_SCTP_RESULTSPARSER", "PhoronixTestSuite/SelfContained/ResultsParser"); // Results Parser +define("P_TEST_SCTP_PRERUN", "PhoronixTestSuite/SelfContained/PreRun"); // Pre-run script +define("P_TEST_SCTP_POSTRUN", "PhoronixTestSuite/SelfContained/PostRun"); // Pre-run script // // TEST SUITE SPECIFICATION |