Module Name: src
Committed By: abhinav
Date: Sat Oct 22 14:13:39 UTC 2016
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/uniq: Makefile d_basic.in d_basic.out d_counts.out
d_input.in d_show_duplicates.out d_show_uniques.out t_uniq.sh
Log Message:
Add tests for uniq(1) based on the example test cases provided in the POSIX man
page.
Ok christos
To generate a diff of this commit:
cvs rdiff -u -r1.687 -r1.688 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.131 -r1.132 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.21 -r1.22 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/uniq/Makefile \
src/tests/usr.bin/uniq/d_basic.in src/tests/usr.bin/uniq/d_basic.out \
src/tests/usr.bin/uniq/d_counts.out src/tests/usr.bin/uniq/d_input.in \
src/tests/usr.bin/uniq/d_show_duplicates.out \
src/tests/usr.bin/uniq/d_show_uniques.out \
src/tests/usr.bin/uniq/t_uniq.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.687 src/distrib/sets/lists/tests/mi:1.688
--- src/distrib/sets/lists/tests/mi:1.687 Tue Oct 4 04:15:25 2016
+++ src/distrib/sets/lists/tests/mi Sat Oct 22 14:13:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.687 2016/10/04 04:15:25 ozaki-r Exp $
+# $NetBSD: mi,v 1.688 2016/10/22 14:13:39 abhinav Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3816,6 +3816,15 @@
./usr/tests/usr.bin/unifdef/d_basic.in tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/unifdef/d_basic.out tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/unifdef/t_basic tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/Atffile tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_basic.in tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_basic.out tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_input.in tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_counts.out tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_show_duplicates.out tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_show_uniques.out tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/t_uniq tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/vmstat tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/vmstat/Atffile tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/vmstat/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.131 src/etc/mtree/NetBSD.dist.tests:1.132
--- src/etc/mtree/NetBSD.dist.tests:1.131 Mon Sep 5 02:26:48 2016
+++ src/etc/mtree/NetBSD.dist.tests Sat Oct 22 14:13:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.131 2016/09/05 02:26:48 ozaki-r Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.132 2016/10/22 14:13:39 abhinav Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -403,6 +403,7 @@
./usr/tests/usr.bin/tmux
./usr/tests/usr.bin/tr
./usr/tests/usr.bin/unifdef
+./usr/tests/usr.bin/uniq
./usr/tests/usr.bin/vmstat
./usr/tests/usr.bin/xlint
./usr/tests/usr.bin/xlint/lint1
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.21 src/tests/usr.bin/Makefile:1.22
--- src/tests/usr.bin/Makefile:1.21 Fri Apr 8 10:09:16 2016
+++ src/tests/usr.bin/Makefile Sat Oct 22 14:13:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/04/08 10:09:16 gson Exp $
+# $NetBSD: Makefile,v 1.22 2016/10/22 14:13:39 abhinav Exp $
#
.include <bsd.own.mk>
@@ -9,6 +9,6 @@ TESTS_SUBDIRS= awk basename bzip2 cc cmp
diff dirname find gdb grep gzip id \
infocmp jot ld m4 make mkdep \
nbperf netpgpverify pr rump_server shmif_dumpbus sdiff \
- sed sort tmux tr unifdef vmstat xlint
+ sed sort tmux tr unifdef uniq vmstat xlint
.include <bsd.test.mk>
Added files:
Index: src/tests/usr.bin/uniq/Makefile
diff -u /dev/null src/tests/usr.bin/uniq/Makefile:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/Makefile Sat Oct 22 14:13:39 2016
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2016/10/22 14:13:39 abhinav Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/uniq
+TESTS_SH= t_uniq
+
+FILESDIR= ${TESTSDIR}
+FILES= d_basic.in
+FILES+= d_basic.out
+FILES+= d_counts.out
+FILES+= d_input.in
+FILES+= d_show_duplicates.out
+FILES+= d_show_uniques.out
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/uniq/d_basic.in
diff -u /dev/null src/tests/usr.bin/uniq/d_basic.in:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/d_basic.in Sat Oct 22 14:13:39 2016
@@ -0,0 +1,4 @@
+1
+12
+1
+1
Index: src/tests/usr.bin/uniq/d_basic.out
diff -u /dev/null src/tests/usr.bin/uniq/d_basic.out:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/d_basic.out Sat Oct 22 14:13:39 2016
@@ -0,0 +1,3 @@
+1
+12
+1
Index: src/tests/usr.bin/uniq/d_counts.out
diff -u /dev/null src/tests/usr.bin/uniq/d_counts.out:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/d_counts.out Sat Oct 22 14:13:39 2016
@@ -0,0 +1,6 @@
+ 1 #01 foo0 bar0 foo1 bar1
+ 1 #02 bar0 foo1 bar1 foo1
+ 1 #03 foo0 bar0 foo1 bar1
+ 1 #04
+ 2 #05 foo0 bar0 foo1 bar1
+ 1 #07 bar0 foo1 bar1 foo0
Index: src/tests/usr.bin/uniq/d_input.in
diff -u /dev/null src/tests/usr.bin/uniq/d_input.in:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/d_input.in Sat Oct 22 14:13:39 2016
@@ -0,0 +1,7 @@
+#01 foo0 bar0 foo1 bar1
+#02 bar0 foo1 bar1 foo1
+#03 foo0 bar0 foo1 bar1
+#04
+#05 foo0 bar0 foo1 bar1
+#06 foo0 bar0 foo1 bar1
+#07 bar0 foo1 bar1 foo0
Index: src/tests/usr.bin/uniq/d_show_duplicates.out
diff -u /dev/null src/tests/usr.bin/uniq/d_show_duplicates.out:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/d_show_duplicates.out Sat Oct 22 14:13:39 2016
@@ -0,0 +1 @@
+#05 foo0 bar0 foo1 bar1
Index: src/tests/usr.bin/uniq/d_show_uniques.out
diff -u /dev/null src/tests/usr.bin/uniq/d_show_uniques.out:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/d_show_uniques.out Sat Oct 22 14:13:39 2016
@@ -0,0 +1,5 @@
+#01 foo0 bar0 foo1 bar1
+#02 bar0 foo1 bar1 foo1
+#03 foo0 bar0 foo1 bar1
+#04
+#07 bar0 foo1 bar1 foo0
Index: src/tests/usr.bin/uniq/t_uniq.sh
diff -u /dev/null src/tests/usr.bin/uniq/t_uniq.sh:1.1
--- /dev/null Sat Oct 22 14:13:39 2016
+++ src/tests/usr.bin/uniq/t_uniq.sh Sat Oct 22 14:13:39 2016
@@ -0,0 +1,97 @@
+# $NetBSD: t_uniq.sh,v 1.1 2016/10/22 14:13:39 abhinav Exp $
+#
+# Copyright (c) 2016 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Abhinav Upadhyay
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case basic
+basic_head()
+{
+ atf_set "descr" "Checks the basic functionality"
+}
+basic_body()
+{
+ atf_check -o file:$(atf_get_srcdir)/d_basic.out uniq \
+ $(atf_get_srcdir)/d_basic.in
+}
+
+atf_test_case test_counts
+test_counts_head()
+{
+ atf_set "descr" "Tests the -c option, comparing each line of the input" \
+ "file data starting from the second field"
+}
+test_counts_body()
+{
+ atf_check -o file:$(atf_get_srcdir)/d_counts.out uniq -c -f 1 \
+ $(atf_get_srcdir)/d_input.in
+}
+
+atf_test_case show_duplicates
+show_duplicates_head()
+{
+ atf_set "descr" "Checks the -d option, comparing each line of the input" \
+ "file data starting from the second field"
+}
+show_duplicates_body()
+{
+ atf_check -o file:$(atf_get_srcdir)/d_show_duplicates.out uniq -d -f 1 \
+ $(atf_get_srcdir)/d_input.in
+}
+
+atf_test_case show_uniques
+show_uniques_head()
+{
+ atf_set "descr" "Checks the -u option, comparing each line of the input" \
+ "file data starting from the second field"
+}
+show_uniques_body()
+{
+ atf_check -o file:$(atf_get_srcdir)/d_show_uniques.out uniq -u -f 1 \
+ $(atf_get_srcdir)/d_input.in
+}
+
+atf_test_case show_duplicates_from_third_character
+show_duplicates_from_third_character_head()
+{
+ atf_set "descr" "Checks the -d option, comparing each line of the input" \
+ "file data starting from the third character (-s option)"
+}
+show_duplicates_from_third_character_body()
+{
+ atf_check -o empty uniq -d -s 2 $(atf_get_srcdir)/d_input.in
+
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case basic
+ atf_add_test_case test_counts
+ atf_add_test_case show_duplicates
+ atf_add_test_case show_uniques
+ atf_add_test_case show_duplicates_from_third_character
+}
