summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-07-19 21:49:39 +0200
committerAndrey Andreev <narf@devilix.net>2013-07-19 21:49:39 +0200
commit3d3e250e40e2f844424a7984488f6dd89495fa5f (patch)
tree2c2054d6ad136d36bd4f0d67891416c1b2bf0779 /tests/codeigniter/helpers
parentfbb980aac1b6da9d644551af96294566b6b1820a (diff)
parent69088d8796457d083c3920361732ae5a7fe50902 (diff)
Merge pull request #2541 from vlakoff/develop-4
Proper directory_map test skip
Diffstat (limited to 'tests/codeigniter/helpers')
-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..de72dee78 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 ( ! is_dir(vfsStream::url('testDir').DIRECTORY_SEPARATOR))
{
$this->markTestSkipped();
return;