tests: refresh fincore test

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/fincore/count b/tests/expected/fincore/count
index 0ee335e913a91cdae56dbd6bd983180695bdbcd8..d5ce06259fbe06508a03896cfd0df4df4b5b62cc 100644 (file)
--- a/tests/expected/fincore/count
+++ b/tests/expected/fincore/count
@@ -1,62 +1,61 @@
 [ NO EXCITING FILE ]
 fincore: failed to open: no_such_file: No such file or directory
-failed     -1         no_such_file
 return value: 1
-0          0          i_EMPTY_FILE
+    0    0 i_EMPTY_FILE
 return value: 0
-1          2048       i_SMALLER_THAN_PAGESIZE__incore_
+    1  2048 i_SMALLER_THAN_PAGESIZE__incore_
 return value: 0
-1          4095       i_PAGESIZE_-1__incore_
+    1  4095 i_PAGESIZE_-1__incore_
 return value: 0
-1          4096       i_JUST_PAGESIZE_incore_
+    1  4096 i_JUST_PAGESIZE_incore_
 return value: 0
-0          4096       i_JUST_PAGESIZE_directio_
+    0  4096 i_JUST_PAGESIZE_directio_
 return value: 0
-2          4097       i_PAGESIZE_+_1__incore_
+    2  4097 i_PAGESIZE_+_1__incore_
 return value: 0
-2          8192       i_TWO_PAGES_incore_
+    2  8192 i_TWO_PAGES_incore_
 return value: 0
-0          8192       i_TWO_PAGES_directio_
+    0  8192 i_TWO_PAGES_directio_
 return value: 0
-1          8192       i_TWO_PAGES_mixed_directio_incore_
+    1  8192 i_TWO_PAGES_mixed_directio_incore_
 return value: 0
-1          8192       i_TWO_PAGES_mixed_incore_directio_
+    1  8192 i_TWO_PAGES_mixed_incore_directio_
 return value: 0
-2          134213632  i_WINDOW_SIZE_incore-sparse-incore_
+    2 134213632 i_WINDOW_SIZE_incore-sparse-incore_
 return value: 0
-0          134213632  i_WINDOW_SIZE_directio-sparse-directio_
+    0 134213632 i_WINDOW_SIZE_directio-sparse-directio_
 return value: 0
-1          134213632  i_WINDOW_SIZE_incore-sparse-directio_
+    1 134213632 i_WINDOW_SIZE_incore-sparse-directio_
 return value: 0
-1          134213632  i_WINDOW_SIZE_directio-sparse-incore_
+    1 134213632 i_WINDOW_SIZE_directio-sparse-incore_
 return value: 0
-2          134217728  i_WINDOW_SIZE_+_1_page_incore-sparse-incore_
+    2 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-incore_
 return value: 0
-0          134217728  i_WINDOW_SIZE_+_1_page_directio-sparse-directio_
+    0 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-directio_
 return value: 0
-1          134217728  i_WINDOW_SIZE_+_1_page_incore-sparse-directio_
+    1 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-directio_
 return value: 0
-1          134217728  i_WINDOW_SIZE_+_1_page_directio-sparse-incore_
+    1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_
 return value: 0
 [ MULTIPLE FILES ]
 fincore: failed to open: no_such_file: No such file or directory
-failed     -1         no_such_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_
-1          8192       i_TWO_PAGES_mixed_incore_directio_
-2          134213632  i_WINDOW_SIZE_incore-sparse-incore_
-0          134213632  i_WINDOW_SIZE_directio-sparse-directio_
-1          134213632  i_WINDOW_SIZE_incore-sparse-directio_
-1          134213632  i_WINDOW_SIZE_directio-sparse-incore_
-2          134217728  i_WINDOW_SIZE_+_1_page_incore-sparse-incore_
-0          134217728  i_WINDOW_SIZE_+_1_page_directio-sparse-directio_
-1          134217728  i_WINDOW_SIZE_+_1_page_incore-sparse-directio_
-1          134217728  i_WINDOW_SIZE_+_1_page_directio-sparse-incore_
+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_
+    1      8192 i_TWO_PAGES_mixed_incore_directio_
+    2 134213632 i_WINDOW_SIZE_incore-sparse-incore_
+    0 134213632 i_WINDOW_SIZE_directio-sparse-directio_
+    1 134213632 i_WINDOW_SIZE_incore-sparse-directio_
+    1 134213632 i_WINDOW_SIZE_directio-sparse-incore_
+    2 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-incore_
+    0 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-directio_
+    1 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-directio_
+    1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_
 return value: 1

diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count
index 4bb891211851d00ed5401eaf55446d36a57a97ca..a3638ac88f90d5a4d691435b0ee993776913264d 100755 (executable)
--- a/tests/ts/fincore/count
+++ b/tests/ts/fincore/count
@@ -32,7 +32,7 @@ function run_dd_test
        $DD if=/dev/zero of=$input count=1 bs=$bs $flags
     fi
 
-    $TS_CMD_FINCORE $input
+    $TS_CMD_FINCORE  --bytes --noheadings $input
 
     footer "$?"
 }
@@ -51,7 +51,7 @@ function run_dd_dd_test
     $DD if=/dev/zero of=$input count=1 bs=$bs $flags0
     $DD if=/dev/zero of=$input count=1 bs=$bs $flags1
 
-    $TS_CMD_FINCORE $input
+    $TS_CMD_FINCORE --bytes --noheadings $input
 
     footer "$?"
 }
@@ -80,7 +80,7 @@ input=
     INPUT="${INPUT} ${input}"
 
     header "NO EXCITING FILE"
-    $TS_CMD_FINCORE $input
+    $TS_CMD_FINCORE --bytes --noheadings $input
     footer "$?"
 } >> $TS_OUTPUT 2>&1
 
@@ -186,7 +186,7 @@ input=
 
 {
     header "MULTIPLE FILES"
-    $TS_CMD_FINCORE $INPUT
+    $TS_CMD_FINCORE --bytes $INPUT
     footer "$?"
 } >> $TS_OUTPUT 2>&1