diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-07-01 22:12:10 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-03 11:49:18 -0400 |
| commit | 1f5166a94cdc354f17753184d70ba7db1a56482e (patch) | |
| tree | 2051ed2781749b9d41bd4ffb1f1216fe3457caa2 /pts-core/functions/pts-functions_modules.php | |
| parent | c4d5180afdd55a3110ff64f39f0521c0057a2c3e (diff) | |
| download | phoronix-test-suite-upstream-1f5166a94cdc354f17753184d70ba7db1a56482e.tar.gz phoronix-test-suite-upstream-1f5166a94cdc354f17753184d70ba7db1a56482e.tar.xz phoronix-test-suite-upstream-1f5166a94cdc354f17753184d70ba7db1a56482e.zip | |
Add LoadModules tag to user-config.xml with support for loading modules
every time upon running PTS
Diffstat (limited to 'pts-core/functions/pts-functions_modules.php')
| -rw-r--r-- | pts-core/functions/pts-functions_modules.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pts-core/functions/pts-functions_modules.php b/pts-core/functions/pts-functions_modules.php index e951ca4..5622b41 100644 --- a/pts-core/functions/pts-functions_modules.php +++ b/pts-core/functions/pts-functions_modules.php @@ -50,10 +50,20 @@ function pts_auto_detect_modules($load_here = FALSE) } function pts_load_modules() { + // Check for modules to auto-load from the configuration file + if(strlen(($load_modules = pts_read_user_config(P_OPTION_LOAD_MODULES, ""))) > 0) + foreach(explode(",", $load_modules) as $module) + array_push($GLOBALS["PTS_MODULES"], trim($module)); + // Check for modules to load manually in PTS_MODULES if(($load_modules = getenv("PTS_MODULES")) !== FALSE) foreach(explode(",", $load_modules) as $module) - array_push($GLOBALS["PTS_MODULES"], trim($module)); + { + $module = trim($module); + + if(!in_array($module, $GLOBALS["PTS_MODULES"])) + array_push($GLOBALS["PTS_MODULES"], trim($module)); + } // Detect modules to load automatically pts_auto_detect_modules(); |