summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter
diff options
context:
space:
mode:
authorvlakoff <vlakoff@gmail.com>2013-07-19 13:46:37 +0200
committervlakoff <vlakoff@gmail.com>2013-07-19 13:46:37 +0200
commit7761fa687a2380716849d49b6520dd2a1f952c40 (patch)
treeda1dceafeafbec67be9097daa7fcc5ab4ab59d92 /tests/codeigniter
parent279c76cb3565672594c4e18dd070cb1e1fe38db9 (diff)
Proper directory_map test skip
* added the needed trailing backslash * use is_dir() instead of opendir() as it doesn't throw error on failure
Diffstat (limited to 'tests/codeigniter')
-rw-r--r--tests/codeigniter/helpers/directory_helper_test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/codeigniter/helpers/directory_helper_test.php b/tests/codeigniter/helpers/directory_helper_test.php
index d86047349..66e66d269 100644
--- a/tests/codeigniter/helpers/directory_helper_test.php
+++ b/tests/codeigniter/helpers/directory_helper_test.php
@@ -28,8 +28,8 @@ class Directory_helper_test extends CI_TestCase {
vfsStream::create($structure, $this->_test_dir);
- // opendir() seems to fail on Windows + vfsStream when there are trailing slashes in directory names
- if ( ! @opendir(vfsStream::url('testDir')))
+ // is_dir(), opendir(), etc. seem to fail on Windows + vfsStream when there are trailing backslashes in directory names
+ if (DIRECTORY_SEPARATOR === '\\' && ! is_dir(vfsStream::url('testDir').'\\'))
{
$this->markTestSkipped();
return;