summaryrefslogtreecommitdiffstats
path: root/libexec
diff options
context:
space:
mode:
Diffstat (limited to 'libexec')
-rw-r--r--libexec/atf/atf-check/Makefile1
-rw-r--r--libexec/atf/atf-sh/Makefile6
-rw-r--r--libexec/atf/atf-sh/tests/Makefile6
3 files changed, 10 insertions, 3 deletions
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
index 4e6d8df..0792c03 100644
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -35,6 +35,7 @@ SRCS= atf-check.cpp
MAN= atf-check.1
CFLAGS+= -I${ATF}
+CFLAGS+= -DATF_SHELL='"/bin/sh"'
LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++
LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c
diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile
index c407a41..8a044b2 100644
--- a/libexec/atf/atf-sh/Makefile
+++ b/libexec/atf/atf-sh/Makefile
@@ -32,9 +32,13 @@ ATF= ${.CURDIR:H:H:H}/contrib/atf
PROG_CXX= atf-sh
SRCS= atf-sh.cpp
-MAN= atf-sh.1 atf-sh-api.3
+MAN= atf-sh.1 atf-sh.3
+MLINKS+= atf-sh.3 atf-sh-api.3 # Backwards compatibility.
CFLAGS+= -DHAVE_CONFIG_H
+CFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"'
+CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"'
+CFLAGS+= -DATF_SHELL='"/bin/sh"'
CFLAGS+= -I${ATF}
DPADD+= ${LIBATF_C} ${LIBATF_CXX}
diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile
index c7a8ffb..3360b97 100644
--- a/libexec/atf/atf-sh/tests/Makefile
+++ b/libexec/atf/atf-sh/tests/Makefile
@@ -10,12 +10,14 @@ ATF= ${.CURDIR:H:H:H:H}/contrib/atf
ATF_TESTS_SH+= atf_check_test
ATF_TESTS_SH+= config_test
ATF_TESTS_SH+= integration_test
-ATF_TESTS_SH_SED_integration_test= \
- -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
ATF_TESTS_SH+= normalize_test
ATF_TESTS_SH+= tc_test
ATF_TESTS_SH+= tp_test
+integration_test: Makefile
+ATF_TESTS_SH_SED_integration_test= \
+ -e 's,__ATF_SH__,/usr/libexec/atf-sh,g'
+
SCRIPTS+= misc_helpers
SCRIPTSDIR_misc_helpers=${TESTSDIR}
CLEANFILES+= misc_helpers misc_helpers.tmp
OpenPOWER on IntegriCloud