summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-03-30 10:52:25 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-03-30 10:54:03 +0200
commitb9b49cfb7b88e0d95d91ea82b75b2b19ca88331a (patch)
treefe10d76cadb87c10caf8d41f7611003f8c4a36d5
parenta2f8c78183a5911bc5a923956ff531b6d27cff2a (diff)
downloadphp-git-b9b49cfb7b88e0d95d91ea82b75b2b19ca88331a.tar.gz
Don't check directory nlink in stat tests
It seems like on many filesystems nlink for directories is the number of subdirectories (plus two, due to . and ..). However, this is not a POSIX requirement, and some filesystems don't implement it this way. This seems to be the case for whatever is used on the Travis AArch64 builders now.
-rw-r--r--ext/standard/tests/file/lstat_stat_variation8.phpt4
-rw-r--r--ext/standard/tests/file/lstat_stat_variation9.phpt67
2 files changed, 2 insertions, 69 deletions
diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt
index db7f87f7f7..5dc45e02f5 100644
--- a/ext/standard/tests/file/lstat_stat_variation8.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation8.phpt
@@ -39,8 +39,8 @@ $new_stat = stat($dirname);
// compare self stats
var_dump( compare_self_stat($old_stat) );
var_dump( compare_self_stat($new_stat) );
-// compare the stats
-$affected_members = array(3, 9, 10, 'nlink', 'mtime', 'ctime');
+// compare the stat
+$affected_members = array(9, 10, 'mtime', 'ctime');
clearstatcache();
var_dump(compare_stats($old_stat, $new_stat, $affected_members, "<"));
diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt
deleted file mode 100644
index a73b126174..0000000000
--- a/ext/standard/tests/file/lstat_stat_variation9.phpt
+++ /dev/null
@@ -1,67 +0,0 @@
---TEST--
-Test lstat() and stat() functions: usage variations - deleting file/subdir
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
-}
-?>
---FILE--
-<?php
-/* Prototype: array lstat ( string $filename );
- Description: Gives information about a file or symbolic link
-
- Prototype: array stat ( string $filename );
- Description: Gives information about a file
-*/
-
-$file_path = __DIR__;
-require "$file_path/file.inc";
-
-/* test the effects on stats by deleting file/subdir from a dir
-*/
-
-echo "*** Testing stat() for comparing stats after the deletion of subdir and file ***\n";
-
-/* first create the dir/subdir and files, record the stat */
-@rmdir("$file_path/lstat_stat_variation9/"); // ensure that dir doesn't exists
-mkdir("$file_path/lstat_stat_variation9/"); // temp dir
-
-// creating and deleting subdir and files in the dir
-$dirname = "$file_path/lstat_stat_variation9";
-@rmdir("$dirname/lstat_stat_variation9_subdir"); // ensure that dir doesn't exists
-mkdir("$dirname/lstat_stat_variation9_subdir");
-$file_handle = fopen("$dirname/lstat_stat_variation9a.tmp", "w");
-fclose($file_handle);
-
-$old_stat = stat($dirname);
-
-/* now delete the surdir and file and record the stat */
-unlink("$dirname/lstat_stat_variation9a.tmp");
-rmdir("$dirname/lstat_stat_variation9_subdir");
-
-// comparing stats after the deletion of subdir and file
-$new_stat = stat($dirname);
-// compare self stats
-var_dump( compare_self_stat($old_stat) );
-var_dump( compare_self_stat($new_stat) );
-
-// compare the stats
-$affected_members = array(3, 'nlink');
-var_dump(compare_stats($old_stat, $new_stat, $affected_members, ">"));
-
-echo "\n--- Done ---";
-?>
---CLEAN--
-<?php
-$file_path = __DIR__;
-$dirname = "$file_path/lstat_stat_variation9";
-rmdir($dirname);
-?>
---EXPECT--
-*** Testing stat() for comparing stats after the deletion of subdir and file ***
-bool(true)
-bool(true)
-bool(true)
-
---- Done ---