Respect the original layout of the atf-{c,c++} tests.
Put test programs for internal modules into a 'detail' subdirectory of the libatf-c and libatf-c++ test directories, just as the upstream distribution does. This is necessary because the tests assume such layout to find the process_helper program, and currently fail because of this divergence. MFC after: 1 week
This commit is contained in:
parent
17ed2e8ea8
commit
762c167ede
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=260525
@ -49,8 +49,12 @@
|
|||||||
lib
|
lib
|
||||||
atf
|
atf
|
||||||
libatf-c
|
libatf-c
|
||||||
|
detail
|
||||||
|
..
|
||||||
..
|
..
|
||||||
libatf-c++
|
libatf-c++
|
||||||
|
detail
|
||||||
|
..
|
||||||
..
|
..
|
||||||
test-programs
|
test-programs
|
||||||
..
|
..
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++
|
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++
|
||||||
|
TESTS_SUBDIRS= detail
|
||||||
|
|
||||||
ATF= ${.CURDIR:H:H:H:H}/contrib/atf
|
ATF= ${.CURDIR:H:H:H:H}/contrib/atf
|
||||||
.PATH: ${ATF}/atf-c++
|
.PATH: ${ATF}/atf-c++
|
||||||
@ -14,7 +15,6 @@ FILESDIR= ${TESTSDIR}
|
|||||||
FILES= macros_hpp_test.cpp
|
FILES= macros_hpp_test.cpp
|
||||||
FILES+= unused_test.cpp
|
FILES+= unused_test.cpp
|
||||||
|
|
||||||
# Tests in atf-c++.
|
|
||||||
.for _T in atf_c++_test \
|
.for _T in atf_c++_test \
|
||||||
build_test \
|
build_test \
|
||||||
check_test \
|
check_test \
|
||||||
@ -28,20 +28,4 @@ SRCS.${_T}= ${_T}.cpp test_helpers.cpp
|
|||||||
|
|
||||||
ATF_TESTS_SH= pkg_config_test
|
ATF_TESTS_SH= pkg_config_test
|
||||||
|
|
||||||
# Tests in atf-c++/detail.
|
|
||||||
|
|
||||||
.for _T in application_test \
|
|
||||||
env_test \
|
|
||||||
exceptions_test \
|
|
||||||
expand_test \
|
|
||||||
fs_test \
|
|
||||||
parser_test \
|
|
||||||
process_test \
|
|
||||||
sanity_test \
|
|
||||||
text_test \
|
|
||||||
ui_test
|
|
||||||
ATF_TESTS_CXX+= ${_T}
|
|
||||||
SRCS.${_T}= ${_T}.cpp test_helpers.cpp
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
.include <atf.test.mk>
|
.include <atf.test.mk>
|
||||||
|
3
lib/atf/libatf-c++/tests/Makefile.inc
Normal file
3
lib/atf/libatf-c++/tests/Makefile.inc
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include "../Makefile.inc"
|
26
lib/atf/libatf-c++/tests/detail/Makefile
Normal file
26
lib/atf/libatf-c++/tests/detail/Makefile
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
|
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail
|
||||||
|
|
||||||
|
ATF= ${.CURDIR:H:H:H:H:H}/contrib/atf
|
||||||
|
.PATH: ${ATF}/atf-c++/detail
|
||||||
|
|
||||||
|
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
|
||||||
|
ATF_TESTS_CXX+= ${_T}
|
||||||
|
SRCS.${_T}= ${_T}.cpp test_helpers.cpp
|
||||||
|
.endfor
|
||||||
|
|
||||||
|
.include <atf.test.mk>
|
@ -3,6 +3,7 @@
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c
|
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c
|
||||||
|
TESTS_SUBDIRS= detail
|
||||||
|
|
||||||
ATF= ${.CURDIR:H:H:H:H}/contrib/atf
|
ATF= ${.CURDIR:H:H:H:H}/contrib/atf
|
||||||
.PATH: ${ATF}/atf-c
|
.PATH: ${ATF}/atf-c
|
||||||
@ -19,8 +20,6 @@ FILESDIR= ${TESTSDIR}
|
|||||||
FILES= macros_h_test.c
|
FILES= macros_h_test.c
|
||||||
FILES+= unused_test.c
|
FILES+= unused_test.c
|
||||||
|
|
||||||
# Tests in atf-c.
|
|
||||||
|
|
||||||
.for _T in atf_c_test \
|
.for _T in atf_c_test \
|
||||||
build_test \
|
build_test \
|
||||||
check_test \
|
check_test \
|
||||||
@ -36,24 +35,4 @@ SRCS.${_T}= ${_T}.c test_helpers.c
|
|||||||
|
|
||||||
ATF_TESTS_SH= pkg_config_test
|
ATF_TESTS_SH= pkg_config_test
|
||||||
|
|
||||||
# Tests in atf-c/detail.
|
|
||||||
|
|
||||||
.for _T in dynstr_test \
|
|
||||||
env_test \
|
|
||||||
fs_test \
|
|
||||||
list_test \
|
|
||||||
map_test \
|
|
||||||
process_test \
|
|
||||||
sanity_test \
|
|
||||||
text_test \
|
|
||||||
user_test
|
|
||||||
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}
|
|
||||||
|
|
||||||
.include <atf.test.mk>
|
.include <atf.test.mk>
|
||||||
|
3
lib/atf/libatf-c/tests/Makefile.inc
Normal file
3
lib/atf/libatf-c/tests/Makefile.inc
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include "../Makefile.inc"
|
30
lib/atf/libatf-c/tests/detail/Makefile
Normal file
30
lib/atf/libatf-c/tests/detail/Makefile
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
|
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail
|
||||||
|
|
||||||
|
ATF= ${.CURDIR:H:H:H:H:H}/contrib/atf
|
||||||
|
.PATH: ${ATF}/atf-c/detail
|
||||||
|
|
||||||
|
CFLAGS+= -I${ATF}
|
||||||
|
|
||||||
|
.for _T in dynstr_test \
|
||||||
|
env_test \
|
||||||
|
fs_test \
|
||||||
|
list_test \
|
||||||
|
map_test \
|
||||||
|
process_test \
|
||||||
|
sanity_test \
|
||||||
|
text_test \
|
||||||
|
user_test
|
||||||
|
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}
|
||||||
|
|
||||||
|
.include <atf.test.mk>
|
@ -4066,6 +4066,26 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.gz
|
|||||||
.if ${MK_TESTS} == yes
|
.if ${MK_TESTS} == yes
|
||||||
OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
|
||||||
OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
|
OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/env_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/exceptions_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/expand_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
|
||||||
|
OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
|
||||||
.else
|
.else
|
||||||
# ATF libraries.
|
# ATF libraries.
|
||||||
OLD_FILES+=usr/bin/atf-sh
|
OLD_FILES+=usr/bin/atf-sh
|
||||||
|
Loading…
Reference in New Issue
Block a user