tests: update lsmem

* add --split

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

diff --git a/tests/expected/lsmem/lsmem-s390-zvm-6g b/tests/expected/lsmem/lsmem-s390-zvm-6g
index 9f4c805ad0a6203912878644c6d22e41f73f17c1..02a9ddc9ac00a6b565ed3f3158edbf58243b8b7d 100644 (file)
--- a/tests/expected/lsmem/lsmem-s390-zvm-6g
+++ b/tests/expected/lsmem/lsmem-s390-zvm-6g
@@ -1,7 +1,7 @@
 
 ---
 
-$ lsmem 
+$ lsmem --split=STATE,REMOVABLE
 RANGE                                  SIZE   STATE REMOVABLE BLOCK
 0x0000000000000000-0x000000006fffffff  1.8G  online       yes   0-6
 0x0000000070000000-0x000000007fffffff  256M  online        no     7
@@ -20,7 +20,7 @@ Total offline memory:    1.3G
 
 ---
 
-$ lsmem --output RANGE,SIZE
+$ lsmem --output RANGE,SIZE --split none
 RANGE                                 SIZE
 0x0000000000000000-0x000000017fffffff   6G
 
@@ -30,7 +30,7 @@ Total offline memory:      0B
 
 ---
 
-$ lsmem --output RANGE,SIZE,STATE
+$ lsmem --output RANGE,SIZE,STATE --split STATE
 RANGE                                  SIZE   STATE
 0x0000000000000000-0x00000000dfffffff  3.5G  online
 0x00000000e0000000-0x00000000efffffff  256M offline
@@ -76,7 +76,7 @@ Total offline memory:    1.3G
 
 ---
 
-$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
 RANGE SIZE STATE REMOVABLE BLOCK NODE
 0x0000000000000000-0x000000006fffffff 1.8G online yes 0-6 0
 0x0000000070000000-0x000000007fffffff 256M online no 7 0
@@ -91,7 +91,7 @@ RANGE SIZE STATE REMOVABLE BLOCK NODE
 
 ---
 
-$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
 {
    "memory": [
       {"range": "0x0000000000000000-0x000000006fffffff", "size": "1.8G", "state": "online", "removable": "yes", "block": "0-6", "node": "0"},
@@ -127,3 +127,24 @@ RANGE                                  SIZE   STATE REMOVABLE BLOCK          ZON
 Memory block size:       256M
 Total online memory:     4.8G
 Total offline memory:    1.3G
+
+---
+
+$ lsmem 
+RANGE                                  SIZE   STATE REMOVABLE BLOCK
+0x0000000000000000-0x000000006fffffff  1.8G  online       yes   0-6
+0x0000000070000000-0x000000007fffffff  256M  online        no     7
+0x0000000080000000-0x000000009fffffff  512M  online       yes   8-9
+0x00000000a0000000-0x00000000bfffffff  512M  online        no 10-11
+0x00000000c0000000-0x00000000dfffffff  512M  online       yes 12-13
+0x00000000e0000000-0x00000000efffffff  256M offline         -    14
+0x00000000f0000000-0x00000000ffffffff  256M  online       yes    15
+0x0000000100000000-0x000000010fffffff  256M  online        no    16
+0x0000000110000000-0x000000011fffffff  256M  online        no    17
+0x0000000120000000-0x000000012fffffff  256M  online       yes    18
+0x0000000130000000-0x000000013fffffff  256M  online       yes    19
+0x0000000140000000-0x000000017fffffff    1G offline         - 20-23
+
+Memory block size:       256M
+Total online memory:     4.8G
+Total offline memory:    1.3G

diff --git a/tests/expected/lsmem/lsmem-x86_64-16g b/tests/expected/lsmem/lsmem-x86_64-16g
index 40316a584518e32fd8d42e2fc1a22dde01d04bd8..7392ab77c1c9db24c73ea9e6d8c8a13754c8446a 100644 (file)
--- a/tests/expected/lsmem/lsmem-x86_64-16g
+++ b/tests/expected/lsmem/lsmem-x86_64-16g
@@ -1,7 +1,7 @@
 
 ---
 
-$ lsmem 
+$ lsmem --split=STATE,REMOVABLE
 RANGE                                  SIZE  STATE REMOVABLE   BLOCK
 0x0000000000000000-0x0000000007ffffff  128M online        no       0
 0x0000000008000000-0x0000000037ffffff  768M online       yes     1-6
@@ -40,7 +40,7 @@ Total offline memory:      0B
 
 ---
 
-$ lsmem --output RANGE,SIZE
+$ lsmem --output RANGE,SIZE --split none
 RANGE                                 SIZE
 0x0000000000000000-0x00000000bfffffff   3G
 0x0000000100000000-0x000000043fffffff  13G
@@ -51,7 +51,7 @@ Total offline memory:      0B
 
 ---
 
-$ lsmem --output RANGE,SIZE,STATE
+$ lsmem --output RANGE,SIZE,STATE --split STATE
 RANGE                                 SIZE  STATE
 0x0000000000000000-0x00000000bfffffff   3G online
 0x0000000100000000-0x000000043fffffff  13G online
@@ -199,7 +199,7 @@ Total offline memory:      0B
 
 ---
 
-$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
 RANGE SIZE STATE REMOVABLE BLOCK NODE
 0x0000000000000000-0x0000000007ffffff 128M online no 0 0
 0x0000000008000000-0x0000000037ffffff 768M online yes 1-6 0
@@ -234,7 +234,7 @@ RANGE SIZE STATE REMOVABLE BLOCK NODE
 
 ---
 
-$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
 {
    "memory": [
       {"range": "0x0000000000000000-0x0000000007ffffff", "size": "128M", "state": "online", "removable": "no", "block": "0", "node": "0"},
@@ -308,3 +308,42 @@ RANGE                                  SIZE  STATE REMOVABLE   BLOCK  ZONES
 Memory block size:       128M
 Total online memory:      16G
 Total offline memory:      0B
+
+---
+
+$ lsmem 
+RANGE                                  SIZE  STATE REMOVABLE   BLOCK
+0x0000000000000000-0x0000000007ffffff  128M online        no       0
+0x0000000008000000-0x0000000037ffffff  768M online       yes     1-6
+0x0000000038000000-0x000000003fffffff  128M online        no       7
+0x0000000040000000-0x0000000077ffffff  896M online       yes    8-14
+0x0000000078000000-0x000000007fffffff  128M online        no      15
+0x0000000080000000-0x00000000afffffff  768M online       yes   16-21
+0x00000000b0000000-0x00000000bfffffff  256M online        no   22-23
+0x0000000100000000-0x00000001a7ffffff  2.6G online        no   32-52
+0x00000001a8000000-0x00000001afffffff  128M online       yes      53
+0x00000001b0000000-0x00000001bfffffff  256M online        no   54-55
+0x00000001c0000000-0x00000001ffffffff    1G online       yes   56-63
+0x0000000200000000-0x0000000207ffffff  128M online        no      64
+0x0000000208000000-0x000000021fffffff  384M online       yes   65-67
+0x0000000220000000-0x0000000237ffffff  384M online        no   68-70
+0x0000000238000000-0x0000000277ffffff    1G online       yes   71-78
+0x0000000278000000-0x000000028fffffff  384M online        no   79-81
+0x0000000290000000-0x0000000297ffffff  128M online       yes      82
+0x0000000298000000-0x00000002a7ffffff  256M online        no   83-84
+0x00000002a8000000-0x00000002c7ffffff  512M online       yes   85-88
+0x00000002c8000000-0x00000002dfffffff  384M online        no   89-91
+0x00000002e0000000-0x00000002efffffff  256M online       yes   92-93
+0x00000002f0000000-0x000000034fffffff  1.5G online        no  94-105
+0x0000000350000000-0x0000000357ffffff  128M online       yes     106
+0x0000000358000000-0x000000036fffffff  384M online        no 107-109
+0x0000000370000000-0x0000000377ffffff  128M online       yes     110
+0x0000000378000000-0x00000003c7ffffff  1.3G online        no 111-120
+0x00000003c8000000-0x00000003e7ffffff  512M online       yes 121-124
+0x00000003e8000000-0x000000042fffffff  1.1G online        no 125-133
+0x0000000430000000-0x0000000437ffffff  128M online       yes     134
+0x0000000438000000-0x000000043fffffff  128M online        no     135
+
+Memory block size:       128M
+Total online memory:      16G
+Total offline memory:      0B

diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem
index b1313773e2128933cd5f795b0ae17c331650afcb..f1a643f85d0a12ca9d33114d631ba0cb14b1f24b 100755 (executable)
--- a/tests/ts/lsmem/lsmem
+++ b/tests/ts/lsmem/lsmem
@@ -43,13 +43,14 @@ for dump in $(ls $TS_SELF/dumps/*.tar.bz2 | sort); do
 
        tar -C $dumpdir -jxf $dump
 
-       do_lsmem
-       do_lsmem --output RANGE,SIZE
-       do_lsmem --output RANGE,SIZE,STATE
+       do_lsmem --split=STATE,REMOVABLE
+       do_lsmem --output RANGE,SIZE --split none
+       do_lsmem --output RANGE,SIZE,STATE --split STATE
        do_lsmem --all --output $LSCOLUMNS
-       do_lsmem --raw --output $LSCOLUMNS
-       do_lsmem --json --output $LSCOLUMNS
+       do_lsmem --raw --output $LSCOLUMNS --split $LSCOLUMNS
+       do_lsmem --json --output $LSCOLUMNS --split $LSCOLUMNS
        do_lsmem -o +ZONES
+       do_lsmem
 
        ts_finalize_subtest
 done