Mercurial > hg > toybox
changeset 451:f4cc0a2aa440
Add tests for head
This exposed one issue in head.c -- printf was not flushing and
file names could appear after file contents instead of before.
The issue is fixed by calling xflush after xprintf.
| author | Timothy Elliott <tle@holymonkey.com> |
|---|---|
| date | Fri, 10 Feb 2012 21:59:57 -0800 |
| parents | d8ff3b0980cf |
| children | e708e8933a50 |
| files | scripts/test/head.test toys/head.c |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/test/head.test Fri Feb 10 21:59:57 2012 -0800 @@ -0,0 +1,17 @@ +#!/bin/bash + +[ -f testing.sh ] && . testing.sh + +#testing "name" "command" "result" "infile" "stdin" + +testing "head, stdin" "head -n 1 && echo yes" "one\nyes\n" "" "one\ntwo" +testing "head, stdin via -" "head -n 1 - && echo yes" "one\nyes\n" "" "one\ntwo" +testing "head, file" "head input -n 1 && echo yes" "one\nyes\n" "one\ntwo" "" +testing "head, default lines" "head" "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" "" "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12" + +echo "foo +bar +baz" > file1 +testing "head, multiple files" "head -n 2 input file1" "==> input <==\none\ntwo\n\n==> file1 <==\nfoo\nbar\n" "one\ntwo\nthree\n" "" +rm file1 +
--- a/toys/head.c Sat Feb 11 13:42:24 2012 -0600 +++ b/toys/head.c Fri Feb 10 21:59:57 2012 -0800 @@ -35,8 +35,9 @@ if (toys.optc > 1) { // Print an extra newline for all but the first file - if (TT.file_no++) printf("\n"); + if (TT.file_no++) xprintf("\n"); xprintf("==> %s <==\n", name); + xflush(); } while (lines) {