Index: stable/11/lib/libxo/tests/Makefile
===================================================================
--- stable/11/lib/libxo/tests/Makefile	(revision 322445)
+++ stable/11/lib/libxo/tests/Makefile	(revision 322446)
@@ -1,254 +1,249 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 PACKAGE=	tests
 
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 # Override the default suffix transformation rules for .c/.o -> .out
 .SUFFIXES:
 .SUFFIXES: .c .err .o .out .sh
 
 .PATH:
 .PATH.c: ${LIBXOSRC}/libxo ${LIBXOSRC}/tests/core
 .PATH.err: ${LIBXOSRC}/tests/core/saved
 .PATH.out: ${LIBXOSRC}/tests/core/saved
 
 .c.out .o.out:
 
 ATF_TESTS_SH+=	functional_test
 
 BINDIR=	${TESTSDIR}
 
 ${PACKAGE}FILES+= test_01.E.err
 ${PACKAGE}FILES+= test_01.E.out
 ${PACKAGE}FILES+= test_01.H.err
 ${PACKAGE}FILES+= test_01.H.out
 ${PACKAGE}FILES+= test_01.HIPx.err
 ${PACKAGE}FILES+= test_01.HIPx.out
 ${PACKAGE}FILES+= test_01.HP.err
 ${PACKAGE}FILES+= test_01.HP.out
 ${PACKAGE}FILES+= test_01.J.err
 ${PACKAGE}FILES+= test_01.J.out
 ${PACKAGE}FILES+= test_01.JP.err
 ${PACKAGE}FILES+= test_01.JP.out
 ${PACKAGE}FILES+= test_01.T.err
 ${PACKAGE}FILES+= test_01.T.out
 ${PACKAGE}FILES+= test_01.X.err
 ${PACKAGE}FILES+= test_01.X.out
 ${PACKAGE}FILES+= test_01.XP.err
 ${PACKAGE}FILES+= test_01.XP.out
 ${PACKAGE}FILES+= test_01.err
 ${PACKAGE}FILES+= test_01.out
 ${PACKAGE}FILES+= test_02.E.err
 ${PACKAGE}FILES+= test_02.E.out
 ${PACKAGE}FILES+= test_02.H.err
 ${PACKAGE}FILES+= test_02.H.out
 ${PACKAGE}FILES+= test_02.HIPx.err
 ${PACKAGE}FILES+= test_02.HIPx.out
 ${PACKAGE}FILES+= test_02.HP.err
 ${PACKAGE}FILES+= test_02.HP.out
 ${PACKAGE}FILES+= test_02.J.err
 ${PACKAGE}FILES+= test_02.J.out
 ${PACKAGE}FILES+= test_02.JP.err
 ${PACKAGE}FILES+= test_02.JP.out
 ${PACKAGE}FILES+= test_02.T.err
 ${PACKAGE}FILES+= test_02.T.out
 ${PACKAGE}FILES+= test_02.X.err
 ${PACKAGE}FILES+= test_02.X.out
 ${PACKAGE}FILES+= test_02.XP.err
 ${PACKAGE}FILES+= test_02.XP.out
 ${PACKAGE}FILES+= test_02.err
 ${PACKAGE}FILES+= test_02.out
 ${PACKAGE}FILES+= test_03.E.err
 ${PACKAGE}FILES+= test_03.E.out
 ${PACKAGE}FILES+= test_03.H.err
 ${PACKAGE}FILES+= test_03.H.out
 ${PACKAGE}FILES+= test_03.HIPx.err
 ${PACKAGE}FILES+= test_03.HIPx.out
 ${PACKAGE}FILES+= test_03.HP.err
 ${PACKAGE}FILES+= test_03.HP.out
 ${PACKAGE}FILES+= test_03.J.err
 ${PACKAGE}FILES+= test_03.J.out
 ${PACKAGE}FILES+= test_03.JP.err
 ${PACKAGE}FILES+= test_03.JP.out
 ${PACKAGE}FILES+= test_03.T.err
 ${PACKAGE}FILES+= test_03.T.out
 ${PACKAGE}FILES+= test_03.X.err
 ${PACKAGE}FILES+= test_03.X.out
 ${PACKAGE}FILES+= test_03.XP.err
 ${PACKAGE}FILES+= test_03.XP.out
 ${PACKAGE}FILES+= test_03.err
 ${PACKAGE}FILES+= test_03.out
 ${PACKAGE}FILES+= test_04.E.err
 ${PACKAGE}FILES+= test_04.E.out
 ${PACKAGE}FILES+= test_04.H.err
 ${PACKAGE}FILES+= test_04.H.out
 ${PACKAGE}FILES+= test_04.HIPx.err
 ${PACKAGE}FILES+= test_04.HIPx.out
 ${PACKAGE}FILES+= test_04.HP.err
 ${PACKAGE}FILES+= test_04.HP.out
 ${PACKAGE}FILES+= test_04.J.err
 ${PACKAGE}FILES+= test_04.J.out
 ${PACKAGE}FILES+= test_04.JP.err
 ${PACKAGE}FILES+= test_04.JP.out
 ${PACKAGE}FILES+= test_04.T.err
 ${PACKAGE}FILES+= test_04.T.out
 ${PACKAGE}FILES+= test_04.X.err
 ${PACKAGE}FILES+= test_04.X.out
 ${PACKAGE}FILES+= test_04.XP.err
 ${PACKAGE}FILES+= test_04.XP.out
 ${PACKAGE}FILES+= test_05.E.err
 ${PACKAGE}FILES+= test_05.E.out
 ${PACKAGE}FILES+= test_05.H.err
 ${PACKAGE}FILES+= test_05.H.out
 ${PACKAGE}FILES+= test_05.HIPx.err
 ${PACKAGE}FILES+= test_05.HIPx.out
 ${PACKAGE}FILES+= test_05.HP.err
 ${PACKAGE}FILES+= test_05.HP.out
 ${PACKAGE}FILES+= test_05.J.err
 ${PACKAGE}FILES+= test_05.J.out
 ${PACKAGE}FILES+= test_05.JP.err
 ${PACKAGE}FILES+= test_05.JP.out
 ${PACKAGE}FILES+= test_05.T.err
 ${PACKAGE}FILES+= test_05.T.out
 ${PACKAGE}FILES+= test_05.X.err
 ${PACKAGE}FILES+= test_05.X.out
 ${PACKAGE}FILES+= test_05.XP.err
 ${PACKAGE}FILES+= test_05.XP.out
 ${PACKAGE}FILES+= test_06.E.err
 ${PACKAGE}FILES+= test_06.E.out
 ${PACKAGE}FILES+= test_06.H.err
 ${PACKAGE}FILES+= test_06.H.out
 ${PACKAGE}FILES+= test_06.HIPx.err
 ${PACKAGE}FILES+= test_06.HIPx.out
 ${PACKAGE}FILES+= test_06.HP.err
 ${PACKAGE}FILES+= test_06.HP.out
 ${PACKAGE}FILES+= test_06.J.err
 ${PACKAGE}FILES+= test_06.J.out
 ${PACKAGE}FILES+= test_06.JP.err
 ${PACKAGE}FILES+= test_06.JP.out
 ${PACKAGE}FILES+= test_06.T.err
 ${PACKAGE}FILES+= test_06.T.out
 ${PACKAGE}FILES+= test_06.X.err
 ${PACKAGE}FILES+= test_06.X.out
 ${PACKAGE}FILES+= test_06.XP.err
 ${PACKAGE}FILES+= test_06.XP.out
 ${PACKAGE}FILES+= test_07.E.err
 ${PACKAGE}FILES+= test_07.E.out
 ${PACKAGE}FILES+= test_07.H.err
 ${PACKAGE}FILES+= test_07.H.out
 ${PACKAGE}FILES+= test_07.HIPx.err
 ${PACKAGE}FILES+= test_07.HIPx.out
 ${PACKAGE}FILES+= test_07.HP.err
 ${PACKAGE}FILES+= test_07.HP.out
 ${PACKAGE}FILES+= test_07.J.err
 ${PACKAGE}FILES+= test_07.J.out
 ${PACKAGE}FILES+= test_07.JP.err
 ${PACKAGE}FILES+= test_07.JP.out
 ${PACKAGE}FILES+= test_07.T.err
 ${PACKAGE}FILES+= test_07.T.out
 ${PACKAGE}FILES+= test_07.X.err
 ${PACKAGE}FILES+= test_07.X.out
 ${PACKAGE}FILES+= test_07.XP.err
 ${PACKAGE}FILES+= test_07.XP.out
 ${PACKAGE}FILES+= test_08.E.err
 ${PACKAGE}FILES+= test_08.E.out
 ${PACKAGE}FILES+= test_08.H.err
 ${PACKAGE}FILES+= test_08.H.out
 ${PACKAGE}FILES+= test_08.HIPx.err
 ${PACKAGE}FILES+= test_08.HIPx.out
 ${PACKAGE}FILES+= test_08.HP.err
 ${PACKAGE}FILES+= test_08.HP.out
 ${PACKAGE}FILES+= test_08.J.err
 ${PACKAGE}FILES+= test_08.J.out
 ${PACKAGE}FILES+= test_08.JP.err
 ${PACKAGE}FILES+= test_08.JP.out
 ${PACKAGE}FILES+= test_08.T.err
 ${PACKAGE}FILES+= test_08.T.out
 ${PACKAGE}FILES+= test_08.X.err
 ${PACKAGE}FILES+= test_08.X.out
 ${PACKAGE}FILES+= test_08.XP.err
 ${PACKAGE}FILES+= test_08.XP.out
 ${PACKAGE}FILES+= test_09.E.err
 ${PACKAGE}FILES+= test_09.E.out
 ${PACKAGE}FILES+= test_09.H.err
 ${PACKAGE}FILES+= test_09.H.out
 ${PACKAGE}FILES+= test_09.HIPx.err
 ${PACKAGE}FILES+= test_09.HIPx.out
 ${PACKAGE}FILES+= test_09.HP.err
 ${PACKAGE}FILES+= test_09.HP.out
 ${PACKAGE}FILES+= test_09.J.err
 ${PACKAGE}FILES+= test_09.J.out
 ${PACKAGE}FILES+= test_09.JP.err
 ${PACKAGE}FILES+= test_09.JP.out
 ${PACKAGE}FILES+= test_09.T.err
 ${PACKAGE}FILES+= test_09.T.out
 ${PACKAGE}FILES+= test_09.X.err
 ${PACKAGE}FILES+= test_09.X.out
 ${PACKAGE}FILES+= test_09.XP.err
 ${PACKAGE}FILES+= test_09.XP.out
 ${PACKAGE}FILES+= test_10.E.err
 ${PACKAGE}FILES+= test_10.E.out
 ${PACKAGE}FILES+= test_10.H.err
 ${PACKAGE}FILES+= test_10.H.out
 ${PACKAGE}FILES+= test_10.HIPx.err
 ${PACKAGE}FILES+= test_10.HIPx.out
 ${PACKAGE}FILES+= test_10.HP.err
 ${PACKAGE}FILES+= test_10.HP.out
 ${PACKAGE}FILES+= test_10.J.err
 ${PACKAGE}FILES+= test_10.J.out
 ${PACKAGE}FILES+= test_10.JP.err
 ${PACKAGE}FILES+= test_10.JP.out
 ${PACKAGE}FILES+= test_10.T.err
 ${PACKAGE}FILES+= test_10.T.out
 ${PACKAGE}FILES+= test_10.X.err
 ${PACKAGE}FILES+= test_10.X.out
 ${PACKAGE}FILES+= test_10.XP.err
 ${PACKAGE}FILES+= test_10.XP.out
 ${PACKAGE}FILES+= test_10.err
 ${PACKAGE}FILES+= test_10.out
 ${PACKAGE}FILES+= test_11.E.err
 ${PACKAGE}FILES+= test_11.E.out
 ${PACKAGE}FILES+= test_11.H.err
 ${PACKAGE}FILES+= test_11.H.out
 ${PACKAGE}FILES+= test_11.HIPx.err
 ${PACKAGE}FILES+= test_11.HIPx.out
 ${PACKAGE}FILES+= test_11.HP.err
 ${PACKAGE}FILES+= test_11.HP.out
 ${PACKAGE}FILES+= test_11.J.err
 ${PACKAGE}FILES+= test_11.J.out
 ${PACKAGE}FILES+= test_11.JP.err
 ${PACKAGE}FILES+= test_11.JP.out
 ${PACKAGE}FILES+= test_11.T.err
 ${PACKAGE}FILES+= test_11.T.out
 ${PACKAGE}FILES+= test_11.X.err
 ${PACKAGE}FILES+= test_11.X.out
 ${PACKAGE}FILES+= test_11.XP.err
 ${PACKAGE}FILES+= test_11.XP.out
 
 PROGS+= test_01
 PROGS+= test_02
 PROGS+= test_03
 PROGS+= test_04
 PROGS+= test_05
 PROGS+= test_06
 PROGS+= test_07
 PROGS+= test_08
 PROGS+= test_09
 PROGS+= test_10
 PROGS+= test_11
 
 CFLAGS+=	-I${LIBXOSRC}/libxo -I${.CURDIR:H}
 
-LIBADD=		xo util 
+LIBADD=		xo util
 
 SUBDIR+=	encoder
-
-.if ${MACHINE} == "host"
-# make it easy to test without install
-TESTSDIR=	${.OBJDIR}
-.endif
 
 .include <bsd.test.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 322445)
+++ stable/11	(revision 322446)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r322023