summaryrefslogtreecommitdiffstats
path: root/lib/atf
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2014-03-06 14:11:44 +0000
committerjmmv <jmmv@FreeBSD.org>2014-03-06 14:11:44 +0000
commitfe643776c1c5732c2d5d8354a64b520b7007e15c (patch)
treef3ca7457aae7892961845c43633cfd014409e663 /lib/atf
parent6c6bd8779dcf8b7954b8454e219761f902e602ac (diff)
downloadFreeBSD-src-fe643776c1c5732c2d5d8354a64b520b7007e15c.zip
FreeBSD-src-fe643776c1c5732c2d5d8354a64b520b7007e15c.tar.gz
Import atf-0.20.
This is a MFC of r261897 and r262000 and should allow all of the atf tests to pass.
Diffstat (limited to 'lib/atf')
-rw-r--r--lib/atf/libatf-c++/Makefile6
-rw-r--r--lib/atf/libatf-c++/tests/detail/Makefile14
-rw-r--r--lib/atf/libatf-c/tests/detail/Makefile12
3 files changed, 19 insertions, 13 deletions
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index ff05da7..0f301e1 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -28,7 +28,7 @@
.include <bsd.init.mk>
LIB= atf-c++
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
# libatf-c++ depends on the C version of the ATF library to build.
DPADD= ${LIBATFC}
@@ -53,20 +53,16 @@ SRCS= application.cpp \
config.cpp \
env.cpp \
exceptions.cpp \
- expand.cpp \
fs.cpp \
- parser.cpp \
process.cpp \
tests.cpp \
text.cpp \
- ui.cpp \
utils.cpp
INCS= build.hpp \
check.hpp \
config.hpp \
macros.hpp \
- noncopyable.hpp \
tests.hpp \
utils.hpp
INCSDIR= ${INCLUDEDIR}/atf-c++
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile
index e4ed1a5..4e2e9cf 100644
--- a/lib/atf/libatf-c++/tests/detail/Makefile
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@@ -12,15 +12,21 @@ CFLAGS+= -I${ATF}
.for _T in application_test \
env_test \
exceptions_test \
- expand_test \
fs_test \
- parser_test \
process_test \
sanity_test \
- text_test \
- ui_test
+ text_test
ATF_TESTS_CXX+= ${_T}
SRCS.${_T}= ${_T}.cpp test_helpers.cpp
.endfor
+.for p in version_helper
+PROGS_CXX+= ${p}
+SRCS.${p}= ${p}.cpp
+MAN.${p}= # defined
+BINDIR.${p}= ${TESTSDIR}
+.endfor
+version_helper.o: atf-version
+
+.include "../../../common.mk"
.include <atf.test.mk>
diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile
index 82bbf6f..472ff9c 100644
--- a/lib/atf/libatf-c/tests/detail/Makefile
+++ b/lib/atf/libatf-c/tests/detail/Makefile
@@ -22,9 +22,13 @@ ATF_TESTS_C+= ${_T}
SRCS.${_T}= ${_T}.c test_helpers.c
.endfor
-PROGS+= process_helpers
-SRCS.process_helpers= process_helpers.c
-MAN.process_helpers= # defined
-BINDIR.process_helpers= ${TESTSDIR}
+.for p in process_helpers version_helper
+PROGS+= ${p}
+SRCS.${p}= ${p}.c
+MAN.${p}= # defined
+BINDIR.${p}= ${TESTSDIR}
+.endfor
+version_helper.o: atf-version
+.include "../../../common.mk"
.include <atf.test.mk>
OpenPOWER on IntegriCloud