From dd1d1191e1e4f7954cb220d1632f64abec6528d6 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 15 Jul 2020 13:19:27 +0200 Subject: Fix tests regarding negative fileinode() The results of `fileinode()` may be negative due to wrap-around behavior (at least on Windows as of PHP 7.4.0). --- ext/standard/tests/file/fileinode_basic.phpt | 8 +++---- ext/standard/tests/file/fileinode_variation.phpt | 28 ++++++++++++------------ ext/standard/tests/file/filestat.phpt | 6 ++--- ext/standard/tests/file/tempnam_variation1.phpt | 20 ++++++++--------- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'ext/standard/tests/file') diff --git a/ext/standard/tests/file/fileinode_basic.phpt b/ext/standard/tests/file/fileinode_basic.phpt index dfcabe16bb..c468d2025f 100644 --- a/ext/standard/tests/file/fileinode_basic.phpt +++ b/ext/standard/tests/file/fileinode_basic.phpt @@ -28,9 +28,9 @@ unlink (__DIR__."/inode.tmp"); ?> --EXPECTF-- *** Testing fileinode() with file, directory *** -%d -%d -%d -%d +%i +%i +%i +%i *** Done *** diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 4006d94ffa..d8f59faefc 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -89,24 +89,24 @@ echo "\n*** Done ***"; --EXPECTF-- *** Testing fileinode() with files, links and directories *** -- Testing with files -- -%d -%d +%i +%i -- Testing with links: hard link -- -%d -%d +%i +%i -- Testing with links: soft link -- -%d -%d +%i +%i -- Testing after copying a file -- -%d -%d +%i +%i -- Testing after renaming the file -- -%d -%d +%i +%i -- Testing with directories -- -%d -%d +%i +%i -- Testing with binary input -- -%d -%d +%i +%i *** Done *** diff --git a/ext/standard/tests/file/filestat.phpt b/ext/standard/tests/file/filestat.phpt index f6031219c7..f7de4fc435 100644 --- a/ext/standard/tests/file/filestat.phpt +++ b/ext/standard/tests/file/filestat.phpt @@ -30,17 +30,17 @@ var_dump(filectime("/no/such/file/or/dir")); echo "Done\n"; ?> --EXPECTF-- +int(%i) int(%d) int(%d) int(%d) int(%d) +int(%i) int(%d) int(%d) int(%d) int(%d) -int(%d) -int(%d) -int(%d) +int(%i) int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt index 762b4eab73..ecfae4a167 100644 --- a/ext/standard/tests/file/tempnam_variation1.phpt +++ b/ext/standard/tests/file/tempnam_variation1.phpt @@ -66,51 +66,51 @@ echo "*** Done ***\n"; -- Iteration 1 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 2 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 3 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 4 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 5 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 6 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 7 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 8 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 9 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified -- Iteration 10 -- File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 -File inode is => %d +File inode is => %i File created in => directory specified *** Done *** -- cgit v1.2.1