diff options
| -rw-r--r-- | phpunit.xml.all | 4 | ||||
| -rw-r--r-- | phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | phpunit.xml.functional | 4 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/phpunit.xml.all b/phpunit.xml.all index 3639843771..d47864e104 100644 --- a/phpunit.xml.all +++ b/phpunit.xml.all @@ -14,6 +14,10 @@ <testsuites> <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">./tests/</directory> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> </testsuites> diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f1cb4b9d09..ac45597b45 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,6 +14,10 @@ <testsuites> <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">./tests/</directory> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> </testsuites> diff --git a/phpunit.xml.functional b/phpunit.xml.functional index 99f11477aa..3a3d653b47 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -14,6 +14,10 @@ <testsuites> <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">./tests/</directory> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> </testsuites> diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 50b2bf03ec..3d9cd10f32 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -94,6 +94,9 @@ class phpbb_test_case_helpers public function makedirs($path) { + // PHP bug #55124 (fixed in 5.4.0) + $path = str_replace('/./', '/', $path); + mkdir($path, 0777, true); } |