Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 191b409
bsd.tests.mk -- allow compiling multiple tests per directory.
Matthew Seaman committed 13 years ago
commit 191b40904568fd50ee001ec8ed93db9157310a54
parent 573fe8d
4 files changed +85 -85
modified tests/Makefile
@@ -3,5 +3,5 @@ SUBDIR= lib \


.include <bsd.subdir.mk>
- 
run:
+ 
run: all

	atf-run | atf-report
modified tests/bsd.tests.mk
@@ -5,6 +5,12 @@


.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
+ 
# libatf is not in base for stable/9 or earlier
+ 
CFLAGS+=	-I. -I/usr/local/include
+ 
LDADD+=		-L/usr/local/lib
+ 
LATF_C=		-latf-c
+ 
LATF_CXX=	-latf-c++
+ 


# XXX The use of COPTS in modern makefiles is discouraged.

.if defined(COPTS)

CFLAGS+=${COPTS}
@@ -36,72 +42,75 @@ STRIP?= -s
LDFLAGS+= -static

.endif
- 
.if defined(PROG_CXX)
- 
PROG=	${PROG_CXX}
+ 
.if defined(TESTS_CXX)
+ 
TESTS+=	${TESTS_CXX}

.endif



# TESTS -- a list of test binaries to generate.  We assume that for
- 
# each test, there is a single source file test.c or test.cc. TESTS
- 
# don't have manpages.  TESTS don't get installed outside the source
- 
# tree.
-
- 
.if defined(PROG)
- 
.  if defined(SRCS)
+ 
# each test 'foo', there is at minimum a single primary source file
+ 
# foo.c
+ 
#
+ 
# TESTS_CXX -- all tests that use c++ source code.  Assume the primary
+ 
# source file is foo.cc
+ 
#
+ 
# SRCS -- a list of source files needed for every test in ${TESTS}
+ 
#
+ 
# foo_SRCS -- a list of (additional) source files needed specifically
+ 
# for test foo.  If foo.c is not mentioned in this list, it will be
+ 
# automatically prepended to it.
+ 
#
+ 
# eg. Tests 'foo', 'bar' and 'baz'.  foo and bar are compiled
+ 
# respectively from their primary source code foo.c or bar.c, and a
+ 
# secondary file foobar_extra.c (specific to test foo and test bar)
+ 
# and common.c.  bar.c is implicitly prepended to ${bar_SRCS}. Test
+ 
# 'baz' is compiled from baz.c and common.c.  All tests also depend on
+ 
# tests.h.
+ 
#
+ 
#   TESTS=	foo bar baz
+ 
#   foo_SRCS=	foo.c foobar_extra.c
+ 
#   bar_SRCS=	foobar_extra.c
+ 
#   SRCS=	common.c tests.h
+ 
#
+ 
# TESTS don't have manpages.  TESTS don't get installed anywhere, but
+ 
# are run directly from the source tree.
+
+ 
.for _test in ${TESTS}
+
+ 
.  if defined(TESTS_CXX:M${_test})
+ 
${_test}_SRCS:=	${_test}.cc ${${_test}_SRCS:N${_test}.cc} ${SRCS}
+ 
.  else
+ 
${_test}_SRCS:=	${_test}.c ${${_test}_SRCS:N${_test}.c} ${SRCS}
+ 
.  endif
- 
OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
+ 
.  if defined(${_test}_SRCS)
+ 
_SRCS+=	${${_test}_SRCS}
+ 
${_test}_OBJS=	${${_test}_SRCS:N*.h:R:S/$/.o/g}
+ 
.  endif
+ 
.  if defined(${_test}_OBJS)

.    if target(beforelinking)
- 
${PROG}: ${OBJS} beforelinking
+ 
${_test}: ${${_test}_OBJS} beforelinking

.    else
- 
${PROG}: ${OBJS}
+ 
${_test}: ${${_test}_OBJS}

.    endif
- 
.    if defined(PROG_CXX)
- 
	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
+ 
.    if defined(TESTS_CXX:M${_test})
+ 
	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${${_test}_OBJS} ${LDADD} ${LATF_CXX}

.    else
- 
	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
+ 
	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${${_test}_OBJS} ${LDADD} ${LATF_C}

.    endif

.    if ${MK_CTF} != "no"
- 
	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
+ 
	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${${_test}_OBJS}

.    endif
+ 
.  endif			# defined(${_test}_OBJS)
+ 
.endfor				# for _test in ${TESTS}
- 
.  else				# !defined(SRCS)
+ 
ALLSRCS:=	${_SRCS:O:u}
+ 
OBJS=	${ALLSRCS:N*.h:R:O:u:S/$/.o/g}
- 
.    if !target(${PROG})
- 
.      if defined(PROG_CXX)
- 
SRCS=	${PROG}.cc
- 
.      else
- 
SRCS=	${PROG}.c
- 
.      endif
+ 
.if defined(TESTS)
+ 
all: objwarn ${TESTS} ${SCRIPTS}
- 
# Always make an intermediate object file because:
- 
# - it saves time rebuilding when only the library has changed
- 
# - the name of the object gets put into the executable symbol table instead of
- 
#   the name of a variable temporary object.
- 
# - it's useful to keep objects around for crunching.
- 
OBJS=	${PROG}.o
-
- 
.      if target(beforelinking)
- 
${PROG}: ${OBJS} beforelinking
- 
.      else
- 
${PROG}: ${OBJS}
- 
.      endif
- 
.      if defined(PROG_CXX)
- 
	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
- 
.      else
- 
	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
- 
.      endif
- 
.      if ${MK_CTF} != "no"
- 
	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
- 
.      endif
- 
.    endif
-
- 
.  endif			# !defined(SRCS)
-
- 
all: objwarn ${PROG} ${SCRIPTS}
-
- 
.  if defined(PROG)
- 
CLEANFILES+= ${PROG}
- 
.  endif
+ 
CLEANFILES+= ${TESTS}



.  if defined(OBJS)

CLEANFILES+= ${OBJS}
@@ -109,35 +118,38 @@ CLEANFILES+= ${OBJS}


.include <bsd.libnames.mk>
- 
.  if defined(PROG)

_EXTRADEPEND:

.  if defined(LDFLAGS) && !empty(LDFLAGS:M-nostdlib)

.    if defined(DPADD) && !empty(DPADD)
- 
	echo ${PROG}: ${DPADD} >> ${DEPENDFILE}
+ 
.      for _test in ${TESTS}
+ 
	echo ${_test}: ${DPADD} >> ${DEPENDFILE}
+ 
.      endfo

.    endif

.  else
+ 
.    for _test in ${TESTS}

	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
- 
.    if defined(PROG_CXX)
- 
.      if !empty(CXXFLAGS:M-stdlib=libc++)
- 
	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
- 
.      else
- 
	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
+ 
.      if defined(TESTS_CXX:M${_test})
+ 
.        if !empty(CXXFLAGS:M-stdlib=libc++)
+ 
	echo ${_test}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
+ 
.        else
+ 
	echo ${_test}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
+ 
.        endif

.      endif
- 
.    endif
+ 
.    endfor

.  endif
- 
.endif				# defined(PROG)
+ 
.endif				# defined(TESTS)



.if !target(lint)

lint: ${SRCS:M*.c}
- 
.  if defined(PROG)
+ 
.  if defined(TESTS)

	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}

.  endif

.endif



.include <bsd.dep.mk>
- 
.if defined(PROG) && !exists(${.OBJDIR}/${DEPENDFILE})
- 
${OBJS}: ${SRCS:M*.h}
+ 
.if defined(TESTS) && !exists(${.OBJDIR}/${DEPENDFILE})
+ 
${OBJS}: ${SRCS:O:u:M*.h}

.endif



.include <bsd.obj.mk>
modified tests/lib/Atffile
@@ -2,7 +2,7 @@ Content-Type: application/X-atf-atffile; version="1"


prop: test-suite = lib
- 
tp: pkg
- 
tp: manifest
+ 
#tp: pkg
+ 
#tp: manifest

tp: test
modified tests/lib/Makefile
@@ -1,23 +1,11 @@
- 
PROG=	test
- 
SRCS=	test.c		\
- 
	manifest.c	\
- 
	pkg.c
+ 
TESTS=	test
- 
CFLAGS+=-I.			\
- 
	-I/usr/local/include	\
- 
	-I../libpkg
- 
LDADD+=	-L/usr/local/lib	\
- 
	-latf-c			\
- 
	-L../libpkg		\
- 
	-lpkg
- 
NO_MAN=	true
+ 
SRCS=		tests.h
+ 
test_SRCS=	manifest.c	\
+ 
		pkg.c
- 
TESTS=	manifest \
- 
	pkg
-
- 
run: ${PROG}
- 
.for test in ${TESTS}
- 
	@env LD_LIBRARY_PATH=${.CURDIR}/../../libpkg ./${PROG} ${test}
- 
.endfor
+ 
CFLAGS+=	-I../libpkg
+ 
LDADD+=		-L../libpkg	\
+ 
		-lpkg



.include "../bsd.tests.mk"