Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip large ftruncate test if large files not supported
  Don't test "blocks" in lstat_stat_variation7.phpt
  Increase FD used in php://fd test
  Use posix_getuid() to check for root in pcntl_setpriority() test

4 files changed, 19 insertions, 10 deletions

diff --git a/ext/pcntl/tests/pcntl_setpriority_basic.phpt b/ext/pcntl/tests/pcntl_setpriority_basic.phpt
index 1f03fb2dc9..235b0ec9ce 100644
--- a/ext/pcntl/tests/pcntl_setpriority_basic.phpt
+++ b/ext/pcntl/tests/pcntl_setpriority_basic.phpt
@@ -5,14 +5,14 @@ Er Galvão Abbott galvao@galvao.eti.br
 # TestFest 2017 PHPRS PHP UG 2017-10-31
 --SKIPIF--
 <?php
-if (!isset($_SERVER['SUDO_USER'])) {
-    die('skip - this functions needs to run with superuser');
-}
-
 if (!extension_loaded('pcntl')) {
-    die('skip - ext/pcntl not loaded');
-} else if (!function_exists('pcntl_setpriority')) {
-    die('skip - pcntl_setpriority doesn\'t exist');
+    die('skip ext/pcntl not loaded');
+}
+if (!function_exists('pcntl_setpriority')) {
+    die('skip pcntl_setpriority doesn\'t exist');
+}
+if (!function_exists('posix_getuid') || posix_getuid() !== 0) {
+    die('skip this functions needs to run with superuser');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/ftruncate_bug76422.phpt b/ext/standard/tests/file/ftruncate_bug76422.phpt
index 4f434d324a..77334545a9 100644
--- a/ext/standard/tests/file/ftruncate_bug76422.phpt
+++ b/ext/standard/tests/file/ftruncate_bug76422.phpt
@@ -17,6 +17,15 @@ if (false === $file_handle) {
     die('Cannot open test file :/');
 }
 
+/* Check if ftruncate() with 2GB works. If it doesn't, it's likely that large files are
+ * generally not supported (EFBIG). */
+$truncate_offset = 2 * 1024 * 1024 * 1024;
+$ftruncate_result = ftruncate($file_handle, $truncate_offset);
+if (false === $ftruncate_result) {
+    var_dump(true);
+    return;
+}
+
 $truncate_offset = 4 * 1024 * 1024 * 1024 + 1;
 $ftruncate_result = ftruncate($file_handle, $truncate_offset);
 
diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt
index b74dff63f7..1ec0999f6c 100644
--- a/ext/standard/tests/file/lstat_stat_variation7.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation7.phpt
@@ -36,7 +36,7 @@ $new_stat = stat($file_name);
 var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 // compare the stats
-$comp_arr = array(7, 12, 'size', 'blocks');
+$comp_arr = array(7, 'size');
 var_dump(compare_stats($old_stat, $new_stat, $comp_arr, "<"));
 clearstatcache();
 
diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt
index 2b3a69ce1a..76a1e609bc 100644
--- a/ext/standard/tests/file/php_fd_wrapper_04.phpt
+++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt
@@ -2,10 +2,10 @@
 php://fd wrapper: invalid file descriptor
 --FILE--
 <?php
-fopen("php://fd/12", "w");
+fopen("php://fd/120", "w");
 
 echo "\nDone.\n";
 --EXPECTF--
-Warning: fopen(php://fd/12): failed to open stream: Error duping file descriptor 12; possibly it doesn't exist: [9]: %s in %s on line %d
+Warning: fopen(php://fd/120): failed to open stream: Error duping file descriptor 120; possibly it doesn't exist: [9]: %s in %s on line %d
 
 Done.