diff options
| author | Karel Zak | 2016-11-04 11:23:39 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-11-09 10:02:32 +0100 |
| commit | 2b68dc7d0dcb84efb5a0c976665569752171d055 (patch) | |
| tree | 32e280ff6d8650bb351873f9024982d19b902518 /tests/ts/lsmem | |
| parent | lsmem: add missing placeholders (diff) | |
| download | kernel-qcow2-util-linux-2b68dc7d0dcb84efb5a0c976665569752171d055.tar.gz kernel-qcow2-util-linux-2b68dc7d0dcb84efb5a0c976665569752171d055.tar.xz kernel-qcow2-util-linux-2b68dc7d0dcb84efb5a0c976665569752171d055.zip | |
tests: cleanup and update lsmem
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/lsmem')
| -rwxr-xr-x | tests/ts/lsmem/lsmem | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem index 7e6e2f959..79c0523b9 100755 --- a/tests/ts/lsmem/lsmem +++ b/tests/ts/lsmem/lsmem @@ -22,6 +22,18 @@ ts_init "$*" ts_check_test_command "$TS_CMD_LSMEM" +LSCOLUMNS="RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE" + + +function do_lsmem { + local opts="$*" + + echo -e "\n---\n" >>${TS_OUTPUT} + echo "\$ lsmem $opts" >>${TS_OUTPUT} + ${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >>${TS_OUTPUT} 2>&1 + +} + for dump in $(ls $TS_SELF/dumps/*.tar.bz2 | sort); do name=$(basename $dump .tar.bz2) dumpdir="$TS_OUTDIR/dumps" @@ -31,20 +43,12 @@ for dump in $(ls $TS_SELF/dumps/*.tar.bz2 | sort); do tar -C $dumpdir -jxf $dump - echo ">lsmem" >>"${TS_OUTPUT}" - "${TS_CMD_LSMEM}" -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1 - - echo >>"${TS_OUTPUT}" - echo ">lsmem -a" >>"${TS_OUTPUT}" - "${TS_CMD_LSMEM}" -a -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1 - - echo >>"${TS_OUTPUT}" - echo ">lsmem -e" >>"${TS_OUTPUT}" - "${TS_CMD_LSMEM}" -e -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1 - - echo >>"${TS_OUTPUT}" - echo ">lsmem -p -a" >>"${TS_OUTPUT}" - "${TS_CMD_LSMEM}" -p -a -s "${dumpdir}/${name}" >>"${TS_OUTPUT}" 2>&1 + do_lsmem + do_lsmem --output RANGE,SIZE + do_lsmem --output RANGE,SIZE,STATE + do_lsmem --all --output $LSCOLUMNS + do_lsmem --raw --output $LSCOLUMNS + do_lsmem --json --output $LSCOLUMNS ts_finalize_subtest done |