From 471d0645dcfeaccbf8ae1d603286e10691d89165 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 26 Oct 2015 03:15:06 +0000 Subject: MFC r282339,r282341: r282339 (by bapt): Add regression test about reverse line feed to col(1) r282341 (by bapt): Actually push the right tests --- etc/mtree/BSD.tests.dist | 2 ++ usr.bin/col/Makefile | 6 ++++++ usr.bin/col/tests/Makefile | 11 +++++++++++ usr.bin/col/tests/col.sh | 33 +++++++++++++++++++++++++++++++++ usr.bin/col/tests/rlf.in | 2 ++ usr.bin/col/tests/rlf2.in | 2 ++ 6 files changed, 56 insertions(+) create mode 100644 usr.bin/col/tests/Makefile create mode 100755 usr.bin/col/tests/col.sh create mode 100644 usr.bin/col/tests/rlf.in create mode 100644 usr.bin/col/tests/rlf2.in diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 63fa2a5..57fcb61 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -340,6 +340,8 @@ .. cmp .. + col + .. comm .. cut diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile index 8e3a959..d5c63e1 100644 --- a/usr.bin/col/Makefile +++ b/usr.bin/col/Makefile @@ -1,6 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PROG= col +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/usr.bin/col/tests/Makefile b/usr.bin/col/tests/Makefile new file mode 100644 index 0000000..43838e9 --- /dev/null +++ b/usr.bin/col/tests/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/col + +ATF_TESTS_SH= col + +FILES= rlf.in \ + rlf2.in +FILESDIR= ${TESTSDIR} + +.include diff --git a/usr.bin/col/tests/col.sh b/usr.bin/col/tests/col.sh new file mode 100755 index 0000000..c072aab --- /dev/null +++ b/usr.bin/col/tests/col.sh @@ -0,0 +1,33 @@ +# $FreeBSD$ + +atf_test_case rlf + +rlf_head() +{ + atf_set "descr" "testing reverse line feed" +} +rlf_body() +{ + atf_check \ + -o inline:"a b\n" \ + -e empty \ + -s exit:0 \ + col < $(atf_get_srcdir)/rlf.in + + atf_check \ + -o inline:"a b\n" \ + -e empty \ + -s exit:0 \ + col < $(atf_get_srcdir)/rlf2.in + + atf_check \ + -o inline:"a b\n" \ + -e empty \ + -s exit:0 \ + col -x < $(atf_get_srcdir)/rlf2.in +} + +atf_init_test_cases() +{ + atf_add_test_case rlf +} diff --git a/usr.bin/col/tests/rlf.in b/usr.bin/col/tests/rlf.in new file mode 100644 index 0000000..57a14e5 --- /dev/null +++ b/usr.bin/col/tests/rlf.in @@ -0,0 +1,2 @@ +a + 7b diff --git a/usr.bin/col/tests/rlf2.in b/usr.bin/col/tests/rlf2.in new file mode 100644 index 0000000..dd46851 --- /dev/null +++ b/usr.bin/col/tests/rlf2.in @@ -0,0 +1,2 @@ +a + 7b -- cgit v1.1