Author: ngie
Date: Mon Oct 26 03:15:06 2015
New Revision: 289981
URL: https://svnweb.freebsd.org/changeset/base/289981

Log:
  MFC r282339,r282341:
  
  r282339 (by bapt):
  
  Add regression test about reverse line feed to col(1)
  
  r282341 (by bapt):
  
  Actually push the right tests

Added:
  stable/10/usr.bin/col/tests/
     - copied from r282339, head/usr.bin/col/tests/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/usr.bin/col/Makefile
  stable/10/usr.bin/col/tests/col.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist  Mon Oct 26 02:21:32 2015        
(r289980)
+++ stable/10/etc/mtree/BSD.tests.dist  Mon Oct 26 03:15:06 2015        
(r289981)
@@ -340,6 +340,8 @@
         ..
         cmp
         ..
+        col
+        ..
         comm
         ..
         cut

Modified: stable/10/usr.bin/col/Makefile
==============================================================================
--- stable/10/usr.bin/col/Makefile      Mon Oct 26 02:21:32 2015        
(r289980)
+++ stable/10/usr.bin/col/Makefile      Mon Oct 26 03:15:06 2015        
(r289981)
@@ -1,6 +1,12 @@
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=  col
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=       tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/col/tests/col.sh
==============================================================================
--- head/usr.bin/col/tests/col.sh       Sat May  2 12:08:28 2015        
(r282339)
+++ stable/10/usr.bin/col/tests/col.sh  Mon Oct 26 03:15:06 2015        
(r289981)
@@ -15,22 +15,16 @@ rlf_body()
                col < $(atf_get_srcdir)/rlf.in
 
        atf_check \
-               -o inline:"a    b3\n" \
+               -o inline:"a    b\n" \
                -e empty \
                -s exit:0 \
                col < $(atf_get_srcdir)/rlf2.in
 
        atf_check \
-               -o inline:"a       b3\n" \
+               -o inline:"a       b\n" \
                -e empty \
                -s exit:0 \
                col -x < $(atf_get_srcdir)/rlf2.in
-
-       atf_check \
-               -o inline:"a    b3\n" \
-               -e empty \
-               -s exit:0 \
-               col -p < $(atf_get_srcdir)/rlf2.in
 }
 
 atf_init_test_cases()
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to