From: Ruediger Meier Date: Thu, 6 Apr 2017 07:56:01 +0000 (+0200) Subject: tests: remove fincore SMALLER_THAN_PAGESIZE tests X-Git-Tag: v2.30-rc1~132 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0614fe48bc7db29f204321cd18592958d673c40f;p=thirdparty%2Futil-linux.git tests: remove fincore SMALLER_THAN_PAGESIZE tests These tests failed for example on ext4 with a non-default blocksize 1024. In this case it seems that the kernel only caches a full page if we read at least PAGE_SIZE -BLOCK_SIZE +1. Both tests also failed on NFS allthough block size seems to be 1M there. We still keep the test for PAGE_SIZE-1 which seems to work more reliable. Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/fincore/count b/tests/expected/fincore/count index d5ce06259f..46651365a9 100644 --- a/tests/expected/fincore/count +++ b/tests/expected/fincore/count @@ -2,16 +2,12 @@ fincore: failed to open: no_such_file: No such file or directory return value: 1 0 0 i_EMPTY_FILE -return value: 0 - 1 2048 i_SMALLER_THAN_PAGESIZE__incore_ return value: 0 1 4095 i_PAGESIZE_-1__incore_ return value: 0 1 4096 i_JUST_PAGESIZE_incore_ return value: 0 0 4096 i_JUST_PAGESIZE_directio_ -return value: 0 - 2 4097 i_PAGESIZE_+_1__incore_ return value: 0 2 8192 i_TWO_PAGES_incore_ return value: 0 @@ -41,11 +37,9 @@ return value: 0 fincore: failed to open: no_such_file: No such file or directory PAGES SIZE FILE 0 0 i_EMPTY_FILE - 1 2048 i_SMALLER_THAN_PAGESIZE__incore_ 1 4095 i_PAGESIZE_-1__incore_ 1 4096 i_JUST_PAGESIZE_incore_ 0 4096 i_JUST_PAGESIZE_directio_ - 2 4097 i_PAGESIZE_+_1__incore_ 2 8192 i_TWO_PAGES_incore_ 0 8192 i_TWO_PAGES_directio_ 1 8192 i_TWO_PAGES_mixed_directio_incore_ diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count index 87e25a8145..8f23fece5c 100755 --- a/tests/ts/fincore/count +++ b/tests/ts/fincore/count @@ -91,10 +91,6 @@ input= run_dd_test "EMPTY FILE" 0 } >> $TS_OUTPUT 2>&1 -{ - run_dd_test "SMALLER THAN PAGESIZE (incore)" $(( PAGE_SIZE / 2 )) -} >> $TS_OUTPUT 2>&1 - { run_dd_test "PAGESIZE -1 (incore)" $(( PAGE_SIZE - 1 )) } >> $TS_OUTPUT 2>&1 @@ -107,10 +103,6 @@ input= run_dd_test "JUST PAGESIZE(directio)" $(( PAGE_SIZE )) "oflag=direct" } >> $TS_OUTPUT 2>&1 -{ - run_dd_test "PAGESIZE + 1 (incore)" $(( PAGE_SIZE + 1 )) -} >> $TS_OUTPUT 2>&1 - { run_dd_test "TWO PAGES(incore)" $(( 2 * PAGE_SIZE )) } >> $TS_OUTPUT 2>&1