simple check of -h option. More deviously, check that option/parameter

handling actually works correctly.

5 files changed, 27 insertions, 3 deletions

diff --git a/regress/usr.bin/tsort/Makefile b/regress/usr.bin/tsort/Makefile
index 60ad166a36a..f10707be59c 100644
--- a/regress/usr.bin/tsort/Makefile
+++ b/regress/usr.bin/tsort/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.8 2014/07/16 20:04:21 okan Exp $
+# $OpenBSD: Makefile,v 1.9 2015/08/30 16:42:48 espie Exp $
 
-REGRESS_TARGETS=t1 t2 t3 t4 t5 t6
+REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7
 REGRESS_SLOW_TARGETS=t4
 
 t1: t1.out
@@ -39,13 +39,16 @@ t5.out: pairs5
 t6.out: pairs6
 	tsort <${.CURDIR}/pairs6 >$@ 2>&1
 
+t7:
+	tsort -hhints1 -h hints2 pairs7 2>&1|diff - ${.CURDIR}/t7.canonical
+
 pairs3:
 	perl ${.CURDIR}/build-tree 4 8 >$@
 
 pairs4:
 	perl ${.CURDIR}/build-tree 5 10 >$@
 
-.PHONY: t1 t2
+.PHONY: t1 t2 t7
 CLEANFILES+=t1.out t2.out t3.out t4.out t5.out t6.out pairs3 pairs4
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/tsort/hints1 b/regress/usr.bin/tsort/hints1
new file mode 100644
index 00000000000..94053253394
--- /dev/null
+++ b/regress/usr.bin/tsort/hints1
@@ -0,0 +1,5 @@
+a
+b
+c
+d
+e
diff --git a/regress/usr.bin/tsort/hints2 b/regress/usr.bin/tsort/hints2
new file mode 100644
index 00000000000..97ef6644fd4
--- /dev/null
+++ b/regress/usr.bin/tsort/hints2
@@ -0,0 +1,5 @@
+f
+g
+h
+i
+j
diff --git a/regress/usr.bin/tsort/pairs7 b/regress/usr.bin/tsort/pairs7
new file mode 100644
index 00000000000..a6b6601134f
--- /dev/null
+++ b/regress/usr.bin/tsort/pairs7
@@ -0,0 +1 @@
+b a
diff --git a/regress/usr.bin/tsort/t7.canonical b/regress/usr.bin/tsort/t7.canonical
new file mode 100644
index 00000000000..59843aa976d
--- /dev/null
+++ b/regress/usr.bin/tsort/t7.canonical
@@ -0,0 +1,10 @@
+b
+a
+c
+d
+e
+f
+g
+h
+i
+j