svn commit: r328463 - in stable/11: etc/mtree usr.bin/hexdump usr.bin/hexdump/tests

[Kyle Evans]

Author: kevans
Date: Sat Jan 27 06:31:14 2018
New Revision: 328463
URL: https://svnweb.freebsd.org/changeset/base/328463

Log:
  MFC r320930,r324286: Add tests for hexdump(1)
  
  MFC r320930:
  Add some basic tests for hexdump(1)'s various output flags. Formatting
  tests are omitted for this initial run as there are still some bugs to work
  out there.
  
  This covers -s flag testing on devices and non-devices that would have
  caught breakage found in PR 219173 as well as other subtle breakage caused
  locally.
  
  MFC r324286: hexdump: Remove expected test failures for now succeeding tests
  
  r323990 fixed the -s flag breakage reported by PR 219173. Mark the
  corresponding hexdump tests accordingly, since they should now both succeed.
  
  PR:		222781

Added:
  stable/11/usr.bin/hexdump/tests/
     - copied from r320930, head/usr.bin/hexdump/tests/
Modified:
  stable/11/etc/mtree/BSD.tests.dist
  stable/11/usr.bin/hexdump/Makefile
  stable/11/usr.bin/hexdump/tests/hexdump_test.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/11/etc/mtree/BSD.tests.dist	Sat Jan 27 06:20:27 2018	(r328462)
+++ stable/11/etc/mtree/BSD.tests.dist	Sat Jan 27 06:31:14 2018	(r328463)
@@ -652,6 +652,8 @@
         ..
         head
         ..
+        hexdump
+        ..
         ident
         ..
         join

Modified: stable/11/usr.bin/hexdump/Makefile
==============================================================================
--- stable/11/usr.bin/hexdump/Makefile	Sat Jan 27 06:20:27 2018	(r328462)
+++ stable/11/usr.bin/hexdump/Makefile	Sat Jan 27 06:31:14 2018	(r328463)
@@ -1,11 +1,17 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	hexdump
 SRCS=	conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
 MAN=	hexdump.1 od.1
 MLINKS=	hexdump.1 hd.1
 LINKS=	${BINDIR}/hexdump ${BINDIR}/od
 LINKS+=	${BINDIR}/hexdump ${BINDIR}/hd
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.prog.mk>

Modified: stable/11/usr.bin/hexdump/tests/hexdump_test.sh
==============================================================================
--- head/usr.bin/hexdump/tests/hexdump_test.sh	Thu Jul 13 03:52:54 2017	(r320930)
+++ stable/11/usr.bin/hexdump/tests/hexdump_test.sh	Sat Jan 27 06:31:14 2018	(r328463)
@@ -134,7 +134,6 @@ s_flag_head()
 }
 s_flag_body()
 {
-	atf_expect_fail "-s option is currently broken due to capsicum (PR 219173)"
 	atf_check -o file:"$(atf_get_srcdir)/d_hexdump_sflag_a.out" \
 	    hexdump -bs 4 "$(atf_get_srcdir)/d_hexdump_a.in"
 
@@ -148,7 +147,6 @@ v_flag_head()
 }
 v_flag_body()
 {
-	atf_expect_fail "-s option is currently broken due to capsicum (PR 219173)"
 	for i in $(seq 0 7); do
 		atf_check -o match:"^\*$" \
 		    hexdump -s ${i} "$(atf_get_srcdir)/d_hexdump_c.in"