From 2cc168fb9fc9be682ff4c984b6306ddfe22c033d Mon Sep 17 00:00:00 2001 From: jmmv Date: Sun, 29 Dec 2013 02:57:10 +0000 Subject: Update atf to 0.18 and remove the code of the deprecated tools. This is a MFC into stable/10 of: - r258286 Update notes for imports of atf. - r258289 MFV: Import atf-0.18. - r258290 Drop all ATF tools code. This is "make tinderbox" clean as run on ref10-amd64 with the default WITHOUT_TESTS option. A "make buildworld" with WITH_TESTS set now works as well. --- lib/atf/libatf-c++/Makefile | 4 +++- lib/atf/libatf-c/tests/Makefile | 1 - lib/atf/tests/test-programs/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile index 96f620b..f1d9dcf 100644 --- a/lib/atf/libatf-c++/Makefile +++ b/lib/atf/libatf-c++/Makefile @@ -59,12 +59,14 @@ SRCS= application.cpp \ process.cpp \ tests.cpp \ text.cpp \ - ui.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/Makefile b/lib/atf/libatf-c/tests/Makefile index 856c3d7..0d13d9c 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -47,7 +47,6 @@ ATF_TESTS_SH= pkg_config_test map_test \ process_test \ sanity_test \ - test_helpers_test \ text_test \ user_test ATF_TESTS_C+= ${_T} diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index f1ba9f5..8ff3333 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -16,7 +16,7 @@ ATF_TESTS_CXX= cpp_helpers SRCS.cpp_helpers= cpp_helpers.cpp ATF_TESTS_SH= sh_helpers -.for _T in config_test expect_test fork_test meta_data_test result_test srcdir_test +.for _T in config_test expect_test meta_data_test result_test srcdir_test ATF_TESTS_SH+= ${_T} ATF_TESTS_SH_SRC_${_T}= common.sh ${_T}.sh .endfor -- cgit v1.1