Skip to content

Make more support/ programs testable #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
notroj wants to merge 1 commit into from
Closed

Make more support/ programs testable #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,14 +435,23 @@ check-conf:
check-dirs:
@mkdir -p check/htdocs check/logs check/bin

check-binaries: check/bin/apxs check/bin/httpd check/bin/ab
# EXTRA_CHECK_BINARIES is set by configure for optional support programs
# (e.g. check/bin/a2md when a2md is enabled).
check-binaries: check/bin/apxs check/bin/httpd check/bin/ab \
check/bin/htcacheclean $(EXTRA_CHECK_BINARIES)

check/bin/httpd:
ln -s $(top_builddir)/httpd check/bin/httpd
ln -s $(top_builddir)/$(PROGRAM_NAME) check/bin/httpd

check/bin/ab:
ln -s $(top_builddir)/support/ab check/bin/ab

check/bin/htcacheclean:
ln -s $(top_builddir)/support/htcacheclean check/bin/htcacheclean

check/bin/a2md:
ln -s $(top_builddir)/support/a2md/a2md check/bin/a2md

# A version of apxs with the PREFIX overridden to point inside the install root
check/bin/apxs:
mkdir -p check
Expand Down
3 changes: 2 additions & 1 deletion build/config_vars.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ exec sed "
/^DSO_MODULES/d
/^ENABLED_DSO_MODULES/d
/^LOAD_ALL_MODULES/d
/^NONPORTABLE_SUPPORT/d
/^EXTRA_SBIN_PROGRAMS/d
/^EXTRA_CHECK_BINARIES/d
/_SRCLIB_DIRS/d
/^UNITTEST_/d
/^davlockdb/d
Expand Down
18 changes: 6 additions & 12 deletions support/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ DISTCLEAN_TARGETS = apxs apxs-ng apachectl dbmmanage dbmmanage-ng \
phf_abuse_log.cgi phf_abuse_log-ng.cgi split-logfile split-logfile-ng \
envvars-std

CLEAN_TARGETS = suexec a2md/a2md
CLEAN_TARGETS = suexec

bin_PROGRAMS = htpasswd htdigest htdbm firehose ab logresolve httxt2dbm
sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS) a2md/a2md
sbin_PROGRAMS = htcacheclean rotatelogs $(EXTRA_SBIN_PROGRAMS)
TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS)

PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
PROGRAM_DEPENDENCIES =
Expand Down Expand Up @@ -37,9 +37,6 @@ install:
cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
fi ; \
fi
@if test -f "$(builddir)/a2md/a2md"; then \
$(INSTALL_PROGRAM) a2md/a2md $(DESTDIR)$(bindir); \
fi

htpasswd.lo: passwd_common.h
passwd_common.lo: passwd_common.h
Expand Down Expand Up @@ -97,12 +94,9 @@ firehose_OBJECTS = firehose.lo
firehose: $(firehose_OBJECTS)
$(LINK) $(firehose_LTFLAGS) $(firehose_OBJECTS) $(PROGRAM_LDADD)

# Build a2md when the required mod_md dependencies (curl, jansson, openssl) are
# available. @A2MD_LIBS@ is empty when configure determined a2md cannot be built,
# so the sub-make is a no-op in that case.
# a2md is only built and installed when configure added a2md/a2md to
# EXTRA_SBIN_PROGRAMS (mod_md dependencies curl, jansson and openssl found).
a2md/a2md:
@if test -n "$(A2MD_LIBS)"; then \
(cd a2md && $(MAKE) $(MFLAGS) a2md) || exit 1; \
fi
cd a2md && $(MAKE) $(MFLAGS) a2md


2 changes: 2 additions & 0 deletions support/a2md/config2.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ if test "x$enable_a2md" != "xno"; then
APR_ADDTO(A2MD_LIBS, [$ap_curl_libs])
APR_ADDTO(A2MD_LIBS, [$ap_jansson_libs])
APR_ADDTO(A2MD_LIBS, [-lssl -lcrypto])
APR_ADDTO(EXTRA_SBIN_PROGRAMS, [a2md/a2md])
APR_ADDTO(EXTRA_CHECK_BINARIES, [check/bin/a2md])
AC_MSG_NOTICE([a2md: enabled (curl + jansson + openssl found)])
else
if test "x$enable_a2md" = "xyes"; then
Expand Down
12 changes: 8 additions & 4 deletions support/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,21 @@ AC_ARG_ENABLE(a2md,APACHE_HELP_STRING(--enable-a2md,Build the a2md command-line
enable_a2md="auto"
])

# Configure or check which of the non-portable support programs can be enabled.
# Configure or check which of the optional sbin support programs can be
# enabled. support/a2md/config2.m4 may append to these lists; the
# EXTRA_CHECK_BINARIES are symlinked into check/bin for the test suite.

NONPORTABLE_SUPPORT=""
EXTRA_SBIN_PROGRAMS=""
EXTRA_CHECK_BINARIES=""
case $host in
*mingw*)
;;
*)
NONPORTABLE_SUPPORT="checkgid fcgistarter"
EXTRA_SBIN_PROGRAMS="checkgid fcgistarter"
;;
esac
APACHE_SUBST(NONPORTABLE_SUPPORT)
APACHE_SUBST(EXTRA_SBIN_PROGRAMS)
APACHE_SUBST(EXTRA_CHECK_BINARIES)

# Configure the ulimit -n command used by apachectl.

Expand Down