aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_test_case_helpers.php
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-03-16 16:42:29 -0400
committerDavid King <imkingdavid@gmail.com>2012-03-19 09:12:33 -0400
commit66b45318efea886ac6afc1f332cc94ee2af1c494 (patch)
treecaeae16b9df46e69cb90d908efc4684da0f49776 /tests/test_framework/phpbb_test_case_helpers.php
parent7b44d6f21a5a8be289bf6810f2c38d580647581e (diff)
downloadforums-66b45318efea886ac6afc1f332cc94ee2af1c494.tar
forums-66b45318efea886ac6afc1f332cc94ee2af1c494.tar.gz
forums-66b45318efea886ac6afc1f332cc94ee2af1c494.tar.bz2
forums-66b45318efea886ac6afc1f332cc94ee2af1c494.tar.xz
forums-66b45318efea886ac6afc1f332cc94ee2af1c494.zip
[ticket/10586] browse tests now work, but mine dont. at least we are making progress
PHPBB3-10586
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 9c91778cb0..51b04db263 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -80,6 +80,11 @@ class phpbb_test_case_helpers
{
$config['phpbb_functional_url'] = $phpbb_functional_url;
}
+
+ if (isset($phpbb_functional_path))
+ {
+ $config['phpbb_functional_path'] = $phpbb_functional_path;
+ }
}
if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -101,6 +106,13 @@ class phpbb_test_case_helpers
));
}
+ if (isset($_SERVER['PHPBB_FUNCTIONAL_PATH']))
+ {
+ $config = array_merge($config, array(
+ 'phpbb_functional_path' => isset($_SERVER['PHPBB_FUNCTIONAL_PATH']) ? $_SERVER['PHPBB_FUNCTIONAL_PATH'] : '',
+ ));
+ }
+
return $config;
}
}