From dd70abe1909482af69e8f596fe7afc3f4ccf9eb7 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 23 Sep 2020 15:34:17 +0200 Subject: [PATCH 1/3] Fix #64060: Test lstat_stat_variation7 incorrectly fails on certain file systems --- ext/standard/tests/file/lstat_stat_variation7.phpt | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index fab011dd20ad5..a5128606f4a5b 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -18,6 +18,7 @@ $old_stat = stat($file_name); clearstatcache(); $blksize = PHP_OS_FAMILY === 'Windows' ? 4096 : $old_stat['blksize']; fwrite($fh, str_repeat("Hello World", $blksize)); +fclose($fh); $new_stat = stat($file_name); // compare self stats From 0931f9aeaf6adae0bf516b1e58540cb7eceb94d8 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 25 Sep 2020 10:30:24 +0200 Subject: [PATCH 2/3] Revert "Don't test "blocks" in lstat_stat_variation7.phpt" This reverts commit 6aa6d70e9d24d45d75670a2f78763f95681d0147. --- ext/standard/tests/file/lstat_stat_variation7.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index a5128606f4a5b..7f539768bbe61 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -25,7 +25,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, 'size'); +$comp_arr = array(7, 12, 'size', 'blocks'); var_dump(compare_stats($old_stat, $new_stat, $comp_arr, "<")); clearstatcache(); From 78d92e74fe93f10bdf75362a1ae09e9e5330d0f4 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 25 Sep 2020 10:31:59 +0200 Subject: [PATCH 3/3] Enable regular arm64 job for Travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34d2f2b74a271..dc2affa8996e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,6 @@ jobs: arch: amd64 - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1 arch: arm64 - if: type = cron - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1 arch: s390x if: type = cron