diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-17 01:03:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-17 01:06:20 -0700 |
| commit | af5e2eaf8d1ea57e5961993553170ee00268fe26 (patch) | |
| tree | 938f83337bcf8209e8e88334dd13bbd92db5d361 /ext/standard/tests/file/mkdir-002.phpt | |
| parent | a080611e484aa56e3be6ab038221ab3304c125b1 (diff) | |
| download | php-git-af5e2eaf8d1ea57e5961993553170ee00268fe26.tar.gz | |
Merge branch 'pull-request/320'
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572: Clean up after the test
Fix #64572: Clean up after the test
Diffstat (limited to 'ext/standard/tests/file/mkdir-002.phpt')
| -rw-r--r-- | ext/standard/tests/file/mkdir-002.phpt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt index ccfd6c3d74..d149098df0 100644 --- a/ext/standard/tests/file/mkdir-002.phpt +++ b/ext/standard/tests/file/mkdir-002.phpt @@ -9,24 +9,24 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php -var_dump(mkdir("testdir", 0777)); -var_dump(mkdir("testdir/subdir", 0777)); -var_dump(`ls -l testdir`); -var_dump(rmdir("testdir/subdir")); -var_dump(rmdir("testdir")); +var_dump(mkdir("mkdir-002", 0777)); +var_dump(mkdir("mkdir-002/subdir", 0777)); +var_dump(`ls -l mkdir-002`); +var_dump(rmdir("mkdir-002/subdir")); +var_dump(rmdir("mkdir-002")); -var_dump(mkdir("./testdir", 0777)); -var_dump(mkdir("./testdir/subdir", 0777)); -var_dump(`ls -l ./testdir`); -var_dump(rmdir("./testdir/subdir")); -var_dump(rmdir("./testdir")); +var_dump(mkdir("./mkdir-002", 0777)); +var_dump(mkdir("./mkdir-002/subdir", 0777)); +var_dump(`ls -l ./mkdir-002`); +var_dump(rmdir("./mkdir-002/subdir")); +var_dump(rmdir("./mkdir-002")); -var_dump(mkdir(dirname(__FILE__)."/testdir", 0777)); -var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777)); -$dirname = dirname(__FILE__)."/testdir"; +var_dump(mkdir(dirname(__FILE__)."/mkdir-002", 0777)); +var_dump(mkdir(dirname(__FILE__)."/mkdir-002/subdir", 0777)); +$dirname = dirname(__FILE__)."/mkdir-002"; var_dump(`ls -l $dirname`); -var_dump(rmdir(dirname(__FILE__)."/testdir/subdir")); -var_dump(rmdir(dirname(__FILE__)."/testdir")); +var_dump(rmdir(dirname(__FILE__)."/mkdir-002/subdir")); +var_dump(rmdir(dirname(__FILE__)."/mkdir-002")); echo "Done\n"; ?> |