ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: improve libsmartcols test 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2016-09-13 14:12:11 +02:00
parent 19055a25ed
commit a414a17093
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsmartcols/samples/fromfile.c
View File

@ -156,6 +156,7 @@ int main(int argc, char *argv[])
{ "maxout", 0, 0, 'm' },
{ "column", 1, 0, 'c' },
{ "nlines", 1, 0, 'n' },
{ "width", 1, 0, 'w' },
{ NULL, 0, 0, 0 },
};
@ -167,7 +168,7 @@ int main(int argc, char *argv[])
if (!tb)
err(EXIT_FAILURE, "failed to create output table");
while((c = getopt_long(argc, argv, "c:mn:", longopts, NULL)) != -1) {
while((c = getopt_long(argc, argv, "c:mn:w:", longopts, NULL)) != -1) {
switch(c) {
case 'c': /* add column from file */
{
@ -189,6 +190,10 @@ int main(int argc, char *argv[])
case 'n':
nlines = strtou32_or_err(optarg, "failed to parse number of lines");
break;
case 'w':
scols_table_set_termforce(tb, SCOLS_TERMFORCE_ALWAYS);
scols_table_set_termwidth(tb, strtou32_or_err(optarg, "failed to parse terminal width"));
break;
default:
err(EXIT_FAILURE, "%s [-r|--random]\n", program_invocation_short_name);
}

11
tests/expected/libsmartcols/fromfile-right-maxout Normal file
View File

@ -0,0 +1,11 @@
NAME NUM
aaaa 0
bbb 100
ccccc 21
dddddd 3
ee 411
ffff 5111
gggggg 678993321
hhh 7666666
iiiiii 8765
jj 987456

9
tests/ts/libsmartcols/fromfile
View File

@ -35,6 +35,15 @@ $TESTPROG --nlines 10 \
>> $TS_OUTPUT 2>&1
ts_finalize_subtest
ts_init_subtest "right-maxout"
$TESTPROG --nlines 10 --maxout --width 80\
--column $TS_SELF/files/col-name \
--column $TS_SELF/files/col-number \
$TS_SELF/files/data-string \
$TS_SELF/files/data-number \
>> $TS_OUTPUT 2>&1
ts_finalize_subtest
ts_init_subtest "wrapnl"
$TESTPROG --nlines 10 \
--column $TS_SELF/files/col-name \